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>
2025-02-22 11:22:23 +00:00 · 2018-03-29 12:51:55 +02:00 · 2018-03-29 12:51:55 +02:00 · 8b66c1bc85
commit 8b66c1bc85
parent 61623e42bc
42 changed files with 24 additions and 63 deletions
--- 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);
--- 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 */
--- 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) {
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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,\
--- 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 \
--- 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 \
--- 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,\
--- 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,\
--- 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,\
--- 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 \
--- 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 \
--- 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,
--- 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);