qemu: deprecate QEMU_CAPS_BOOT_MENU

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 522fcd5e282ae675d9c4c4d7db6593cb9197e8ed..13d58e79ff4a154cbf323290ad486fad03bb5b70 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3631,7 +3631,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 6b29d66e4557ce8d831abce1afe5114308198dfb..b674dcb06eafa7c0f0e0d5fd1fe209e6f99e42a8 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -100,7 +100,7 @@ typedef enum {
     QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */
     QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */
     X_QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */
-    QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */
+    X_QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */
     X_QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */
 
     /* 40 */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0c109c63e74ee1dbbf1a40e360e07c73eb8ea0a0..2bcac11867cb1843bd860656aab780818050e20e 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6375,17 +6375,10 @@ qemuBuildBootCommandLine(virCommandPtr cmd,
     }
 
     if (def->os.bootmenu) {
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOT_MENU)) {
-            if (def->os.bootmenu == VIR_TRISTATE_BOOL_YES)
-                virBufferAddLit(&boot_buf, "menu=on,");
-            else
-                virBufferAddLit(&boot_buf, "menu=off,");
-        } else {
-            /* We cannot emit an error when bootmenu is enabled but
-             * unsupported because of backward compatibility */
-            VIR_WARN("bootmenu is enabled but not "
-                     "supported by this QEMU binary");
-        }
+        if (def->os.bootmenu == VIR_TRISTATE_BOOL_YES)
+            virBufferAddLit(&boot_buf, "menu=on,");
+        else
+            virBufferAddLit(&boot_buf, "menu=off,");
     }
 
     if (def->os.bios.rt_set) {

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 9c95914dc03b3e94a72f292b75c355b024d219ea..7fe822cbf9bb9e219df8ee2b7057efa12b5dd6a7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index c1d81359487788cfc23c4939b956f01cf50fa683..711ad04f0f41452452b903cfed3a882f1528dde6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index f65dfdffd881b8d43ca791faf269a83a41cf9790..4a6749a3734399e3b468a144202e36a7d7da772b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 7d4a1cc0fd9dc97316eb26a4da97d46503bcf5e2..f7f687c85d4a4e20d2f43b54e3776c6c4e922767 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 4069facdda1d45cdf75ad08891e14428180d1f36..9947b7c96177413774bc75f167c6296f07467be6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index a11ed25cf68992379b6008396927e5c82a2d1cf0..afbb3a67bc7df535f51020018d7d551ed1d73344 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index c9ebfa2b32aacf623e4b3dd0b66beb4262640bf1..999c1504b4f9c772722a3c08f333ebfa9ed69484 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 1964e177ebe65b6a8632b5e21b707d2e03777c87..8f8b1aaea07ed887f858eecc4f682ba559175c26 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 77c91cdea89bf8a0ee46fcf0b14825ef0144c446..1066450dee9c19fddaa38e4c6636bc449dbdecb0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 149c0eed112b706cec838458c56f7e7232eee3c9..289409401188ba52f54630576a63a528c9c76629 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index f1a34d820ed16eca2a4dd39281828477b31a2484..05481cea13d8289e9740b4676d7fe93257473cfa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 02ed911679f5e8bb52e44f34b2f1c1ea254d7cfc..279f5252e6ab8abe36bac4b7d06e839d03b76b16 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='enable-kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 6c36b12818dea927fc0fdbb2092984473a3ff7e0..281edf8e01bf66229718e94c0c111a08ecdd01e7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index d7adef1cb10a80e8b8eb897c60f2b3a285c3deb2..1d00597110e199edc432d46fe8dc3f3b502f667f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index a364ea2f8f619f0455a4be2cd8d34ba0b7975510..bd52e6eee35de03f165c0dd868927e531003b703 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index f22d8cdcee93dd7f0eb5b6870cf81dc1bb071296..7d8b21cda61c0e987933bffaf9d34a2fc32da1a3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index b8d1b53da91127a2147668f1c1a1d80725352b75..cf6994147e6c02af4df27bc65588f0d86523c28e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 7d6cfe7f247b0019ab5af3230da29104447f9476..0b7d39712519d10cd7eb48307ced7253cd59a8ec 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index e931d62ad55b33d1dcd9bcde02e193cbe72a6f6c..4a1f633dbc7d4319a17f4622ae6e1cb3a4964cbd 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 4062b4cafb67d8dd08064243f5e962a62f196818..14750ee6be3c09fe3509e097ec081deeebcc90a2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 3b95db75f62f8e0f928b3a1d9518ce8b31b5fdb3..18a81a2ab111aa697a2da52f58a0ce78386ccc83 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index be68a33ab0d687bcea4aaa38ef5f9455f96726f4..55f6066b24559b509c36aac1aa6ca03c251117bf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 3c4714b66d2530e6b93df4b87168f1aa96fd755d..da19644d8db0b903d86acab95083d934881ee9b5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 911d80d5d442df15a60614bede415d21664fefa7..544b4ae56ed8d1caf225e83b8db96035433d3c4e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 09683ec56d1a3f5ceb3b61303eae67e0ab60bb8a..5bbf174cad012e8d4acea065235d1070b9374494 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='boot-menu'/>
   <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>

diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args
index 4c71595d771eab5afacd3c43d56bff8d48987461..3b263b7db63d198a265e9bcf548e06b947cd4418 100644 (file)
--- a/tests/qemuxml2argvdata/bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
@@ -22,7 +22,7 @@ readonly=on \
 server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
--boot c \
+-boot order=c,menu=on \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
 -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \

diff --git a/tests/qemuxml2argvdata/bios-nvram.args b/tests/qemuxml2argvdata/bios-nvram.args
index 3e7fcfdcc9372eb4832561fe34da581e38b7ad61..e609fbe9ed5292f2d454a7c7eb8409af435eb917 100644 (file)
--- a/tests/qemuxml2argvdata/bios-nvram.args
+++ b/tests/qemuxml2argvdata/bios-nvram.args
@@ -21,7 +21,7 @@ readonly=on \
 server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
--boot c \
+-boot order=c,menu=on \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \

diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index a23efa14cdbe9bbb693f655d0987c3da86d78925..07d57386b62ca15821675d4fb0ef1d2325c452e0 100644 (file)
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -21,7 +21,7 @@ server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-acpi \
--boot c \
+-boot order=c,menu=on \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \

diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args b/tests/qemuxml2argvdata/disk-cdrom-tray.args
index 4aec65db7efb14379ef55e93407d91cb54c20667..0538c70f0405c45694e3f79143825e4df19264bf 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args
@@ -19,7 +19,7 @@ server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-acpi \
--boot dc \
+-boot order=dc,menu=on \
 -usb \
 -drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\
 id=drive-virtio-disk0 \

diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args b/tests/qemuxml2argvdata/disk-copy_on_read.args
index e94c544ef90d756282f479bcd9193133a73ae981..729075011c1f63e2d2f5921f2d9c27fd5fe39f81 100644 (file)
--- a/tests/qemuxml2argvdata/disk-copy_on_read.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.args
@@ -19,7 +19,7 @@ server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-acpi \
--boot dc \
+-boot order=dc,menu=on \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
 -usb \
 -drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\

diff --git a/tests/qemuxml2argvdata/disk-drive-detect-zeroes.args b/tests/qemuxml2argvdata/disk-drive-detect-zeroes.args
index 880b77fc24d90db4766ae217d51bdb511d7928bd..4501fdd508b24d977fa417e4c57c47157aea02d2 100644 (file)
--- a/tests/qemuxml2argvdata/disk-drive-detect-zeroes.args
+++ b/tests/qemuxml2argvdata/disk-drive-detect-zeroes.args
@@ -19,7 +19,7 @@ server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-acpi \
--boot dc \
+-boot order=dc,menu=on \
 -usb \
 -drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\
 id=drive-virtio-disk0,discard=unmap,detect-zeroes=unmap \

diff --git a/tests/qemuxml2argvdata/disk-drive-discard.args b/tests/qemuxml2argvdata/disk-drive-discard.args
index 61f31f0a499849dde88897af300acedb810d6cf0..7347a89df019f5add24b81934225b4b673857df6 100644 (file)
--- a/tests/qemuxml2argvdata/disk-drive-discard.args
+++ b/tests/qemuxml2argvdata/disk-drive-discard.args
@@ -19,7 +19,7 @@ server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-acpi \
--boot dc \
+-boot order=dc,menu=on \
 -usb \
 -drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\
 id=drive-virtio-disk0,discard=unmap \

diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args b/tests/qemuxml2argvdata/disk-ioeventfd.args
index af8248aa90ff3972b6f5212d379b7dd86ba6b4db..5facc69d34e2c4403d75694f4a387b6aa058ed8a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.args
@@ -19,7 +19,7 @@ server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-acpi \
--boot dc \
+-boot order=dc,menu=on \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
 -usb \
 -drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\

diff --git a/tests/qemuxml2argvdata/event_idx.args b/tests/qemuxml2argvdata/event_idx.args
index 1ab2c400ae4f23bb97920d4baf83d1c3f869d419..2855bd1feab883a9f7dfb6e6df70951ec66b9b59 100644 (file)
--- a/tests/qemuxml2argvdata/event_idx.args
+++ b/tests/qemuxml2argvdata/event_idx.args
@@ -19,7 +19,7 @@ server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-acpi \
--boot dc \
+-boot order=dc,menu=on \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
 -usb \
 -drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\

diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args
index 2818132fc1d804dee94289090742bc136989bbd8..e3e6c20248c050bbb39bafc6b328f36cd3bb0a8b 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=spice \
 nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
--boot dc \
+-boot order=dc,menu=on \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
 -usb \
 -drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\

diff --git a/tests/qemuxml2argvdata/tpm-passthrough.args b/tests/qemuxml2argvdata/tpm-passthrough.args
index 649036a4ad5ce53ca14db5e060ed81db4606eb3f..1c479640bf6ca2bfc04cedc9a368208340277ce4 100644 (file)
--- a/tests/qemuxml2argvdata/tpm-passthrough.args
+++ b/tests/qemuxml2argvdata/tpm-passthrough.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
--boot c \
+-boot order=c,menu=on \
 -usb \
 -tpmdev passthrough,id=tpm-tpm0,path=/dev/tpm0,\
 cancel-path=/sys/class/misc/tpm0/device/cancel \

diff --git a/tests/qemuxml2argvdata/virtio-lun.args b/tests/qemuxml2argvdata/virtio-lun.args
index 69bdecf56c9a8a7c6a080329b772b7ddf93720ca..94f7a43a04b3687ec3184020a5436da2fb250cdd 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-lun.args
+++ b/tests/qemuxml2argvdata/virtio-lun.args
@@ -19,7 +19,7 @@ server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-acpi \
--boot dc \
+-boot order=dc,menu=on \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
 -usb \
 -drive file=/dev/sdfake,format=qcow2,if=none,id=drive-virtio-disk0 \

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b11c45c4688f3c10c3bf1ca26be3b1ffffe4724d..ff46c7db2aa6ef46387bcb380515180292d5527c 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -763,24 +763,19 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI);
     DO_TEST("bootindex-floppy-q35",
             QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_BOOT_MENU,
+            QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_BOOTINDEX);
-    DO_TEST("boot-multi", QEMU_CAPS_BOOT_MENU);
-    DO_TEST("boot-menu-enable",
-            QEMU_CAPS_BOOT_MENU);
+    DO_TEST("boot-multi", NONE);
+    DO_TEST("boot-menu-enable", NONE);
     DO_TEST("boot-menu-enable-bootindex",
-            QEMU_CAPS_BOOT_MENU,
             QEMU_CAPS_BOOTINDEX);
     DO_TEST("boot-menu-enable-with-timeout",
-            QEMU_CAPS_BOOT_MENU,
             QEMU_CAPS_SPLASH_TIMEOUT);
-    DO_TEST_FAILURE("boot-menu-enable-with-timeout", QEMU_CAPS_BOOT_MENU);
+    DO_TEST_FAILURE("boot-menu-enable-with-timeout", NONE);
     DO_TEST_PARSE_ERROR("boot-menu-enable-with-timeout-invalid", NONE);
-    DO_TEST("boot-menu-disable", QEMU_CAPS_BOOT_MENU);
-    DO_TEST("boot-menu-disable-drive",
-            QEMU_CAPS_BOOT_MENU);
+    DO_TEST("boot-menu-disable", NONE);
+    DO_TEST("boot-menu-disable-drive", NONE);
     DO_TEST("boot-menu-disable-drive-bootindex",
-            QEMU_CAPS_BOOT_MENU,
             QEMU_CAPS_BOOTINDEX);
     DO_TEST_PARSE_ERROR("boot-dev+order",
             QEMU_CAPS_BOOTINDEX,
@@ -840,7 +835,6 @@ mymain(void)
     DO_TEST("controller-order",
             QEMU_CAPS_KVM,
             QEMU_CAPS_ENABLE_KVM,
-            QEMU_CAPS_BOOT_MENU,
             QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_DRIVE_AIO,
             QEMU_CAPS_CCID_PASSTHRU,

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index d5010d2973e1e9352cad50d2beeedeb3814d6a6c..b7be692eeb43522e31944853c94f66ce3c05e0df 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -289,7 +289,7 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI);
     DO_TEST("bootindex-floppy-q35",
             QEMU_CAPS_DEVICE_IOH3420,
-            QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_BOOT_MENU,
+            QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_BOOTINDEX);
     DO_TEST("boot-multi", NONE);
     DO_TEST("boot-menu-enable-with-timeout", NONE);