qemu: always assume QEMU_CAPS_USB_REDIR_BOOTINDEX

Added by QEMU commit 65bb3a5 contained in v1.1.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>

src/qemu/qemu_capabilities.c

@@ -1219,7 +1219,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPiix4PM[] = {
 
 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBRedir[] = {
     { "filter", QEMU_CAPS_USB_REDIR_FILTER },
-    { "bootindex", QEMU_CAPS_USB_REDIR_BOOTINDEX },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {

src/qemu/qemu_capabilities.h

@@ -210,7 +210,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 115 */
     QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */
-    QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */
+    X_QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */
     QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */
     QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */
     QEMU_CAPS_DEVICE_QXL, /* -device qxl */

src/qemu/qemu_command.c

@@ -9482,15 +9482,8 @@ qemuBuildRedirdevDevStr(const virDomainDef *def,
         }
     }
 
-    if (dev->info.bootIndex) {
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR_BOOTINDEX)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("USB redirection booting is not "
-                             "supported by this version of QEMU"));
-            goto error;
-        }
+    if (dev->info.bootIndex)
         virBufferAsprintf(&buf, ",bootindex=%u", dev->info.bootIndex);
-    }
 
     if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
         goto error;

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml

@@ -49,7 +49,6 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
-  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>

tests/qemuxml2argvtest.c

@@ -1547,8 +1547,7 @@ mymain(void)
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_USB_REDIR,
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_USB_REDIR_BOOTINDEX);
+            QEMU_CAPS_SPICE);
     DO_TEST("usb-redir-filter",
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_ICH9_USB_EHCI1,