diff options
| author |   Daniel P. Berrange <berrange@redhat.com> | 2009-12-14 18:06:23 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2010-01-18 13:55:56 +0000 |
| commit | 38a22fbfaa20a8d86a6d2ced5c5e8d168ee18e3e (patch) | |
| tree | 33ee57df6d948bdae1582e5d7c27834124738361 /tests | |
| parent | Convert character devices over to use -device (diff) | |
| download | libvirt-38a22fbfaa20a8d86a6d2ced5c5e8d168ee18e3e.tar.gz libvirt-38a22fbfaa20a8d86a6d2ced5c5e8d168ee18e3e.tar.bz2 libvirt-38a22fbfaa20a8d86a6d2ced5c5e8d168ee18e3e.zip | |
Convert watchdog to -device
The current syntax for watchdogs is
-watchdog i6300esb
The new syntax will now be
-device i6300esb,id=watchdogNN,addr=<PCI-SLOT>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args | 1 | ||||
| -rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml | 23 | ||||
| -rw-r--r-- | tests/qemuxml2argvtest.c | 2 |
3 files changed, 26 insertions, 0 deletions
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args new file mode 100644 index 000000000..5f3a42849 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -usb -device ib700,id=watchdog0 -watchdog-action poweroff diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml new file mode 100644 index 000000000..9b2ffdf8b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml @@ -0,0 +1,23 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <watchdog model='ib700' action='poweroff'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 42d157969..6bfc2173d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -290,6 +290,8 @@ mymain(int argc, char **argv) DO_TEST("channel-guestfwd", QEMUD_CMD_FLAG_CHARDEV|QEMUD_CMD_FLAG_DEVICE); + DO_TEST("watchdog", 0); + DO_TEST("watchdog-device", QEMUD_CMD_FLAG_DEVICE); DO_TEST("sound", 0); DO_TEST("hostdev-usb-product", 0); |