qemu: alias: Generate QOM name of the block backend for disks

When we stop using -drive qemu stops reporting it in some of the monitor
commands. To allow referring the disk frontends and the corresponding
block backends we need to know these names. Unfortunately different
buses require different names.

Signed-off-by: Peter Krempa <pkrempa@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 80d9b6cf46bee975ab454d9d918e375342d87363..162a4d3efe72ead56652ccc38ab7fea81bbf2fd4 100644 (file)
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -175,44 +175,83 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
 }
 
 
-/* Our custom -drive naming scheme used with id= */
 int
 qemuAssignDeviceDiskAlias(virDomainDefPtr def,
-                          virDomainDiskDefPtr disk)
+                          virDomainDiskDefPtr disk,
+                          virQEMUCapsPtr qemuCaps)
 {
+    qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
     const char *prefix = virDomainDiskBusTypeToString(disk->bus);
     int controllerModel = -1;
 
     if (disk->info.alias)
         return 0;
 
-    if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
-        if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
-            controllerModel = qemuDomainFindSCSIControllerModel(def,
-                                                                &disk->info);
-            if (controllerModel < 0)
+    if (!disk->info.alias) {
+        if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
+            if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
+                controllerModel = qemuDomainFindSCSIControllerModel(def,
+                                                                    &disk->info);
+                if (controllerModel < 0)
+                    return -1;
+            }
+
+            if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI ||
+                controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
+                if (virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix,
+                                disk->info.addr.drive.controller,
+                                disk->info.addr.drive.bus,
+                                disk->info.addr.drive.unit) < 0)
+                    return -1;
+            } else {
+                if (virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix,
+                                disk->info.addr.drive.controller,
+                                disk->info.addr.drive.bus,
+                                disk->info.addr.drive.target,
+                                disk->info.addr.drive.unit) < 0)
+                    return -1;
+            }
+        } else {
+            int idx = virDiskNameToIndex(disk->dst);
+            if (virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx) < 0)
                 return -1;
         }
+    }
 
-        if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI ||
-            controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
-            if (virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix,
-                            disk->info.addr.drive.controller,
-                            disk->info.addr.drive.bus,
-                            disk->info.addr.drive.unit) < 0)
+    /* For -blockdev we need to know the qom names of the disk which are based
+     * 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 (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
+        switch ((virDomainDiskBus) disk->bus) {
+        case VIR_DOMAIN_DISK_BUS_FDC:
+        case VIR_DOMAIN_DISK_BUS_IDE:
+        case VIR_DOMAIN_DISK_BUS_SATA:
+        case VIR_DOMAIN_DISK_BUS_SCSI:
+            if (VIR_STRDUP(diskPriv->qomName, disk->info.alias) < 0)
                 return -1;
-        } else {
-            if (virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix,
-                            disk->info.addr.drive.controller,
-                            disk->info.addr.drive.bus,
-                            disk->info.addr.drive.target,
-                            disk->info.addr.drive.unit) < 0)
+            break;
+
+        case VIR_DOMAIN_DISK_BUS_VIRTIO:
+            if (virAsprintf(&diskPriv->qomName,
+                            "/machine/peripheral/%s/virtio-backend",
+                            disk->info.alias) < 0)
                 return -1;
+            break;
+
+        case VIR_DOMAIN_DISK_BUS_USB:
+            if (virAsprintf(&diskPriv->qomName,
+                            "/machine/peripheral/%s/%s.0/legacy[0]",
+                            disk->info.alias, disk->info.alias) < 0)
+                return -1;
+            break;
+
+        case VIR_DOMAIN_DISK_BUS_XEN:
+        case VIR_DOMAIN_DISK_BUS_UML:
+        case VIR_DOMAIN_DISK_BUS_SD:
+        case VIR_DOMAIN_DISK_BUS_LAST:
+            break;
         }
-    } else {
-        int idx = virDiskNameToIndex(disk->dst);
-        if (virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx) < 0)
-            return -1;
     }
 
     return 0;
@@ -551,7 +590,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
     size_t i;
 
     for (i = 0; i < def->ndisks; i++) {
-        if (qemuAssignDeviceDiskAlias(def, def->disks[i]) < 0)
+        if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 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 7bfebff968b299d36c7a5d417e7e2d776a40ea44..33b9937ea4f36d106cda6a76024ac2b7cef6dca1 100644 (file)
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -39,7 +39,8 @@ int qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
                                     virDomainControllerDefPtr controller);
 
 int qemuAssignDeviceDiskAlias(virDomainDefPtr def,
-                              virDomainDiskDefPtr disk);
+                              virDomainDiskDefPtr disk,
+                              virQEMUCapsPtr qemuCaps);
 
 int qemuAssignDeviceHostdevAlias(virDomainDefPtr def,
                                  char **alias,

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index a7809661d1ca6ac08e1c2ab654fbbf9173faae81..97009a69857df46d5120a8076e5d475524e65367 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -645,7 +645,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
     if (qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, false) < 0)
         goto cleanup;
 
-    if (qemuAssignDeviceDiskAlias(vm->def, disk) < 0)
+    if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0)
         goto error;
 
     if (!(diskdata = qemuHotplugDiskSourceAttachPrepare(disk, priv->qemuCaps)))