diff options
author | 2012-09-18 12:32:07 +0200 | |
---|---|---|
committer | 2012-09-20 16:41:02 +0200 | |
commit | ec62a602bbebdd3d630f241231645b8d3e6d67e3 (patch) | |
tree | 3e7f20f057c3f4410006bac4fa640feedf9debf7 | |
parent | qemu: Add support for reboot-timeout (diff) | |
download | libvirt-ec62a602bbebdd3d630f241231645b8d3e6d67e3.tar.gz libvirt-ec62a602bbebdd3d630f241231645b8d3e6d67e3.tar.bz2 libvirt-ec62a602bbebdd3d630f241231645b8d3e6d67e3.zip |
QEMU Tests for reboot-timeout
-rw-r--r-- | tests/qemuargv2xmltest.c | 4 | ||||
-rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args | 3 | ||||
-rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml | 21 | ||||
-rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args | 3 | ||||
-rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml | 21 | ||||
-rw-r--r-- | tests/qemuxml2argvtest.c | 5 | ||||
-rw-r--r-- | tests/qemuxml2xmltest.c | 4 |
7 files changed, 61 insertions, 0 deletions
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index ad5f45ba3..c4c2cd946 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -151,6 +151,10 @@ mymain(void) /* Can't roundtrip xenner arch */ /*DO_TEST("bootloader");*/ + + DO_TEST("reboot-timeout-enabled"); + DO_TEST("reboot-timeout-disabled"); + DO_TEST("clock-utc"); DO_TEST("clock-localtime"); DO_TEST("disk-cdrom"); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args new file mode 100644 index 000000000..1a2bf4d6c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args @@ -0,0 +1,3 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ +-m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot order=n,reboot-timeout=-1 -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml new file mode 100644 index 000000000..38a0f522e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml @@ -0,0 +1,21 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='network'/> + <bios rebootTimeout='-1'/> + </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> + <controller type='usb' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args new file mode 100644 index 000000000..ab18b3037 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args @@ -0,0 +1,3 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ +-m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot order=n,reboot-timeout=128 -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml new file mode 100644 index 000000000..3a9cd6fa7 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml @@ -0,0 +1,21 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='network'/> + <bios rebootTimeout='128'/> + </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> + <controller type='usb' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0ec3c2cb6..629d7679a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -373,6 +373,11 @@ mymain(void) QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); DO_TEST("bootloader", QEMU_CAPS_DOMID, QEMU_CAPS_KVM); + + DO_TEST("reboot-timeout-disabled", QEMU_CAPS_REBOOT_TIMEOUT); + DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT); + DO_TEST_FAILURE("reboot-timeout-enabled", NONE); + DO_TEST("bios", QEMU_CAPS_DEVICE, QEMU_CAPS_SGA); DO_TEST("clock-utc", NONE); DO_TEST("clock-localtime", NONE); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0a6da984b..b968566e5 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -133,6 +133,10 @@ mymain(void) DO_TEST("boot-menu-disable"); DO_TEST("boot-order"); DO_TEST("bootloader"); + + DO_TEST("reboot-timeout-enabled"); + DO_TEST("reboot-timeout-disabled"); + DO_TEST("clock-utc"); DO_TEST("clock-localtime"); DO_TEST("cpu-kvmclock"); |