qemu: alias: Remove check for QEMU_CAPS_BLOCKDEV

The only instance in this file can be simplified to avoid checking the
capability.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 7b91fe3141b844c3a869d7b7385a17103eee3a0a..835401dc072ddca292038cbb9016886644833ea5 100644 (file)
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -192,8 +192,7 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainDef,
 
 int
 qemuAssignDeviceDiskAlias(virDomainDef *def,
-                          virDomainDiskDef *disk,
-                          virQEMUCaps *qemuCaps)
+                          virDomainDiskDef *disk)
 {
     qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
     const char *prefix = virDomainDiskBusTypeToString(disk->bus);
@@ -231,8 +230,7 @@ qemuAssignDeviceDiskAlias(virDomainDef *def,
      * on the alias in qemu. While certain disk types use just the alias, some
      * need the full path into /machine/peripheral as a historical artifact.
      */
-    if (!diskPriv->qomName &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
+    if (!diskPriv->qomName) {
         switch ((virDomainDiskBus) disk->bus) {
         case VIR_DOMAIN_DISK_BUS_FDC:
         case VIR_DOMAIN_DISK_BUS_IDE:
@@ -606,12 +604,12 @@ qemuAssignDeviceIOMMUAlias(virDomainIOMMUDef *iommu)
 
 
 int
-qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps)
+qemuAssignDeviceAliases(virDomainDef *def)
 {
     size_t i;
 
     for (i = 0; i < def->ndisks; i++) {
-        if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0)
+        if (qemuAssignDeviceDiskAlias(def, def->disks[i]) < 0)
             return -1;
     }
     for (i = 0; i < def->nnets; i++) {

diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 1a583b820717562fca8a9a77e791afe353c1b74d..6433ae4cecaf523ca9c4ce492076e8facd08321f 100644 (file)
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -33,8 +33,7 @@ void qemuAssignDeviceControllerAlias(virDomainDef *domainDef,
                                      virDomainControllerDef *controller);
 
 int qemuAssignDeviceDiskAlias(virDomainDef *def,
-                              virDomainDiskDef *disk,
-                              virQEMUCaps *qemuCaps);
+                              virDomainDiskDef *disk);
 
 void qemuAssignDeviceHostdevAlias(virDomainDef *def,
                                   char **alias,
@@ -71,7 +70,7 @@ void qemuAssignDeviceInputAlias(virDomainDef *def,
 
 void qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock);
 
-int qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps);
+int qemuAssignDeviceAliases(virDomainDef *def);
 
 int qemuDomainDeviceAliasIndex(const virDomainDeviceInfo *info,
                                const char *prefix);

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 2a782b6e79936e4af29f08e82d3033b8d9865ddf..a7c57cd004ccca3c6f43e9b6a3431e4eca7ebd67 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1072,7 +1072,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
 
     releaseSeclabel = true;
 
-    if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0)
+    if (qemuAssignDeviceDiskAlias(vm->def, disk) < 0)
         goto cleanup;
 
     if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 385723b5bb067d6808d7d78bc6b087902ebd7428..98cd03d0923cea7443963e4289c18fa816c8dacb 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6607,7 +6607,7 @@ qemuProcessPrepareDomain(virQEMUDriver *driver,
         return -1;
     }
 
-    if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0)
+    if (qemuAssignDeviceAliases(vm->def) < 0)
         return -1;
 
     qemuProcessPrepareDeviceBootorder(vm->def);

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 7cbe3632540be5f45cc669263b4a9830933d69f9..6275799e96d7563a3c2afbd7f215fd754c7ba2bc 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -107,7 +107,7 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt,
         return -1;
     }
 
-    if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0)
+    if (qemuAssignDeviceAliases((*vm)->def) < 0)
         return -1;
 
     (*vm)->def->id = QEMU_HOTPLUG_TEST_DOMAIN_ID;