summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMartin Kletzander <mkletzan@redhat.com>2012-09-18 11:38:18 +0200
committerMartin Kletzander <mkletzan@redhat.com>2012-09-20 10:59:35 +0200
commit8c952908681ca66ba4be75362de7e593d6c44f94 (patch)
treec12486135f841cbe7e394dcf225b3c8e0cb2cf5d /tests
parentqemu: Transition domain to PAUSED after 'stop' command (diff)
downloadlibvirt-8c952908681ca66ba4be75362de7e593d6c44f94.tar.gz
libvirt-8c952908681ca66ba4be75362de7e593d6c44f94.tar.bz2
libvirt-8c952908681ca66ba4be75362de7e593d6c44f94.zip
qemu: Cleanup boot parameter building
This patch cleans up building the "-boot" parameter and while on that fixes one inconsistency by modifying these things: - I completed the unfinished virDomainBootMenu enum by specifying LAST, declaring it and also declaring the TypeFromString and TypeToString parameters. - Previously mentioned TypeFromString and TypeToString are used when parsing the XML. - Last, but not least, visible change is that the "-boot" parameter is built and parsed properly: - The "order=" prefix is used only when additional parameters are used (menu, etc.). - It's rewritten in a way that other parameters can be added easily in the future (used in following patch). - The "order=" parameter is properly parsed regardless to where it is placed in the string (e.g. "menu=on,order=nc"). - The "menu=" parameter (and others in the future) are created when they should be (i.e. even when bootindex is supported and used, but not when bootloader is selected).
Diffstat (limited to 'tests')
-rw-r--r--tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
index 5074e32bd..75b6b4cb8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
@@ -7,6 +7,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
+-boot menu=off \
-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-usb \