From nobody Tue May 26 01:58:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1776715078; cv=none; d=zohomail.com; s=zohoarc; b=UMV5UnMpjZsdthS0chHcfF4NeiCZKkhb6bcLlN9g7FoiJTtkQUGmyTczOJAIN32QNY1qUJJUeP/4hH/NnRN285EinSLYwtoLD2/nqAtOxHbXTl5eXD3ByOhpLPPGHpV2XiSOLggONNaX5YuRXQ2K3qG7CgMnasFu6qtZGGXpjDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776715078; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc; bh=w572aR6zft/0zdhTYnMl4AWZ+tA1+uEX3AjDn3dVDvY=; b=g/kghG9ZvesQU8ZfSH/377iROh7Q82f05ma6Unm/rBQjUiQf6d3PoWv6V7yGYGVG4n9dv/R8TlkeAQXtdK/1FPz9eQ98i43rJpWeIFdAenbcrZfC3CjG6UxVyDGhL7hfr2bUuBhtyofEsSIC/nAZi546BGHp3wJWgL1vOqpKYjw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1776715078262243.7462138609303; Mon, 20 Apr 2026 12:57:58 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1FC7A41818; Mon, 20 Apr 2026 15:57:57 -0400 (EDT) Received: from [172.19.199.6] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id C2D6B41955; Mon, 20 Apr 2026 15:56:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1E3F04180F; Mon, 20 Apr 2026 15:56:51 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 7196A41818 for ; Mon, 20 Apr 2026 15:56:49 -0400 (EDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-321-d7ny7YA2Mh-fJMEUgTEE2Q-1; Mon, 20 Apr 2026 15:56:46 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-48a548b585cso1749415e9.2 for ; Mon, 20 Apr 2026 12:56:46 -0700 (PDT) Received: from carol.localdomain (cst-prg-90-180.cust.vodafone.cz. [46.135.90.180]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488fc0f82bbsm509872845e9.3.2026.04.20.12.56.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2026 12:56:44 -0700 (PDT) Received: from carol.redhat.com (carol.k8r.cz [127.0.0.1]) by carol.localdomain (Postfix) with ESMTP id 80B66239BE5AF for ; Mon, 20 Apr 2026 21:56:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776715008; h=from:from: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; bh=w572aR6zft/0zdhTYnMl4AWZ+tA1+uEX3AjDn3dVDvY=; b=Euk0Lq2mDyH/hzJ7Q07QSJd19tspGcGY66+pqPwSR/DjhCmR5h8d2lGH0SVoUlAkV/n9hc ZTU50hJDscYVPdIG53wHZYNU7h3dRCl9R9FoQ5ctsHUwnSMbIwD8rNdE3eoni5aRYTy4HM kERDSoi1lKZUF1xGzAZ1q+B2biQ7o84= X-MC-Unique: d7ny7YA2Mh-fJMEUgTEE2Q-1 X-Mimecast-MFC-AGG-ID: d7ny7YA2Mh-fJMEUgTEE2Q_1776715005 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776715005; x=1777319805; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=w572aR6zft/0zdhTYnMl4AWZ+tA1+uEX3AjDn3dVDvY=; b=tZIsFX+Ouw+Iw09rhZPN2ppbuOMSRh7ps/YE+lWtGr3dXEchjbCVYqHt4LaINkqVNw mcFNOw5ExWrKPQe19VZ75/G1e1yQcl5PeNs4pyIU4ZgIoruudlt81Cd30D+tNpo7ug8N ruYQQDm+iuYhW771Q83MWCy9AkXoVX3KvtVCi/NVeN6Qz6BHhu+5nuQU4NzzeWgnAosp T7HOAZH3/KRb2v6nL3CphuLhY97kY0tOsNe8FsmG9Y8dnoTlyWMGKokL7EgtF4Y0yLr7 8QJCHVWW6mDgmS2gqJQa1LxQuwBaQFTy3sNPyRj2hxM7b5nhQ5BwBP60sVeIH4h318fd nIUg== X-Gm-Message-State: AOJu0Yw4owDmTXfNmGu6HwSEvysWgLXXiaHCF0SFmdS/j7sx0WAMoH0C N8Br2A+lFKueFT9fNIaYlfysoOvbzUvmRWr3a2jgZE+XZoWjJfsZ51I3st20dLu8goUm5oj3QxM L1KKxw7oavLLNQIPzpYysGC82iRWtHBOe0jcfM8RmQGJpqAuhaDvkJ5y+USw7vFPtT7d+Z39VYv Zrs61OYX4iCjc2KxoGEor47AQTv9irrh7eZjnAoGHhY9c= X-Gm-Gg: AeBDievZ/DeGm8pGiM8CIgE7zsOp6O8F+ZVgWloQCi2Qpa7x1LamTya76z4f2H0houX bAg2xXYJcastI/4uQDjZk6ccJVoq+qZdmdAr4k7c9m4jkGwZ0OYCI4KGIqnHbDv7zqnnlTp4bGQ +c4bRfc2Dkv7OksgwbSrz9jRvIGUna7dmd4EdBy7ZkZRWOppA2spxqojUx6tpSIuryZRAzNXN/R eZEAZYiMl6KFe8AoMMAHRSljtcKXfKm9n4C50NAGwoS0d99iifXgsMLa46XSpKIBX99q4bxpZPu 2JBhJuXMFUVqATP0mMnSBtgYV2M+7sELF5xZ6yOIZDJQjbStf0WqFmqByfURJYgpRK/mbuzIdvY 6pWGHAaRDTA81h452f5C+602IGkZ4o5hJ2oHM2XF6YSpUETiEMhQV3ZKYonlvEPacdWjjWjxx X-Received: by 2002:a05:600c:a10e:b0:485:3b9e:caa7 with SMTP id 5b1f17b1804b1-488fb773f38mr168183815e9.23.1776715005277; Mon, 20 Apr 2026 12:56:45 -0700 (PDT) X-Received: by 2002:a05:600c:a10e:b0:485:3b9e:caa7 with SMTP id 5b1f17b1804b1-488fb773f38mr168183575e9.23.1776715004669; Mon, 20 Apr 2026 12:56:44 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH] vmx: Generate correct disk target device ID for superwide SCSI Date: Mon, 20 Apr 2026 21:56:26 +0200 Message-ID: <50bdeaab517e38348ed29f7a2938486f893f59fb.1776714986.git.mkletzan@redhat.com> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 3KKw5DcuofhV9rIVXLFLqqTBxTwuRq0QPcO_Wee1_AA_1776715005 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: M2RNICCNDO226DECZCG3EDKSTO2TZX3P X-Message-ID-Hash: M2RNICCNDO226DECZCG3EDKSTO2TZX3P X-MailFrom: mkletzan@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Martin Kletzander via Devel Reply-To: Martin Kletzander X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1776715080122154100 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Martin Kletzander Commit 32f7db0989e4 added support for superwide SCSI, but did not change the disk ID calculation which resulted in a possible duplicate. Change it to calculate based on the (already decided) maximum of SCSI units per bus and add a (well, modify existing) test case. Fixes: 32f7db0989e4 Signed-off-by: Martin Kletzander Reviewed-by: Daniel P. Berrang=C3=A9 --- src/vmx/vmx.c | 2 +- tests/vmx2xmldata/esx-in-the-wild-11.vmx | 6 ++++++ tests/vmx2xmldata/esx-in-the-wild-11.xml | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 57dfd57cfc86..1da5a0fd8a31 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2244,7 +2244,7 @@ virVMXGenerateDiskTarget(virDomainDiskDef *def, return -1; } =20 - idx =3D controllerOrBus * 15 + (unit < 7 ? unit : unit - 1); + idx =3D controllerOrBus * (vmdef->scsiBusMaxUnit - 1) + (unit < 7 = ? unit : unit - 1); prefix =3D "sd"; break; =20 diff --git a/tests/vmx2xmldata/esx-in-the-wild-11.vmx b/tests/vmx2xmldata/e= sx-in-the-wild-11.vmx index ae1d146f9a44..e6b547d8ace5 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-11.vmx +++ b/tests/vmx2xmldata/esx-in-the-wild-11.vmx @@ -89,3 +89,9 @@ sched.scsi0:16.shares =3D "normal" sched.scsi0:16.throughputCap =3D "off" scsi0:16.present =3D "TRUE" scsi0:16.redo =3D "" +scsi1.virtualDev =3D "pvscsi" +scsi1.present =3D "TRUE" +scsi1:0.deviceType =3D "scsi-hardDisk" +scsi1:0.fileName =3D "esx6.7-rhel7.7-x86_64_4.vmdk" +sched.scsi1:0.shares =3D "normal" +scsi1:0.present =3D "TRUE" diff --git a/tests/vmx2xmldata/esx-in-the-wild-11.xml b/tests/vmx2xmldata/e= sx-in-the-wild-11.xml index 8807a057d7ca..73befdeca0c6 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-11.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-11.xml @@ -25,7 +25,13 @@
+ + + +
+ + --=20 2.53.0