External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: hotplug: Assume support for -device in qemuDomainAttachSCSIDisk

Browse Source 
We've started to assume support for QEMU_CAPS_DEVICE. Doing so in the
SCSI disk hotplug code allows us to drop a lot of ugly legacy code.
This commit is contained in:
Peter Krempa 2016-03-11 15:51:17 +01:00
parent 9b73aff033
commit d4d32005d6
1 changed files with 12 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/qemu/qemu_hotplug.c
View File

@ -561,9 +561,7 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
size_t i;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virDomainControllerDefPtr cont = NULL;
char *drivestr = NULL; char *drivestr = NULL;
char *devstr = NULL; char *devstr = NULL;
int ret = -1; int ret = -1;
@ -580,27 +578,11 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn,
goto error; goto error;
} }
/* Let's make sure our disk has a controller defined and loaded if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0)
* before trying add the disk. The controller the disk is going goto error;
* to use must exist before a qemu command line string is generated.
*/
for (i = 0; i <= disk->info.addr.drive.controller; i++) {
cont = qemuDomainFindOrCreateSCSIDiskController(driver, vm, i);
if (!cont)
goto error;
}
/* Tell clang that "cont" is non-NULL. if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps)))
This is because disk->info.addr.driver.controller is unsigned, goto error;
and hence the above loop must iterate at least once. */
sa_assert(cont);
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0)
goto error;
if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps)))
goto error;
}
if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps))) if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps)))
goto error; goto error;
@ -609,38 +591,17 @@ qemuDomainAttachSCSIDisk(virConnectPtr conn,
goto error; goto error;
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
ret = qemuMonitorAddDrive(priv->mon, drivestr);
if (ret == 0) {
ret = qemuMonitorAddDevice(priv->mon, devstr);
if (ret < 0) {
VIR_WARN("qemuMonitorAddDevice failed on %s (%s)",
drivestr, devstr);
/* XXX should call 'drive_del' on error but this does not
exist yet */
}
}
} else {
if (cont->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("SCSI controller %d was missing its PCI address"),
cont->idx);
goto error;
}
virDomainDeviceDriveAddress driveAddr; ret = qemuMonitorAddDrive(priv->mon, drivestr);
ret = qemuMonitorAttachDrive(priv->mon, if (ret == 0) {
drivestr, ret = qemuMonitorAddDevice(priv->mon, devstr);
&cont->info.addr.pci, if (ret < 0) {
&driveAddr); VIR_WARN("qemuMonitorAddDevice failed on %s (%s)",
if (ret == 0) { drivestr, devstr);
/* XXX we should probably validate that the addr matches /* XXX should call 'drive_del' on error but this does not exist yet */
* our existing defined addr instead of overwriting */
disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE;
disk->info.addr.drive.bus = driveAddr.bus;
disk->info.addr.drive.unit = driveAddr.unit;
} }
} }
if (qemuDomainObjExitMonitor(driver, vm) < 0) { if (qemuDomainObjExitMonitor(driver, vm) < 0) {
ret = -1; ret = -1;
goto error; goto error;