From nobody Mon Feb 9 19:07:50 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1702650247300985.7930008717756; Fri, 15 Dec 2023 06:24:07 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2FD2919C4; Fri, 15 Dec 2023 09:24:06 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B79321AF3; Fri, 15 Dec 2023 09:19:42 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id F0BA81A37; Fri, 15 Dec 2023 09:19:27 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 1973C1A12 for ; Fri, 15 Dec 2023 09:19:27 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-154-eQSm2QgKOl-wHFhtIe4iZw-1; Fri, 15 Dec 2023 09:19:25 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A44685A58A for ; Fri, 15 Dec 2023 14:19:25 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8B14C159B0 for ; Fri, 15 Dec 2023 14:19:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: eQSm2QgKOl-wHFhtIe4iZw-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 3/4] vmx: Separate disk target name generation into a function Date: Fri, 15 Dec 2023 15:19:20 +0100 Message-ID: <5ef0359de7c781213418b77ee85bc73e071a3a6d.1702649888.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: SBJ6SUUWQWMJZENYLNWVQQ73TMWUL6LH X-Message-ID-Hash: SBJ6SUUWQWMJZENYLNWVQQ73TMWUL6LH X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1702650248063100001 Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/vmx/vmx.c | 175 +++++++++++++++++++++++++++++++------------------- 1 file changed, 110 insertions(+), 65 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index af1c1640ae..399f03b419 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2136,6 +2136,113 @@ virVMXParseSATAController(virConf *conf, int contro= ller, bool *present) } =20 =20 +static int +virXMXGenerateDiskTarget(virDomainDiskDef *def, + virDomainDef *vmdef, + int controllerOrBus, + int unit) +{ + const char *prefix =3D NULL; + unsigned int idx =3D 0; + + switch (def->bus) { + case VIR_DOMAIN_DISK_BUS_SCSI: + if (controllerOrBus < 0 || controllerOrBus > 3) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("SCSI controller index %1$d out of [0..3] ran= ge"), + controllerOrBus); + return -1; + } + + if (unit < 0 || unit > vmdef->scsiBusMaxUnit || unit =3D=3D 7) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("SCSI unit index %1$d out of [0..6,8..%2$u] r= ange"), + unit, vmdef->scsiBusMaxUnit); + return -1; + } + + idx =3D controllerOrBus * 15 + (unit < 7 ? unit : unit - 1); + prefix =3D "sd"; + break; + + case VIR_DOMAIN_DISK_BUS_SATA: + if (controllerOrBus < 0 || controllerOrBus > 3) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("SATA controller index %1$d out of [0..3] ran= ge"), + controllerOrBus); + return -1; + } + + if (unit < 0 || unit >=3D 30) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("SATA unit index %1$d out of [0..29] range"), + unit); + return -1; + } + + idx =3D controllerOrBus * 30 + unit; + prefix =3D "sd"; + break; + + case VIR_DOMAIN_DISK_BUS_IDE: + if (controllerOrBus < 0 || controllerOrBus > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("IDE bus index %1$d out of [0..1] range"), + controllerOrBus); + return -1; + } + + if (unit < 0 || unit > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("IDE unit index %1$d out of [0..1] range"), u= nit); + return -1; + } + idx =3D controllerOrBus * 2 + unit; + prefix =3D "hd"; + break; + + case VIR_DOMAIN_DISK_BUS_FDC: + if (controllerOrBus !=3D 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("FDC controller index %1$d out of [0] range"), + controllerOrBus); + return -1; + } + + if (unit < 0 || unit > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("FDC unit index %1$d out of [0..1] range"), + unit); + return -1; + } + + idx =3D unit; + prefix =3D "fd"; + break; + + case VIR_DOMAIN_DISK_BUS_VIRTIO: + case VIR_DOMAIN_DISK_BUS_XEN: + case VIR_DOMAIN_DISK_BUS_USB: + case VIR_DOMAIN_DISK_BUS_UML: + case VIR_DOMAIN_DISK_BUS_SD: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported bus type '%1$s' for device type '%2$= s'"), + virDomainDiskBusTypeToString(def->bus), + virDomainDiskDeviceTypeToString(def->device)); + return -1; + break; + + case VIR_DOMAIN_DISK_BUS_NONE: + case VIR_DOMAIN_DISK_BUS_LAST: + virReportEnumRangeError(virDomainDiskBus, def->bus); + return -1; + break; + } + + def->dst =3D virIndexToDiskName(idx, prefix); + return 0; +} + =20 static int virVMXParseDisk(virVMXContext *ctx, virDomainXMLOption *xmlopt, virConf *c= onf, @@ -2208,60 +2315,11 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOpt= ion *xmlopt, virConf *conf, if (device =3D=3D VIR_DOMAIN_DISK_DEVICE_DISK || device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) { if (busType =3D=3D VIR_DOMAIN_DISK_BUS_SCSI) { - if (controllerOrBus < 0 || controllerOrBus > 3) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI controller index %1$d out of [0..3]= range"), - controllerOrBus); - goto cleanup; - } - - if (unit < 0 || unit > vmdef->scsiBusMaxUnit || unit =3D=3D 7)= { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI unit index %1$d out of [0..6,8..%2$= u] range"), - unit, vmdef->scsiBusMaxUnit); - goto cleanup; - } - prefix =3D g_strdup_printf("scsi%d:%d", controllerOrBus, unit); - - (*def)->dst =3D - virIndexToDiskName - (controllerOrBus * 15 + (unit < 7 ? unit : unit - 1), "sd= "); } else if (busType =3D=3D VIR_DOMAIN_DISK_BUS_SATA) { - if (controllerOrBus < 0 || controllerOrBus > 3) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("SATA controller index %1$d out of [0..3]= range"), - controllerOrBus); - goto cleanup; - } - - if (unit < 0 || unit >=3D 30) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("SATA unit index %1$d out of [0..29] rang= e"), - unit); - goto cleanup; - } - prefix =3D g_strdup_printf("sata%d:%d", controllerOrBus, unit); - - (*def)->dst =3D virIndexToDiskName(controllerOrBus * 30 + unit= , "sd"); } else if (busType =3D=3D VIR_DOMAIN_DISK_BUS_IDE) { - if (controllerOrBus < 0 || controllerOrBus > 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("IDE bus index %1$d out of [0..1] range"), - controllerOrBus); - goto cleanup; - } - - if (unit < 0 || unit > 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("IDE unit index %1$d out of [0..1] range"= ), unit); - goto cleanup; - } - prefix =3D g_strdup_printf("ide%d:%d", controllerOrBus, unit); - - (*def)->dst =3D virIndexToDiskName(controllerOrBus * 2 + unit,= "hd"); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported bus type '%1$s' for device type = '%2$s'"), @@ -2271,23 +2329,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOpti= on *xmlopt, virConf *conf, } } else if (device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) { if (busType =3D=3D VIR_DOMAIN_DISK_BUS_FDC) { - if (controllerOrBus !=3D 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("FDC controller index %1$d out of [0] ran= ge"), - controllerOrBus); - goto cleanup; - } - - if (unit < 0 || unit > 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("FDC unit index %1$d out of [0..1] range"= ), - unit); - goto cleanup; - } - prefix =3D g_strdup_printf("floppy%d", unit); - - (*def)->dst =3D virIndexToDiskName(unit, "fd"); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported bus type '%1$s' for device type = '%2$s'"), @@ -2302,6 +2344,9 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= n *xmlopt, virConf *conf, goto cleanup; } =20 + if (virXMXGenerateDiskTarget(*def, vmdef, controllerOrBus, unit) < 0) + goto cleanup; + VMX_BUILD_NAME(present); VMX_BUILD_NAME(startConnected); VMX_BUILD_NAME(deviceType); --=20 2.41.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org