[PATCH 2/6] qemu: capabilities: Remove unused QEMU_CAPS_DRIVE_BOOT

[Peter Krempa <pkrempa@xxxxxxxxxx>]

The capability was never set except for (stale) tests. Remove it.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_capabilities.h |  2 +-
 src/qemu/qemu_command.c      | 19 +------------------
 tests/qemuxml2argvtest.c     | 26 +++++++++-----------------
 3 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index f48de7d89f..26813a908c 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -52,7 +52,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     X_QEMU_CAPS_VNC_COLON, /* VNC takes or address + display */
     X_QEMU_CAPS_NO_REBOOT, /* Is the -no-reboot flag available */
     X_QEMU_CAPS_DRIVE, /* Is the new -drive arg available */
-    QEMU_CAPS_DRIVE_BOOT, /* Does -drive support boot=on */
+    X_QEMU_CAPS_DRIVE_BOOT, /* Does -drive support boot=on */

     /* 5 */
     X_QEMU_CAPS_NAME, /* Is the -name flag available */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d507e957a5..78090898be 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1632,7 +1632,7 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk,

 static char *
 qemuBuildDriveStr(virDomainDiskDefPtr disk,
-                  bool bootable,
+                  bool bootable ATTRIBUTE_UNUSED,
                   virQEMUCapsPtr qemuCaps)
 {
     virBuffer opt = VIR_BUFFER_INITIALIZER;
@@ -1689,15 +1689,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
         }
     }

-    /* This is a frontend attribute which was replaced by bootindex passed in
-     * with -device arguments. */
-    if (bootable &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) &&
-        (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK ||
-         disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) &&
-        disk->bus != VIR_DOMAIN_DISK_BUS_IDE)
-        virBufferAddLit(&opt, ",boot=on");
-
     if (disk->src->readonly)
         virBufferAddLit(&opt, ",readonly=on");

@@ -10243,14 +10234,6 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
     if (qemuBuildCommandLineValidate(driver, def) < 0)
         goto error;

-    /*
-     * do not use boot=on for drives when not using KVM since this
-     * is not supported at all in upstream QEMU.
-     */
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) &&
-        (def->virtType == VIR_DOMAIN_VIRT_QEMU))
-        virQEMUCapsClear(qemuCaps, QEMU_CAPS_DRIVE_BOOT);
-
     cmd = virCommandNew(def->emulator);

     virCommandAddEnvPassCommon(cmd);
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b9dc6850e2..2860a53f00 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -882,13 +882,10 @@ mymain(void)
     DO_TEST("boot-order",
             QEMU_CAPS_VIRTIO_BLK_SCSI);
     DO_TEST("boot-complex",
-            QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_VIRTIO_BLK_SCSI);
     DO_TEST("boot-complex-bootindex",
-            QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_VIRTIO_BLK_SCSI);
     DO_TEST("boot-strict",
-            QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_BOOT_STRICT,
             QEMU_CAPS_VIRTIO_BLK_SCSI);

@@ -1012,31 +1009,26 @@ mymain(void)
     DO_TEST("disk-floppy-tray", NONE);
     DO_TEST("disk-virtio-s390",
             QEMU_CAPS_VIRTIO_S390);
-    DO_TEST("disk-virtio", QEMU_CAPS_DRIVE_BOOT);
+    DO_TEST("disk-virtio", NONE);
     DO_TEST("disk-virtio-ccw",
             QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST("disk-virtio-ccw-many",
             QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
     DO_TEST("disk-virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
-    DO_TEST("disk-order",
-            QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_BLK_SCSI);
+    DO_TEST("disk-order", QEMU_CAPS_VIRTIO_BLK_SCSI);
     DO_TEST("disk-virtio-queues",
             QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES);
-    DO_TEST("disk-boot-disk",
-            QEMU_CAPS_DRIVE_BOOT);
-    DO_TEST("disk-boot-cdrom",
-            QEMU_CAPS_DRIVE_BOOT);
-    DO_TEST("floppy-drive-fat",
-            QEMU_CAPS_DRIVE_BOOT);
+    DO_TEST("disk-boot-disk", NONE);
+    DO_TEST("disk-boot-cdrom", NONE);
+    DO_TEST("floppy-drive-fat", NONE);
     DO_TEST_CAPS_LATEST("floppy-drive-fat");
     DO_TEST("disk-readonly-disk", NONE);
     DO_TEST_CAPS_LATEST("disk-readonly-disk");
-    DO_TEST("disk-fmt-qcow",
-            QEMU_CAPS_DRIVE_BOOT);
-    DO_TEST_PARSE_ERROR("disk-fmt-cow", QEMU_CAPS_DRIVE_BOOT);
-    DO_TEST_PARSE_ERROR("disk-fmt-dir", QEMU_CAPS_DRIVE_BOOT);
-    DO_TEST_PARSE_ERROR("disk-fmt-iso", QEMU_CAPS_DRIVE_BOOT);
+    DO_TEST("disk-fmt-qcow", NONE);
+    DO_TEST_PARSE_ERROR("disk-fmt-cow", NONE);
+    DO_TEST_PARSE_ERROR("disk-fmt-dir", NONE);
+    DO_TEST_PARSE_ERROR("disk-fmt-iso", NONE);
     DO_TEST("disk-shared", NONE);
     DO_TEST_CAPS_LATEST("disk-shared");
     DO_TEST_PARSE_ERROR("disk-shared-qcow", NONE);
-- 
2.16.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list