From nobody Thu May 15 01:46:59 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1517353520225487.879121996982; Tue, 30 Jan 2018 15:05:20 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B5DE1776D9; Tue, 30 Jan 2018 23:05:18 +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 3DAB05D755; Tue, 30 Jan 2018 23:05:18 +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 46D0118033D8; Tue, 30 Jan 2018 23:05:16 +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 w0UN5Ekt006203 for ; Tue, 30 Jan 2018 18:05:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id 653135C25E; Tue, 30 Jan 2018 23:05:14 +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 22CFD5C20B for ; Tue, 30 Jan 2018 23:05:13 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Tue, 30 Jan 2018 18:04:56 -0500 Message-Id: <20180130230503.3820-3-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 2/9] conf: Rework and rename virDomainDeviceFindControllerModel 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 30 Jan 2018 23:05:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" As it turns out virDomainDeviceFindControllerModel was only ever called for SCSI controllers using VIR_DOMAIN_CONTROLLER_TYPE_SCSI as a parameter. So rename to virDomainDeviceFindSCSIController and rather than return a model, let's return a virDomainControllerDefPtr to let the caller reference whatever it wants. Signed-off-by: John Ferlan --- src/conf/domain_conf.c | 24 +++++++++++------------- src/conf/domain_conf.h | 6 +++--- src/libvirt_private.syms | 2 +- src/qemu/qemu_alias.c | 8 +++++--- src/qemu/qemu_command.c | 13 ++++++++----- src/vbox/vbox_common.c | 8 ++++---- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9c9e3334f..b39667952 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7821,21 +7821,20 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATT= RIBUTE_UNUSED, return ret; } =20 -int -virDomainDeviceFindControllerModel(const virDomainDef *def, - virDomainDeviceInfoPtr info, - int controllerType) + +virDomainControllerDefPtr +virDomainDeviceFindSCSIController(const virDomainDef *def, + virDomainDeviceInfoPtr info) { - int model =3D -1; size_t i; =20 for (i =3D 0; i < def->ncontrollers; i++) { - if (def->controllers[i]->type =3D=3D controllerType && + if (def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SC= SI && def->controllers[i]->idx =3D=3D info->addr.drive.controller) - model =3D def->controllers[i]->model; + return def->controllers[i]; } =20 - return model; + return NULL; } =20 virDomainDiskDefPtr @@ -17804,17 +17803,16 @@ virDomainDefMaybeAddHostdevSCSIcontroller(virDoma= inDefPtr def) hostdev =3D def->hostdevs[i]; if (virHostdevIsSCSIDevice(hostdev) && (int)hostdev->info->addr.drive.controller > maxController) { - int model =3D -1; + virDomainControllerDefPtr cont; =20 maxController =3D hostdev->info->addr.drive.controller; /* We may be creating a new controller because this one is ful= l. * So let's grab the model from it and update the model we're * going to add as long as this one isn't undefined. The premi= se * being keeping the same controller model for all SCSI hostde= vs. */ - model =3D virDomainDeviceFindControllerModel(def, hostdev->inf= o, - VIR_DOMAIN_CONTROLL= ER_TYPE_SCSI); - if (model !=3D -1) - newModel =3D model; + cont =3D virDomainDeviceFindSCSIController(def, hostdev->info); + if (cont && cont->model !=3D -1) + newModel =3D cont->model; } } =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ed8526092..21e004515 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2759,9 +2759,9 @@ int virDomainDiskSetDriver(virDomainDiskDefPtr def, c= onst char *name) ATTRIBUTE_RETURN_CHECK; int virDomainDiskGetFormat(virDomainDiskDefPtr def); void virDomainDiskSetFormat(virDomainDiskDefPtr def, int format); -int virDomainDeviceFindControllerModel(const virDomainDef *def, - virDomainDeviceInfoPtr info, - int controllerType); +virDomainControllerDefPtr +virDomainDeviceFindSCSIController(const virDomainDef *def, + virDomainDeviceInfoPtr info); virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def, int bus, char *dst); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 792fb6056..68a1f496e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -298,7 +298,7 @@ virDomainDeviceAliasIsUserAlias; virDomainDeviceDefCopy; virDomainDeviceDefFree; virDomainDeviceDefParse; -virDomainDeviceFindControllerModel; +virDomainDeviceFindSCSIController; virDomainDeviceGetInfo; virDomainDeviceInfoIterate; virDomainDeviceTypeToString; diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 37fe2aa80..ed96f9f4c 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -190,9 +190,11 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, =20 if (disk->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_SCSI) { - controllerModel =3D - virDomainDeviceFindControllerModel(def, &disk->info, - VIR_DOMAIN_CONTROLLER_T= YPE_SCSI); + virDomainControllerDefPtr cont; + + cont =3D virDomainDeviceFindSCSIController(def, &disk->info); + if (cont) + controllerModel =3D cont->model; =20 if ((qemuDomainSetSCSIControllerModel(def, qemuCaps, &controllerModel)) < 0) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c66307ee0..113a2919b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1957,6 +1957,7 @@ qemuBuildDriveDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { virBuffer opt =3D VIR_BUFFER_INITIALIZER; + virDomainControllerDefPtr cont; const char *bus =3D virDomainDiskQEMUBusTypeToString(disk->bus); const char *contAlias; char *drivealias; @@ -2042,9 +2043,9 @@ qemuBuildDriveDevStr(const virDomainDef *def, goto error; } =20 - controllerModel =3D - virDomainDeviceFindControllerModel(def, &disk->info, - VIR_DOMAIN_CONTROLLER_TYPE_= SCSI); + cont =3D virDomainDeviceFindSCSIController(def, &disk->info); + if (cont) + controllerModel =3D cont->model; if ((qemuDomainSetSCSIControllerModel(def, qemuCaps, &controllerModel)) < 0) goto error; @@ -5142,12 +5143,14 @@ qemuBuildSCSIHostdevDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; + virDomainControllerDefPtr cont; int model =3D -1; char *driveAlias; const char *contAlias; =20 - model =3D virDomainDeviceFindControllerModel(def, dev->info, - VIR_DOMAIN_CONTROLLER_TYPE_= SCSI); + cont =3D virDomainDeviceFindSCSIController(def, dev->info); + if (cont) + model =3D cont->model; =20 if (qemuDomainSetSCSIControllerModel(def, qemuCaps, &model) < 0) goto error; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 33aefabe5..6704772e6 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1047,10 +1047,11 @@ static int vboxAttachDrives(virDomainDefPtr def, vboxDriverPtr data, IMachine *machin= e) { size_t i; - int type, ret =3D 0, model =3D -1; + int type, ret =3D 0; const char *src =3D NULL; nsresult rc =3D 0; virDomainDiskDefPtr disk =3D NULL; + virDomainControllerDefPtr cont; PRUnichar *storageCtlName =3D NULL; char *controllerName =3D NULL; IMedium *medium =3D NULL; @@ -1126,9 +1127,8 @@ vboxAttachDrives(virDomainDefPtr def, vboxDriverPtr d= ata, IMachine *machine) case VIR_DOMAIN_DISK_BUS_SCSI: VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_SCSI_NAME, &storageCtlName); =20 - model =3D virDomainDeviceFindControllerModel(def, &disk->info, - VIR_DOMAIN_CONTROLL= ER_TYPE_SCSI); - if (model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068) { + cont =3D virDomainDeviceFindSCSIController(def, &disk->info); + if (cont && cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCS= I_LSISAS1068) { VBOX_UTF16_FREE(storageCtlName); VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_SAS_NAME, &storageCtlNa= me); } --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list