Implied by QEMU >= 1.2.0.
Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 15 ++++-----------
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +-
tests/qemuxml2argvdata/bios-nvram.args | 2 +-
tests/qemuxml2argvdata/bios.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +-
tests/qemuxml2argvdata/disk-copy_on_read.args | 2 +-
tests/qemuxml2argvdata/disk-drive-detect-zeroes.args | 2 +-
tests/qemuxml2argvdata/disk-drive-discard.args | 2 +-
tests/qemuxml2argvdata/disk-ioeventfd.args | 2 +-
tests/qemuxml2argvdata/event_idx.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-timeout.args | 2 +-
tests/qemuxml2argvdata/tpm-passthrough.args | 2 +-
tests/qemuxml2argvdata/virtio-lun.args | 2 +-
tests/qemuxml2argvtest.c | 16 ++++++----------
tests/qemuxml2xmltest.c | 2 +-
42 files changed, 24 insertions(+), 61 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 801134f205..3adb5c9af5 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3635,7 +3635,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 71a069a5c7..b2093e52db 100644
--- 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 bb69aff100..cb3c251d12 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6374,17 +6374,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 9c95914dc0..7fe822cbf9 100644
--- 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 c1d8135948..711ad04f0f 100644
--- 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 f65dfdffd8..4a6749a373 100644
--- 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 7d4a1cc0fd..f7f687c85d 100644
--- 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 4069facdda..9947b7c961 100644
--- 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 a11ed25cf6..afbb3a67bc 100644
--- 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 c9ebfa2b32..999c1504b4 100644
--- 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 1964e177eb..8f8b1aaea0 100644
--- 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 77c91cdea8..1066450dee 100644
--- 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 c3824f6f44..538fc26e83 100644
--- 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 f1a34d820e..05481cea13 100644
--- 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 02ed911679..279f5252e6 100644
--- 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 33d76cbe4d..8d33a535ad 100644
--- 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 d7adef1cb1..1d00597110 100644
--- 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 a364ea2f8f..bd52e6eee3 100644
--- 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 f22d8cdcee..7d8b21cda6 100644
--- 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 b8d1b53da9..cf6994147e 100644
--- 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 7d6cfe7f24..0b7d397125 100644
--- 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 e931d62ad5..4a1f633dbc 100644
--- 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 4062b4cafb..14750ee6be 100644
--- 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 3b95db75f6..18a81a2ab1 100644
--- 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 be68a33ab0..55f6066b24 100644
--- 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 3c4714b66d..da19644d8d 100644
--- 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 911d80d5d4..544b4ae56e 100644
--- 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 09683ec56d..5bbf174cad 100644
--- 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 4c71595d77..3b263b7db6 100644
--- 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 3e7fcfdcc9..e609fbe9ed 100644
--- 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 a23efa14cd..07d57386b6 100644
--- 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 4aec65db7e..0538c70f04 100644
--- 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 e94c544ef9..729075011c 100644
--- 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 880b77fc24..4501fdd508 100644
--- 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 61f31f0a49..7347a89df0 100644
--- 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 af8248aa90..5facc69d34 100644
--- 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 1ab2c400ae..2855bd1fea 100644
--- 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 2818132fc1..e3e6c20248 100644
--- 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 649036a4ad..1c479640bf 100644
--- 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 69bdecf56c..94f7a43a04 100644
--- 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 11f4b86610..7fce1e9b59 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -766,24 +766,21 @@ 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-multi", NONE);
DO_TEST("boot-menu-enable",
- QEMU_CAPS_BOOT_MENU);
+ 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", NONE);
DO_TEST("boot-menu-disable-drive",
- QEMU_CAPS_BOOT_MENU);
+ 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,
@@ -843,7 +840,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 182134567e..6f6c31faa6 100644
--- 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);
--
2.16.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
