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: Rename qemuDomainPrepareDisk to qemuHotplugPrepareDiskAccess

Browse Source 
Match the prefix of the file and choose a name which better describes
what happens.
This commit is contained in:
Peter Krempa 2017-11-23 16:48:50 +01:00
parent eeaf6657f7
commit 7aa8a9a621
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qemu/qemu_hotplug.c
View File

@ -70,7 +70,7 @@ unsigned long long qemuDomainRemoveDeviceWaitTime = 1000ull * 5;
/** /**
* qemuDomainPrepareDisk: * qemuHotplugPrepareDiskAccess:
* @driver: qemu driver struct * @driver: qemu driver struct
* @vm: domain object * @vm: domain object
* @disk: disk to prepare * @disk: disk to prepare
@ -85,11 +85,11 @@ unsigned long long qemuDomainRemoveDeviceWaitTime = 1000ull * 5;
* Returns 0 on success and -1 on error. Reports libvirt error. * Returns 0 on success and -1 on error. Reports libvirt error.
*/ */
static int static int
qemuDomainPrepareDisk(virQEMUDriverPtr driver, qemuHotplugPrepareDiskAccess(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
virStorageSourcePtr overridesrc, virStorageSourcePtr overridesrc,
bool teardown) bool teardown)
{ {
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
int ret = -1; int ret = -1;
@ -280,7 +280,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
if (qemuDomainPrepareDisk(driver, vm, disk, newsrc, false) < 0) if (qemuHotplugPrepareDiskAccess(driver, vm, disk, newsrc, false) < 0)
goto cleanup; goto cleanup;
if (!(driveAlias = qemuAliasFromDisk(disk))) if (!(driveAlias = qemuAliasFromDisk(disk)))
@ -331,7 +331,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
/* remove the old source from shared device list */ /* remove the old source from shared device list */
ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name)); ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name));
ignore_value(qemuDomainPrepareDisk(driver, vm, disk, NULL, true)); ignore_value(qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, true));
virStorageSourceFree(disk->src); virStorageSourceFree(disk->src);
disk->src = newsrc; disk->src = newsrc;
@ -345,7 +345,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
error: error:
virDomainAuditDisk(vm, disk->src, newsrc, "update", false); virDomainAuditDisk(vm, disk->src, newsrc, "update", false);
ignore_value(qemuDomainPrepareDisk(driver, vm, disk, newsrc, true)); ignore_value(qemuHotplugPrepareDiskAccess(driver, vm, disk, newsrc, true));
goto cleanup; goto cleanup;
} }
@ -378,7 +378,7 @@ qemuDomainAttachDiskGeneric(virConnectPtr conn,
qemuDomainSecretInfoPtr secinfo = NULL; qemuDomainSecretInfoPtr secinfo = NULL;
qemuDomainSecretInfoPtr encinfo = NULL; qemuDomainSecretInfoPtr encinfo = NULL;
if (qemuDomainPrepareDisk(driver, vm, disk, NULL, false) < 0) if (qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, false) < 0)
goto cleanup; goto cleanup;
if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0) if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0)
@ -486,7 +486,7 @@ qemuDomainAttachDiskGeneric(virConnectPtr conn,
error: error:
qemuDomainDelDiskSrcTLSObject(driver, vm, disk->src); qemuDomainDelDiskSrcTLSObject(driver, vm, disk->src);
ignore_value(qemuDomainPrepareDisk(driver, vm, disk, NULL, true)); ignore_value(qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, true));
goto cleanup; goto cleanup;
} }