From nobody Fri Dec 12 15:15:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1761651337; cv=none; d=zohomail.com; s=zohoarc; b=Efp68LwmBODNx1WlrKp/m1Rm7imNtyttU+CVHe0Wb3lrD+K4gSP2Rc9aA4fJOBlELtCecaNa91+NEamFRKg8yAV7Z0FzPzugTRJop7CYI/uW4kTdWNzSG270y+kYM1gyfdVbMbgnREBYUsoyjUsAG1sbm6dBEh0BhMQxa/+M3/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761651337; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=Tz3PP0w8y5EkdTcDyX8P2BMrqHpYKhEJTzumjoIc02c=; b=LwT7riKNE6xWniI4pnV94j+Azr1PGWQOqrkxiKQAYMqongW05C8AyTSC59wR6RUcKbw+BlK+ccYcEGGmuQQ7JwZkLS0JFRibQasD3uuwjp+JavqXQScmQqlHG/YhE+aY8V02V+ZPu2xSdgcynVpJkIgSiNLAKlraXz6yPFoqTwU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1761651337479654.477721088103; Tue, 28 Oct 2025 04:35:37 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 8A1EA4190F; Tue, 28 Oct 2025 07:35:20 -0400 (EDT) Received: from [172.19.199.25] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id B312441C80; Tue, 28 Oct 2025 07:20:17 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id DAF1446561; Sat, 25 Oct 2025 04:18:04 -0400 (EDT) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 5296646561 for ; Sat, 25 Oct 2025 04:18:04 -0400 (EDT) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-b3d196b7eeeso595890666b.0 for ; Sat, 25 Oct 2025 01:18:04 -0700 (PDT) Received: from tulp.my.domain (84-25-144-101.cable.dynamic.v4.ziggo.nl. [84.25.144.101]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b6d85398463sm139688766b.34.2025.10.25.01.18.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Oct 2025 01:18:01 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761380283; x=1761985083; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Tz3PP0w8y5EkdTcDyX8P2BMrqHpYKhEJTzumjoIc02c=; b=JIoynC4e1NGllWfxr3pgu1KKeGYcVQm6L+un/sqKsUR/R4IlwystSJtlOti7P6a5WU bxUrL66odGXiNF/n1YyuXuyqMBpZRBq8aZmykw130zrlQMSwz8jeCz+aHyzqXx3rgi8F A/UdLwHWijdjXi1KcAJoDzlkS2iNmDy1CRtssCEMofeWgLkCsRjwQADnsUoVgqvmDsQh 4V65es/RezZewlA7wBvsRYoPLng3Rm586Q9vzUP95PPw9A23MFo/i4cG3eQHALY/j486 9TPdGHPTAC2/iXYBcLEkylMcIWS7BJTZd+3+feOmFbJxzeSEf/9viMi2AccragJux4BS YPDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761380283; x=1761985083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tz3PP0w8y5EkdTcDyX8P2BMrqHpYKhEJTzumjoIc02c=; b=qQjRVYs0wDrUd8kW8Hnw9XzyKdr+gdfIT0n5TUfOsO60fejlxX5KDxl8UWpTLM4QNW 881faT7PVj9di28mwMH8xYi2gozCYJOA+ZsBvnzLL4olBJQ3nlH8dfQ+DEYfRlNYAGTE GefEbsJl90s/RORAGtV+QxvQG+IQ6o7AJ79XxcSpYndZOcYmir4MCwgeLkOIC+NA55RV 1cKEqdvj9NX6bD2miPP81Bu3aC4UmT/9b6OTUe9bPgbsiPgtDNvKJ7X09lZ0VgruyiXa Bh3M6r928UwZ4D7naHxUeMkjHDPfdDwRwNXv8BRnAldZ7Zy2RIUz0dZSiyk+DClaoejh 7jEg== X-Gm-Message-State: AOJu0Yxr/LyAenVFme9KXeDa/Hvp6MQ2lVnbmhlYLdYkNq/AEeA2CnU2 g2U6BoogGrh8E4yVBVNlUXECnhJe5+Q4N3+niRIY7qOqVBQzXQ8pKvzqYxNhBYi1jqvWXw== X-Gm-Gg: ASbGncty3s2Nt4KOK2GmI7Gxz0thIvjTuJ5Xv2kT81+djPeI/4wxKxZ2LS1WqUKWzRh ZeiORRkMh02MHqntuoZS/aODP6LN7IV+BX3C3iyYRlTfaCK1UzqXDd8ya1NUH4/os1bSwpiK/vg lbQ6aNZuzp7wWK9Yu14GuknJ37okjnrRV+dJN7DQU1vWPtDRo9Ntrxrg/HgJxYCM69t1SJsZ9m2 LJ4c+rrsic1AK57MD/+t6fkBeb46x10sHrOzs76ZlCy5HwdX35xVJuJmjR61GlRBFkS3ZxWICzT nyDqkcTq/P+CIknNrijlEbtt3E8gzCyIuUlWeWbpdyH2rCFfxFkJopw0hsZYj+QfDPBdscAscQZ X3i2LeUEU+ZrGXwODpMyDr1/j+vYVTGtUsukgeNc/CU3MAyTN14RWoZDBLurpIq3fUe+6uDU4E3 U7LYkpSL+ggcdQkWDPOvsrpN34AuyNUOk6HHt3oFmrQ2au9+E8/Idi0b8w X-Google-Smtp-Source: AGHT+IG5+NFPHZc8ySOA+Z8WpmECQvXgPFLPf4ndxgdmjfVIbqp0PNjK/1NSGKHnCImL13vS4EYoMg== X-Received: by 2002:a17:907:3d91:b0:b55:befd:8f8d with SMTP id a640c23a62f3a-b647500ec03mr4021807666b.57.1761380282393; Sat, 25 Oct 2025 01:18:02 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 3/4] bhyve: do not allow more than one NVMe device per controller Date: Sat, 25 Oct 2025 10:15:57 +0200 Message-ID: <20251025081558.18715-4-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251025081558.18715-1-bogorodskiy@gmail.com> References: <20251025081558.18715-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EBXYXN2BRKXB3SLMQ5GQNU6FXPCU3IPL X-Message-ID-Hash: EBXYXN2BRKXB3SLMQ5GQNU6FXPCU3IPL X-MailFrom: bogorodskiy@gmail.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 CC: Roman Bogorodskiy 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: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1761651339381154100 Content-Type: text/plain; charset="utf-8" As bhyve does not have explicit notion of controllers, and for NVMe devices it allows to specify one a single source for for a given PCI address, it effectively means that there could be only one device per controller. Update validation code to check this case. Signed-off-by: Roman Bogorodskiy --- src/bhyve/bhyve_domain.c | 27 +++++++++++++++++++ .../bhyvexml2argv-2-nvme-same-controller.args | 10 +++++++ ...hyvexml2argv-2-nvme-same-controller.ldargs | 4 +++ .../bhyvexml2argv-2-nvme-same-controller.xml | 21 +++++++++++++++ tests/bhyvexml2argvtest.c | 1 + 5 files changed, 63 insertions(+) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-contr= oller.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-contr= oller.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-contr= oller.xml diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 79ac336430..6b47890c93 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -310,7 +310,34 @@ bhyveDomainDefValidate(const virDomainDef *def, void *opaque G_GNUC_UNUSED, void *parseOpaque G_GNUC_UNUSED) { + size_t i; virStorageSource *src =3D NULL; + g_autoptr(GHashTable) nvme_controllers =3D g_hash_table_new(g_direct_h= ash, + g_direct_equ= al); + + for (i =3D 0; i < def->ndisks; i++) { + virDomainDiskDef *disk =3D def->disks[i]; + int nvme_ctrl =3D 0; + int idx =3D -1; + + if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_NVME) { + if (virDiskNameParse(disk->dst, &nvme_ctrl, &idx, NULL) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Unknown disk name '%1$s' and no address = specified"), + disk->dst); + return -1; + } + + if (g_hash_table_contains(nvme_controllers, GINT_TO_POINTER(nv= me_ctrl))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", + _("Cannot have more than one disk per NVMe = controller")); + return -1; + } + + g_hash_table_add(nvme_controllers, GINT_TO_POINTER(nvme_ctrl)); + } + } =20 if (!def->os.loader) return 0; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.a= rgs b/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.args new file mode 100644 index 0000000000..664eec99bc --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.args @@ -0,0 +1,10 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,nvme,/tmp/freebsd.img \ +-s 3:0,nvme,/tmp/data.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.l= dargs b/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.ldargs new file mode 100644 index 0000000000..5905f4b3e6 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /tmp/freebsd.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.x= ml b/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.xml new file mode 100644 index 0000000000..dc4e3c621b --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-2-nvme-same-controller.xml @@ -0,0 +1,21 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + + + + + + + + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 9d20e5669e..3c6d530f66 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -262,6 +262,7 @@ mymain(void) DO_TEST_FAILURE("serial-invalid-port"); DO_TEST("nvme"); DO_TEST("2-nvme-2-controllers"); + DO_TEST_FAILURE("2-nvme-same-controller"); =20 /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); --=20 2.51.0