External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 20:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: alias: Rename qemuAliasFromDisk to qemuAliasDiskDriveFromDisk

Browse Source 
Emphasize that it's for the 'drive' part of the disk.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-05-31 11:55:24 +02:00
parent 389d966abf
commit d5c5c841e0
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_alias.c
View File

@ -650,7 +650,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
} }
/* qemuAliasFromDisk /* qemuAliasDiskDriveFromDisk
* @disk: Pointer to a disk definition * @disk: Pointer to a disk definition
* *
* Generate and return an alias for the device disk '-drive' * Generate and return an alias for the device disk '-drive'
@ -658,7 +658,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
* Returns NULL with error or a string containing the alias * Returns NULL with error or a string containing the alias
*/ */
char * char *
qemuAliasFromDisk(const virDomainDiskDef *disk) qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk)
{ {
char *ret; char *ret;

2
src/qemu/qemu_alias.h
View File

@ -77,7 +77,7 @@ int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps);
int qemuDomainDeviceAliasIndex(const virDomainDeviceInfo *info, int qemuDomainDeviceAliasIndex(const virDomainDeviceInfo *info,
const char *prefix); const char *prefix);
char *qemuAliasFromDisk(const virDomainDiskDef *disk); char *qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk);
const char *qemuAliasDiskDriveSkipPrefix(const char *dev_name); const char *qemuAliasDiskDriveSkipPrefix(const char *dev_name);

2
src/qemu/qemu_block.c
View File

@ -297,7 +297,7 @@ qemuBlockDiskDetectNodes(virDomainDiskDefPtr disk,
if (src->nodeformat || src->nodestorage) if (src->nodeformat || src->nodestorage)
return 0; return 0;
if (!(alias = qemuAliasFromDisk(disk))) if (!(alias = qemuAliasDiskDriveFromDisk(disk)))
goto cleanup; goto cleanup;
if (!(entry = virHashLookup(disktable, alias))) { if (!(entry = virHashLookup(disktable, alias))) {

4
src/qemu/qemu_command.c
View File

@ -1657,7 +1657,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
goto error; goto error;
if (qemuDiskBusNeedsDeviceArg(disk->bus)) { if (qemuDiskBusNeedsDeviceArg(disk->bus)) {
char *drivealias = qemuAliasFromDisk(disk); char *drivealias = qemuAliasDiskDriveFromDisk(disk);
if (!drivealias) if (!drivealias)
goto error; goto error;
@ -2092,7 +2092,7 @@ qemuBuildDriveDevStr(const virDomainDef *def,
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SHARE_RW)) virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SHARE_RW))
virBufferAddLit(&opt, ",share-rw=on"); virBufferAddLit(&opt, ",share-rw=on");
if (!(drivealias = qemuAliasFromDisk(disk))) if (!(drivealias = qemuAliasDiskDriveFromDisk(disk)))
goto error; goto error;
virBufferAsprintf(&opt, ",drive=%s,id=%s", drivealias, disk->info.alias); virBufferAsprintf(&opt, ",drive=%s,id=%s", drivealias, disk->info.alias);
VIR_FREE(drivealias); VIR_FREE(drivealias);

18
src/qemu/qemu_driver.c
View File

@ -10988,7 +10988,7 @@ qemuDomainBlockResize(virDomainPtr dom,
disk->src->format == VIR_STORAGE_FILE_QED) disk->src->format == VIR_STORAGE_FILE_QED)
size = VIR_ROUND_UP(size, 512); size = VIR_ROUND_UP(size, 512);
if (!(device = qemuAliasFromDisk(disk))) if (!(device = qemuAliasDiskDriveFromDisk(disk)))
goto endjob; goto endjob;
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
@ -14956,7 +14956,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
const char *formatStr = NULL; const char *formatStr = NULL;
int ret = -1, rc; int ret = -1, rc;
if (!(device = qemuAliasFromDisk(dd->disk))) if (!(device = qemuAliasDiskDriveFromDisk(dd->disk)))
goto cleanup; goto cleanup;
if (qemuGetDriveSourceString(dd->src, NULL, &source) < 0) if (qemuGetDriveSourceString(dd->src, NULL, &source) < 0)
@ -17004,7 +17004,7 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver,
if (!(disk = qemuDomainDiskByName(vm->def, path))) if (!(disk = qemuDomainDiskByName(vm->def, path)))
goto endjob; goto endjob;
if (!(device = qemuAliasFromDisk(disk))) if (!(device = qemuAliasDiskDriveFromDisk(disk)))
goto endjob; goto endjob;
if (qemuDomainDiskBlockJobIsActive(disk)) if (qemuDomainDiskBlockJobIsActive(disk))
@ -17117,7 +17117,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
if (!(disk = qemuDomainDiskByName(vm->def, path))) if (!(disk = qemuDomainDiskByName(vm->def, path)))
goto endjob; goto endjob;
if (!(device = qemuAliasFromDisk(disk))) if (!(device = qemuAliasDiskDriveFromDisk(disk)))
goto endjob; goto endjob;
if (disk->mirrorState != VIR_DOMAIN_DISK_MIRROR_STATE_NONE && if (disk->mirrorState != VIR_DOMAIN_DISK_MIRROR_STATE_NONE &&
@ -17348,7 +17348,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom,
if (!(disk = qemuDomainDiskByName(vm->def, path))) if (!(disk = qemuDomainDiskByName(vm->def, path)))
goto endjob; goto endjob;
if (!(device = qemuAliasFromDisk(disk))) if (!(device = qemuAliasDiskDriveFromDisk(disk)))
goto endjob; goto endjob;
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
@ -17480,7 +17480,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
if (!(disk = qemuDomainDiskByName(vm->def, path))) if (!(disk = qemuDomainDiskByName(vm->def, path)))
goto endjob; goto endjob;
if (!(device = qemuAliasFromDisk(disk))) if (!(device = qemuAliasDiskDriveFromDisk(disk)))
goto endjob; goto endjob;
if (qemuDomainDiskBlockJobIsActive(disk)) if (qemuDomainDiskBlockJobIsActive(disk))
@ -17860,7 +17860,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
if (!(disk = qemuDomainDiskByName(vm->def, path))) if (!(disk = qemuDomainDiskByName(vm->def, path)))
goto endjob; goto endjob;
if (!(device = qemuAliasFromDisk(disk))) if (!(device = qemuAliasDiskDriveFromDisk(disk)))
goto endjob; goto endjob;
if (!disk->src->path) { if (!disk->src->path) {
@ -18491,7 +18491,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
if (!(disk = qemuDomainDiskByName(def, path))) if (!(disk = qemuDomainDiskByName(def, path)))
goto endjob; goto endjob;
if (!(device = qemuAliasFromDisk(disk))) if (!(device = qemuAliasDiskDriveFromDisk(disk)))
goto endjob; goto endjob;
if (qemuDomainSetBlockIoTuneDefaults(&info, &disk->blkdeviotune, if (qemuDomainSetBlockIoTuneDefaults(&info, &disk->blkdeviotune,
@ -18664,7 +18664,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
if (!(disk = qemuDomainDiskByName(def, path))) if (!(disk = qemuDomainDiskByName(def, path)))
goto endjob; goto endjob;
if (!(device = qemuAliasFromDisk(disk))) if (!(device = qemuAliasDiskDriveFromDisk(disk)))
goto endjob; goto endjob;
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
ret = qemuMonitorGetBlockIoThrottle(priv->mon, device, &reply); ret = qemuMonitorGetBlockIoThrottle(priv->mon, device, &reply);

6
src/qemu/qemu_hotplug.c
View File

@ -270,7 +270,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
if (qemuHotplugPrepareDiskAccess(driver, vm, disk, newsrc, false) < 0) if (qemuHotplugPrepareDiskAccess(driver, vm, disk, newsrc, false) < 0)
goto cleanup; goto cleanup;
if (!(driveAlias = qemuAliasFromDisk(disk))) if (!(driveAlias = qemuAliasDiskDriveFromDisk(disk)))
goto error; goto error;
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
@ -446,7 +446,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
if (!(drivestr = qemuBuildDriveStr(disk, false, priv->qemuCaps))) if (!(drivestr = qemuBuildDriveStr(disk, false, priv->qemuCaps)))
goto error; goto error;
if (!(drivealias = qemuAliasFromDisk(disk))) if (!(drivealias = qemuAliasDiskDriveFromDisk(disk)))
goto error; goto error;
if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps))) if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps)))
@ -3845,7 +3845,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
/* build the actual drive id string as the disk->info.alias doesn't /* build the actual drive id string as the disk->info.alias doesn't
* contain the QEMU_DRIVE_HOST_PREFIX that is passed to qemu */ * contain the QEMU_DRIVE_HOST_PREFIX that is passed to qemu */
if (!(drivestr = qemuAliasFromDisk(disk))) if (!(drivestr = qemuAliasDiskDriveFromDisk(disk)))
return -1; return -1;
if (diskPriv) { if (diskPriv) {

6
src/qemu/qemu_migration.c
View File

@ -400,7 +400,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver,
} }
VIR_FREE(diskAlias); VIR_FREE(diskAlias);
if (!(diskAlias = qemuAliasFromDisk(disk))) if (!(diskAlias = qemuAliasDiskDriveFromDisk(disk)))
goto cleanup; goto cleanup;
if (qemuDomainObjEnterMonitorAsync(driver, vm, if (qemuDomainObjEnterMonitorAsync(driver, vm,
@ -651,7 +651,7 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
if (!(diskAlias = qemuAliasFromDisk(disk))) if (!(diskAlias = qemuAliasDiskDriveFromDisk(disk)))
return -1; return -1;
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
@ -951,7 +951,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver,
if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks))
continue; continue;
if (!(diskAlias = qemuAliasFromDisk(disk))) if (!(diskAlias = qemuAliasDiskDriveFromDisk(disk)))
goto cleanup; goto cleanup;
qemuBlockJobSyncBegin(disk); qemuBlockJobSyncBegin(disk);