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.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - 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 +- 44 files changed, 24 insertions(+), 63 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 90b1c0b2c..da4403c3a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3633,7 +3633,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 4e1558b52..ed6043f97 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 f19a8882a..ae2c4fcf1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6379,17 +6379,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.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 1dea27ed5..2d5e87878 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.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_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index af1d8beb8..ced532236 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.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.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 9c95914dc..7fe822cbf 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 c1d813594..711ad04f0 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 f65dfdffd..4a6749a37 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 7d4a1cc0f..f7f687c85 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 28cd0f92d..9cfb13c15 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 b20500a53..482a6777f 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 9a0b66cd4..4b42badae 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 c84b419d5..0847df131 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 99e8bbcd3..64e467c9b 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 9cdcf8d17..89ceab5be 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 5623559dd..ecf50e74d 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 78bdd16c3..3c85651fe 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 1a3ae5ae5..697c1409c 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 d7adef1cb..1d0059711 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 a364ea2f8..bd52e6eee 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 f22d8cdce..7d8b21cda 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 b8d1b53da..cf6994147 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 7d6cfe7f2..0b7d39712 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 e931d62ad..4a1f633db 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 4062b4caf..14750ee6b 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 3b95db75f..18a81a2ab 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 be68a33ab..55f6066b2 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 3c4714b66..da19644d8 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 911d80d5d..544b4ae56 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 09683ec56..5bbf174ca 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 4c71595d7..3b263b7db 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 3e7fcfdcc..e609fbe9e 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 a23efa14c..07d57386b 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 4aec65db7..0538c70f0 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 e94c544ef..729075011 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 880b77fc2..4501fdd50 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 61f31f0a4..7347a89df 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 af8248aa9..5facc69d3 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 1ab2c400a..2855bd1fe 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 2818132fc..e3e6c2024 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 649036a4a..1c479640b 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 69bdecf56..94f7a43a0 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 e696af7a3..d6fb2b5be 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -728,24 +728,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, @@ -805,7 +802,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 182134567..6f6c31faa 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