From nobody Sun Feb 8 19:56:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628009292; cv=none; d=zohomail.com; s=zohoarc; b=F5nrHPHepFRAgv0Mjq18uYg1RbdAJ8zne4JwPIQyAsFqwhIapDLPdjQ75WyPNT2kVAuENcVI+8Zl5NTOkNg9BeRu7XemNRoFORSMwleQrIJbKWWOqpo0GMuuASsL82TFCTYmzp28XeDaBoLpuf0Uf1MXTcR2pNt/9fa0Fky9xa0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628009292; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tBu2CBr1gmx4rc3NVmqtF/QrTCR+k0gLD7WgjLSbxTY=; b=f2h2tQKTYp/ZurzXHtCIMm2+BvNkEVIl8gDm42c8Rdc97KZiMhA3xUd/EEGMfXL8D9Ae4prZDHtwP4eWGmqqSSKsLAaFAEGzg8H+IkJi5u5mGrhWhVtJe7+mh8dNQhMCM6cuzabkBj40LYM5NMcN7B7Zt/1PxlT02aZ19TjnXb8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1628009292985755.856132361114; Tue, 3 Aug 2021 09:48:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-113-hyxhT7P-OCSotrAcUUYZqQ-1; Tue, 03 Aug 2021 12:47:21 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A574801B3D; Tue, 3 Aug 2021 16:47:14 +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 102F527CA9; Tue, 3 Aug 2021 16:47:14 +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 71CDC4A7CD; Tue, 3 Aug 2021 16:47:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 173CWsQG022543 for ; Tue, 3 Aug 2021 08:32:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id BA292798B9; Tue, 3 Aug 2021 12:32:53 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.146]) by smtp.corp.redhat.com (Postfix) with ESMTP id 108FD78AAF for ; Tue, 3 Aug 2021 12:32:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628009291; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=tBu2CBr1gmx4rc3NVmqtF/QrTCR+k0gLD7WgjLSbxTY=; b=iTYvPD0+nDxnWGRbwzIWIGyfLAJ1OknKGy7C101K6j6q4KrDJLTYQs0+GgLzhdHDT9pP8e 5YxD+pvo2BavVP9br+JVfi4Ho24iR4XygxGEZbxXaStPA3iyq0LJ90zigaEchlpzU9tFMX MB35s8jDWcy1K2NL9SUu83QxalzakgY= X-MC-Unique: hyxhT7P-OCSotrAcUUYZqQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 6/7] vmx: Support super wide SCSI bus Date: Tue, 3 Aug 2021 14:32:30 +0200 Message-Id: <01aecca25b901c80e6d182f7f064003d88f1ecda.1627993626.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628009294847100001 Content-Type: text/plain; charset="utf-8" Since its 6.7 release, vSphere allows up to 64 units on a SCSI bus [1]. The release version translates to virtualHW_version 13 and thus if we are dealing with sufficiently new version we can enable the feature. 1: https://configmax.vmware.com/guest?vmwareproduct=3DvSphere&release=3DvSp= here%206.7&categories=3D1-0 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1738392 Signed-off-by: Michal Privoznik --- src/conf/domain_conf.h | 1 + src/vmx/vmx.c | 13 ++++++++----- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml | 5 +++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 80dd1b96a4..c57b77a59c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2727,6 +2727,7 @@ struct _virDomainVirtioOptions { }; =20 =20 +#define SCSI_SUPER_WIDE_BUS_MAX_CONT_UNIT 64 #define SCSI_WIDE_BUS_MAX_CONT_UNIT 16 #define SCSI_NARROW_BUS_MAX_CONT_UNIT 7 =20 diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 192f1bd252..f706e2023a 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1476,6 +1476,8 @@ virVMXParseConfig(virVMXContext *ctx, "4 or higher but found %lld"), virtualHW_version); goto cleanup; + } else if (virtualHW_version >=3D 13) { + def->scsiBusMaxUnit =3D SCSI_SUPER_WIDE_BUS_MAX_CONT_UNIT; } =20 /* vmx:uuid.bios -> def:uuid */ @@ -1729,7 +1731,7 @@ virVMXParseConfig(virVMXContext *ctx, if (! present) continue; =20 - for (unit =3D 0; unit < 16; ++unit) { + for (unit =3D 0; unit < def->scsiBusMaxUnit; unit++) { g_autoptr(virDomainDiskDef) disk =3D NULL; =20 if (unit =3D=3D 7) { @@ -2169,7 +2171,8 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= n *xmlopt, virConf *conf, * VIR_DOMAIN_DISK_DEVICE_LUN} * busType =3D VIR_DOMAIN_DISK_BUS_SCSI * controllerOrBus =3D [0..3] -> controller - * unit =3D [0..6,8..15] + * unit =3D [0..6,8..15] for virtualHW_version < 13 + * unit =3D [0..6,8..64] for virtualHW_version >=3D 13 * * device =3D {VIR_DOMAIN_DISK_DEVICE_DISK, * VIR_DOMAIN_DISK_DEVICE_CDROM, @@ -2235,10 +2238,10 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOpt= ion *xmlopt, virConf *conf, goto cleanup; } =20 - if (unit < 0 || unit > 15 || unit =3D=3D 7) { + if (unit < 0 || unit > vmdef->scsiBusMaxUnit || unit =3D=3D 7)= { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI unit index %d out of [0..6,8..15] r= ange"), - unit); + _("SCSI unit index %d out of [0..6,8..%u] r= ange"), + unit, vmdef->scsiBusMaxUnit); goto cleanup; } =20 diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml b/tests/vmx2x= mldata/vmx2xml-esx-in-the-wild-11.xml index cf414975b3..8807a057d7 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml @@ -20,6 +20,11 @@
+ + + +
+ --=20 2.31.1