From nobody Wed May 14 16:52:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1527868303309708.8911567765246; Fri, 1 Jun 2018 08:51:43 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5284DC04B2F1; Fri, 1 Jun 2018 15:51:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0270A60BE3; Fri, 1 Jun 2018 15:51:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 575F71800FC2; Fri, 1 Jun 2018 15:51:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w51FpRFF010602 for ; Fri, 1 Jun 2018 11:51:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1673D2026DFD; Fri, 1 Jun 2018 15:51:27 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 932862026DEF for ; Fri, 1 Jun 2018 15:51:26 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 1 Jun 2018 17:51:05 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/9] qemu: alias: Rename qemuAliasFromDisk to qemuAliasDiskDriveFromDisk X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 01 Jun 2018 15:51:42 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Emphasize that it's for the 'drive' part of the disk. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_alias.c | 4 ++-- src/qemu/qemu_alias.h | 2 +- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_driver.c | 18 +++++++++--------- src/qemu/qemu_hotplug.c | 6 +++--- src/qemu/qemu_migration.c | 6 +++--- src/qemu/qemu_process.c | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 89dec91ed1..989cbb4ba9 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -650,7 +650,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCap= sPtr qemuCaps) } -/* qemuAliasFromDisk +/* qemuAliasDiskDriveFromDisk * @disk: Pointer to a disk definition * * Generate and return an alias for the device disk '-drive' @@ -658,7 +658,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCap= sPtr qemuCaps) * Returns NULL with error or a string containing the alias */ char * -qemuAliasFromDisk(const virDomainDiskDef *disk) +qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk) { char *ret; diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 51f64624d7..0e2370b737 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -75,7 +75,7 @@ int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUC= apsPtr qemuCaps); int qemuDomainDeviceAliasIndex(const virDomainDeviceInfo *info, const char *prefix); -char *qemuAliasFromDisk(const virDomainDiskDef *disk); +char *qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk); const char *qemuAliasDiskDriveSkipPrefix(const char *dev_name); diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index d1c2d756c2..85176925c9 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -297,7 +297,7 @@ qemuBlockDiskDetectNodes(virDomainDiskDefPtr disk, if (src->nodeformat || src->nodestorage) return 0; - if (!(alias =3D qemuAliasFromDisk(disk))) + if (!(alias =3D qemuAliasDiskDriveFromDisk(disk))) goto cleanup; if (!(entry =3D virHashLookup(disktable, alias))) { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1e30c79d6f..484ac261b0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1652,7 +1652,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, goto error; if (qemuDiskBusNeedsDeviceArg(disk->bus)) { - char *drivealias =3D qemuAliasFromDisk(disk); + char *drivealias =3D qemuAliasDiskDriveFromDisk(disk); if (!drivealias) goto error; @@ -2087,7 +2087,7 @@ qemuBuildDriveDevStr(const virDomainDef *def, virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SHARE_RW)) virBufferAddLit(&opt, ",share-rw=3Don"); - if (!(drivealias =3D qemuAliasFromDisk(disk))) + if (!(drivealias =3D qemuAliasDiskDriveFromDisk(disk))) goto error; virBufferAsprintf(&opt, ",drive=3D%s,id=3D%s", drivealias, disk->info.= alias); VIR_FREE(drivealias); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 05a09eb706..b7c3348550 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10960,7 +10960,7 @@ qemuDomainBlockResize(virDomainPtr dom, disk->src->format =3D=3D VIR_STORAGE_FILE_QED) size =3D VIR_ROUND_UP(size, 512); - if (!(device =3D qemuAliasFromDisk(disk))) + if (!(device =3D qemuAliasDiskDriveFromDisk(disk))) goto endjob; qemuDomainObjEnterMonitor(driver, vm); @@ -14928,7 +14928,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDri= verPtr driver, const char *formatStr =3D NULL; int ret =3D -1, rc; - if (!(device =3D qemuAliasFromDisk(dd->disk))) + if (!(device =3D qemuAliasDiskDriveFromDisk(dd->disk))) goto cleanup; if (qemuGetDriveSourceString(dd->src, NULL, &source) < 0) @@ -16976,7 +16976,7 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver, if (!(disk =3D qemuDomainDiskByName(vm->def, path))) goto endjob; - if (!(device =3D qemuAliasFromDisk(disk))) + if (!(device =3D qemuAliasDiskDriveFromDisk(disk))) goto endjob; if (qemuDomainDiskBlockJobIsActive(disk)) @@ -17089,7 +17089,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, if (!(disk =3D qemuDomainDiskByName(vm->def, path))) goto endjob; - if (!(device =3D qemuAliasFromDisk(disk))) + if (!(device =3D qemuAliasDiskDriveFromDisk(disk))) goto endjob; if (disk->mirrorState !=3D VIR_DOMAIN_DISK_MIRROR_STATE_NONE && @@ -17320,7 +17320,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, if (!(disk =3D qemuDomainDiskByName(vm->def, path))) goto endjob; - if (!(device =3D qemuAliasFromDisk(disk))) + if (!(device =3D qemuAliasDiskDriveFromDisk(disk))) goto endjob; qemuDomainObjEnterMonitor(driver, vm); @@ -17452,7 +17452,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, if (!(disk =3D qemuDomainDiskByName(vm->def, path))) goto endjob; - if (!(device =3D qemuAliasFromDisk(disk))) + if (!(device =3D qemuAliasDiskDriveFromDisk(disk))) goto endjob; if (qemuDomainDiskBlockJobIsActive(disk)) @@ -17832,7 +17832,7 @@ qemuDomainBlockCommit(virDomainPtr dom, if (!(disk =3D qemuDomainDiskByName(vm->def, path))) goto endjob; - if (!(device =3D qemuAliasFromDisk(disk))) + if (!(device =3D qemuAliasDiskDriveFromDisk(disk))) goto endjob; if (!disk->src->path) { @@ -18463,7 +18463,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (!(disk =3D qemuDomainDiskByName(def, path))) goto endjob; - if (!(device =3D qemuAliasFromDisk(disk))) + if (!(device =3D qemuAliasDiskDriveFromDisk(disk))) goto endjob; if (qemuDomainSetBlockIoTuneDefaults(&info, &disk->blkdeviotune, @@ -18636,7 +18636,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, if (!(disk =3D qemuDomainDiskByName(def, path))) goto endjob; - if (!(device =3D qemuAliasFromDisk(disk))) + if (!(device =3D qemuAliasDiskDriveFromDisk(disk))) goto endjob; qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorGetBlockIoThrottle(priv->mon, device, &reply); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d8ca894519..62fb652093 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -270,7 +270,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, if (qemuHotplugPrepareDiskAccess(driver, vm, disk, newsrc, false) < 0) goto cleanup; - if (!(driveAlias =3D qemuAliasFromDisk(disk))) + if (!(driveAlias =3D qemuAliasDiskDriveFromDisk(disk))) goto error; qemuDomainObjEnterMonitor(driver, vm); @@ -446,7 +446,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (!(drivestr =3D qemuBuildDriveStr(disk, false, priv->qemuCaps))) goto error; - if (!(drivealias =3D qemuAliasFromDisk(disk))) + if (!(drivealias =3D qemuAliasDiskDriveFromDisk(disk))) goto error; if (!(devstr =3D qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps= ))) @@ -3776,7 +3776,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, /* build the actual drive id string as the disk->info.alias doesn't * contain the QEMU_DRIVE_HOST_PREFIX that is passed to qemu */ - if (!(drivestr =3D qemuAliasFromDisk(disk))) + if (!(drivestr =3D qemuAliasDiskDriveFromDisk(disk))) return -1; if (diskPriv) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 5cf9be56b4..13d131f6b6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -400,7 +400,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, } VIR_FREE(diskAlias); - if (!(diskAlias =3D qemuAliasFromDisk(disk))) + if (!(diskAlias =3D qemuAliasDiskDriveFromDisk(disk))) goto cleanup; if (qemuDomainObjEnterMonitorAsync(driver, vm, @@ -651,7 +651,7 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr drive= r, goto cleanup; } - if (!(diskAlias =3D qemuAliasFromDisk(disk))) + if (!(diskAlias =3D qemuAliasDiskDriveFromDisk(disk))) return -1; if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) @@ -951,7 +951,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) continue; - if (!(diskAlias =3D qemuAliasFromDisk(disk))) + if (!(diskAlias =3D qemuAliasDiskDriveFromDisk(disk))) goto cleanup; qemuBlockJobSyncBegin(disk); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 30cc5904e0..87fc6ffc67 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2774,7 +2774,7 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, goto cleanup; VIR_FREE(alias); - if (!(alias =3D qemuAliasFromDisk(vm->def->disks[i]))) + if (!(alias =3D qemuAliasDiskDriveFromDisk(vm->def->disks[i]))) goto cleanup; if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) goto cleanup; --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list