From nobody Sat Feb 7 10:44:37 2026 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1517353542569938.3620437431106; Tue, 30 Jan 2018 15:05:42 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 887C119D39D; Tue, 30 Jan 2018 23:05:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C61A60A9A; Tue, 30 Jan 2018 23:05:40 +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 2286F5FBE6; Tue, 30 Jan 2018 23:05:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0UN5IcF006268 for ; Tue, 30 Jan 2018 18:05:18 -0500 Received: by smtp.corp.redhat.com (Postfix) id 692D15C261; Tue, 30 Jan 2018 23:05:18 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-116-232.phx2.redhat.com [10.3.116.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 272785C20B for ; Tue, 30 Jan 2018 23:05:18 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Tue, 30 Jan 2018 18:05:03 -0500 Message-Id: <20180130230503.3820-10-jferlan@redhat.com> In-Reply-To: <20180130230503.3820-1-jferlan@redhat.com> References: <20180130230503.3820-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 9/9] qemu: Update qemuDomainFindSCSIControllerModel return 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 30 Jan 2018 23:05:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Now that the controller model is updated during post parse callback, this code no longer needs to fetch the model based on the capabilities and can just return the model directly if the controller is found. Removal of @qemuCaps cascades through various callers which are now updated to not pass the capabilities. Signed-off-by: John Ferlan --- src/qemu/qemu_alias.c | 8 +++----- src/qemu/qemu_alias.h | 3 +-- src/qemu/qemu_command.c | 11 ++++------- src/qemu/qemu_command.h | 3 +-- src/qemu/qemu_domain_address.c | 6 ++---- src/qemu/qemu_domain_address.h | 3 +-- src/qemu/qemu_hotplug.c | 6 +++--- 7 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index ed3af04de..e8c1256b7 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -179,8 +179,7 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainD= ef, /* Our custom -drive naming scheme used with id=3D */ int qemuAssignDeviceDiskAlias(virDomainDefPtr def, - virDomainDiskDefPtr disk, - virQEMUCapsPtr qemuCaps) + virDomainDiskDefPtr disk) { const char *prefix =3D virDomainDiskBusTypeToString(disk->bus); int controllerModel =3D -1; @@ -191,8 +190,7 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, if (disk->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_SCSI) { controllerModel =3D qemuDomainFindSCSIControllerModel(def, - &disk->inf= o, - qemuCaps); + &disk->inf= o); if (controllerModel < 0) return -1; } @@ -539,7 +537,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCap= sPtr qemuCaps) size_t i; =20 for (i =3D 0; i < def->ndisks; i++) { - if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0) + if (qemuAssignDeviceDiskAlias(def, def->disks[i]) < 0) return -1; } for (i =3D 0; i < def->nnets; i++) { diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 11bbc2860..2246e712f 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -39,8 +39,7 @@ int qemuAssignDeviceControllerAlias(virDomainDefPtr domai= nDef, virDomainControllerDefPtr controller); =20 int qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef, - virDomainDiskDefPtr def, - virQEMUCapsPtr qemuCaps); + virDomainDiskDefPtr def); =20 int qemuAssignDeviceHostdevAlias(virDomainDefPtr def, char **alias, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f82a78155..899f0cbbb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2042,8 +2042,7 @@ qemuBuildDriveDevStr(const virDomainDef *def, goto error; } =20 - controllerModel =3D qemuDomainFindSCSIControllerModel(def, &disk->= info, - qemuCaps); + controllerModel =3D qemuDomainFindSCSIControllerModel(def, &disk->= info); if (controllerModel < 0) goto error; =20 @@ -5132,15 +5131,14 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr d= ev, =20 char * qemuBuildSCSIHostdevDevStr(const virDomainDef *def, - virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps) + virDomainHostdevDefPtr dev) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; int model =3D -1; char *driveAlias; const char *contAlias; =20 - model =3D qemuDomainFindSCSIControllerModel(def, dev->info, qemuCaps); + model =3D qemuDomainFindSCSIControllerModel(def, dev->info); if (model < 0) goto error; =20 @@ -5623,8 +5621,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, VIR_FREE(drvstr); =20 virCommandAddArg(cmd, "-device"); - if (!(devstr =3D qemuBuildSCSIHostdevDevStr(def, hostdev, - qemuCaps))) + if (!(devstr =3D qemuBuildSCSIHostdevDevStr(def, hostdev))) return -1; virCommandAddArg(cmd, devstr); VIR_FREE(devstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index bdde6f918..31c9da673 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -154,8 +154,7 @@ char *qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr= dev, virQEMUCapsPtr qemuCaps); =20 char *qemuBuildSCSIHostdevDevStr(const virDomainDef *def, - virDomainHostdevDefPtr dev, - virQEMUCapsPtr qemuCaps); + virDomainHostdevDefPtr dev); char * qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index aa736131e..6272b1e91 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -102,7 +102,6 @@ qemuDomainSetSCSIControllerModel(const virDomainDef *de= f, /** * @def: Domain definition * @info: Domain device info - * @qemuCaps: QEMU capabilities * * Using the device info, find the controller related to the * device by index and use that controller to return the model. @@ -111,8 +110,7 @@ qemuDomainSetSCSIControllerModel(const virDomainDef *de= f, */ int qemuDomainFindSCSIControllerModel(const virDomainDef *def, - virDomainDeviceInfoPtr info, - virQEMUCapsPtr qemuCaps) + virDomainDeviceInfoPtr info) { virDomainControllerDefPtr cont; =20 @@ -123,7 +121,7 @@ qemuDomainFindSCSIControllerModel(const virDomainDef *d= ef, return -1; } =20 - return qemuDomainGetSCSIControllerModel(def, cont, qemuCaps); + return cont->model; } =20 =20 diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index 04fb2fc14..83f8e81ca 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -37,8 +37,7 @@ int qemuDomainSetSCSIControllerModel(const virDomainDef *= def, virQEMUCapsPtr qemuCaps); =20 int qemuDomainFindSCSIControllerModel(const virDomainDef *def, - virDomainDeviceInfoPtr info, - virQEMUCapsPtr qemuCaps); + virDomainDeviceInfoPtr info); =20 int qemuDomainAssignAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fccbc29a0..2aa927e62 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -381,7 +381,7 @@ qemuDomainAttachDiskGeneric(virConnectPtr conn, if (qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, false) < 0) goto cleanup; =20 - if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0) + if (qemuAssignDeviceDiskAlias(vm->def, disk) < 0) goto error; =20 if (qemuDomainPrepareDiskSource(conn, disk, priv, cfg) < 0) @@ -2405,7 +2405,7 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn, if (!(drivealias =3D qemuAliasFromHostdev(hostdev))) goto cleanup; =20 - if (!(devstr =3D qemuBuildSCSIHostdevDevStr(vm->def, hostdev, priv->qe= muCaps))) + if (!(devstr =3D qemuBuildSCSIHostdevDevStr(vm->def, hostdev))) goto cleanup; =20 if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) @@ -4634,7 +4634,7 @@ qemuDomainDetachVirtioDiskDevice(virQEMUDriverPtr dri= ver, } =20 if (!detach->info.alias) { - if (qemuAssignDeviceDiskAlias(vm->def, detach, priv->qemuCaps) < 0) + if (qemuAssignDeviceDiskAlias(vm->def, detach) < 0) goto cleanup; } =20 --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list