openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Krempa 2018-06-26 16:55:19 +02:00
parent 716c46178a
commit fb64e176f4
3 changed files with 68 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/qemu/qemu_alias.c
View File

@ -175,44 +175,83 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
} }
/* Our custom -drive naming scheme used with id= */
int int
qemuAssignDeviceDiskAlias(virDomainDefPtr def, qemuAssignDeviceDiskAlias(virDomainDefPtr def,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk,
virQEMUCapsPtr qemuCaps)
{ {
qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
const char *prefix = virDomainDiskBusTypeToString(disk->bus); const char *prefix = virDomainDiskBusTypeToString(disk->bus);
int controllerModel = -1; int controllerModel = -1;
if (disk->info.alias) if (disk->info.alias)
return 0; return 0;
if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { if (!disk->info.alias) {
if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
controllerModel = qemuDomainFindSCSIControllerModel(def, if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
&disk->info); controllerModel = qemuDomainFindSCSIControllerModel(def,
if (controllerModel < 0) &disk->info);
return -1; if (controllerModel < 0)
} return -1;
}
if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI || if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI ||
controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) { controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
if (virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix, if (virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix,
disk->info.addr.drive.controller, disk->info.addr.drive.controller,
disk->info.addr.drive.bus, disk->info.addr.drive.bus,
disk->info.addr.drive.unit) < 0) disk->info.addr.drive.unit) < 0)
return -1; 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 { } else {
if (virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix, int idx = virDiskNameToIndex(disk->dst);
disk->info.addr.drive.controller, if (virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx) < 0)
disk->info.addr.drive.bus,
disk->info.addr.drive.target,
disk->info.addr.drive.unit) < 0)
return -1; return -1;
} }
} else { }
int idx = virDiskNameToIndex(disk->dst);
if (virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx) < 0) /* For -blockdev we need to know the qom names of the disk which are based
return -1; * 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;
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;
}
} }
return 0; return 0;
@ -551,7 +590,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
size_t i; size_t i;
for (i = 0; i < def->ndisks; 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; return -1;
} }
for (i = 0; i < def->nnets; i++) { for (i = 0; i < def->nnets; i++) {

3
src/qemu/qemu_alias.h
View File

@ -39,7 +39,8 @@ int qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
virDomainControllerDefPtr controller); virDomainControllerDefPtr controller);
int qemuAssignDeviceDiskAlias(virDomainDefPtr def, int qemuAssignDeviceDiskAlias(virDomainDefPtr def,
virDomainDiskDefPtr disk); virDomainDiskDefPtr disk,
virQEMUCapsPtr qemuCaps);
int qemuAssignDeviceHostdevAlias(virDomainDefPtr def, int qemuAssignDeviceHostdevAlias(virDomainDefPtr def,
char **alias, char **alias,

2
src/qemu/qemu_hotplug.c
View File

@ -645,7 +645,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
if (qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, false) < 0) if (qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, false) < 0)
goto cleanup; goto cleanup;
if (qemuAssignDeviceDiskAlias(vm->def, disk) < 0) if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0)
goto error; goto error;
if (!(diskdata = qemuHotplugDiskSourceAttachPrepare(disk, priv->qemuCaps))) if (!(diskdata = qemuHotplugDiskSourceAttachPrepare(disk, priv->qemuCaps)))