Reboot timeout is disabled by default in qemu. And -1 is invalid value for
reboot-timeout parameter after qemu-4.0.0.
Signed-off-by: Han Han <hhan(a)redhat.com>
---
.../reboot-timeout-disabled.args | 28 -------------------
.../reboot-timeout-disabled.xml | 24 ----------------
.../reboot-timeout-disabled.xml | 26 -----------------
3 files changed, 78 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/reboot-timeout-disabled.args
delete mode 100644 tests/qemuxml2argvdata/reboot-timeout-disabled.xml
delete mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
deleted file mode 100644
index d5973b4192..0000000000
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ /dev/null
@@ -1,28 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
--name QEMUGuest1 \
--S \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot reboot-timeout=-1 \
--usb
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
b/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
deleted file mode 100644
index 8af83c5a42..0000000000
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<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-system-i686</emulator>
- <controller type='usb' index='0'/>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
deleted file mode 100644
index 29b608af0a..0000000000
--- a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<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-system-i686</emulator>
- <controller type='usb' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='none'/>
- </devices>
-</domain>
--
2.20.1