From nobody Wed Sep 23 09:01:45 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=pass; 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1785520656; cv=none; d=zohomail.com; s=zohoarc; b=MCC0h37INUajOwcJoMMLnoiPsxjOREal4hPt799I4qxtWgNdiqkGJe95+C2yQERBwJSP94UDVHNS1TMoVPvr+DiWbK7Q878A4e2LdTn5fLy3J6WUj28AMnM1KvZqcfLSL09NKEB8fq6u9TYhwKod8HjAARnHziW+Ly4JFXbUUO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785520656; 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=BhN9gjzaQypwz7u4HyuQVmVMKBk/5V3derzDizsGCMk=; b=jjq/odTQovHY7CLvGgg0Su0eobPBW9aM+7SaDJVFmuEAu2CT5eijYsScqyiekdXREgvmJ38abHfRLov1KGDZfzXHDZk+24YJA8uJWBkfRzhvPSFoOzevIpBQEBL199yR71U8asd4hLeYHK8LWQhqFR2AZJC+5nZ3mZmbQydGozM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1785520656462102.60382842752153; Fri, 31 Jul 2026 10:57:36 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5DBB33FACE; Fri, 31 Jul 2026 13:57:35 -0400 (EDT) Received: from [172.19.199.10] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id F2E8441871; Fri, 31 Jul 2026 13:53:29 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4923F3F9B8; Fri, 31 Jul 2026 13:53:03 -0400 (EDT) Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) (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 79E633FA5C for ; Fri, 31 Jul 2026 13:53:00 -0400 (EDT) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-c1c50c1e29bso186457466b.3 for ; Fri, 31 Jul 2026 10:53:00 -0700 (PDT) Received: from tulp.my.domain (2001-1c02-1a15-3000-ee82-4536-a8f2-9e22.cable.dynamic.v6.ziggo.nl. [2001:1c02:1a15:3000:ee82:4536:a8f2:9e22]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1fd3c9e3e6sm223961966b.22.2026.07.31.10.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 10:52:58 -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=-2.7 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_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785520379; x=1786125179; 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:content-type; bh=BhN9gjzaQypwz7u4HyuQVmVMKBk/5V3derzDizsGCMk=; b=jDSjlyB2GhFjWH6W/DKcgRrazpgeQYLzMwJQaFOdveP9Is3+5LmMT0jtzrLtR873rn 0h7S+GWVUO9pjwJKJ85UACq9xt2/OlP/Q+KPR8/u2ImBu0UOpQKCWfNI9+DajeS+4HZE Swk5yq2N4qsXicf3oJInw7+QHJzirsrtdB6CkRsgj2bNAfOTTcWTK0J6gzuCYYtM9+im qu5yJPSyNvO3Xkh66mjSy/aGUtubw5ePx0vzBRa6uFIOuQqBocvb/s1mqdheFZALENCE SJ/jQ0GWvO+JMuBnBdt/LDXNf2q2dC57q53Pettdws9aA/kP71Yn/EQ9EZqQgD4XZvd1 lFNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785520379; x=1786125179; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=BhN9gjzaQypwz7u4HyuQVmVMKBk/5V3derzDizsGCMk=; b=Ur1kn8YldJP1eSe5GOsVY8JkUm5bfauKjG377YQl3rW7SFsxOzSMHqFIRXj9svABuj IC0f5o4AA0qrlax15kilmBbfCk+96ySEaRz/nAKNfWpIun3tMO3LZG8noMxnLbBlkI2k bXEgPF6ZoBBefOoFH7ZjQXI/8MwV7t0EKOvq/f3ARLjndy1iqKgZoRjL21d3AYJdHIuG rMEmXyX7c266q2vxcjFQfm0/P+ZRNwQiuLMI3iqvUIOsSLV9KsWqRjo/kIGWhNYZ9FH7 urqmP6+1jMWnf9muCe0EW1pgOT5kcLOvJWXLSby4GiPPJn6jD7Xxfx8JGA3+8WactYpK Zstg== X-Gm-Message-State: AOJu0YwP36/MHUzH92GT6rgq03rwvfBEVWngKtyZLAKHC2an3GqUQZkT oVr2hrgJKJzylc6Z3FuzWEuliqfDClXVYqrVgRkdFjcQUBovA2cxkcvcQlPTRT87 X-Gm-Gg: AR+sD132TWyOMXoGmwYi5crwe7bggUKG/q2QiUM2DGyxpeSYJVm2mfiXraz+aTSEPMP XZY2Nm4wAYy8eAR6oC+j9Z0DsJUDpWNgdn9SjN0rrKMHYxC67ZNNRdSe5GapbB5TJ0xZ6KOexOw splf+qGizV9zBJjB79C76WKPxpyVD+ms0vL4QKUdNr7Zm68l1UAfsx729AvelWotpPQL0d1fVMV a5xV0iN5MuuBV/T1M7o5d/Fn8chP+rqhci0xInJTpLgIfAsMlzgDzMOaQzkDC7pQjLaXq4uJw1b hmGwu1vrVM77fnJa7I38J56QljL7SQvl/h3uiJ9NE97vq2ey2aM6rOjQqHjrJgOW18kiTv9EAhp /ji3FFt0xvgbapbeGvspZfB/9I3BOn3Re5+mC8I4RiNBVDBfxbOML0Sz9ZC3fnA9OGZbeFmH3lr 9HyBgWdU7Gv/tLZ02Xiy5E0Rn+V9kwNu3vRXl+WLM4WSC5Gg6jKm3mz9/TDgi3d4y9AJNIBcwA9 GO2KVArgj21SA+dei67WC3BYlNqDODqRC099BvLMXkLTsFb2Uf61+WTfdntJzkJ6Ttlvlv1xx2Q JoZi2iDFL9k= X-Received: by 2002:a17:907:9610:b0:c1c:5c90:1bad with SMTP id a640c23a62f3a-c1fe7f9ec95mr52991566b.14.1785520378365; Fri, 31 Jul 2026 10:52:58 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 2/3] bhyve: support setting serial number for NVMe controllers Date: Fri, 31 Jul 2026 19:52:04 +0200 Message-ID: <20260731175205.14822-3-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260731175205.14822-1-bogorodskiy@gmail.com> References: <20260731175205.14822-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2GWCW7RKYI75QKBME2PAVWE5XRNBG2CR X-Message-ID-Hash: 2GWCW7RKYI75QKBME2PAVWE5XRNBG2CR 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: 1785520657814158500 Content-Type: text/plain; charset="utf-8" bhyve supports setting NVMe controller serial number using the "ser=3D" option. Update bhyveBuildNVMeControllerArgStr() to set that if "serial" is specified for the controller. We do it in the controller's disks loop, but as we prohibit more than 1 disk per controller in bhyveDomainDefValidate(), there is no repetition here. Signed-off-by: Roman Bogorodskiy --- src/bhyve/bhyve_command.c | 2 ++ ...hyvexml2argv-nvme-explicit-controller.args | 9 ++++++ ...vexml2argv-nvme-explicit-controller.ldargs | 4 +++ ...bhyvexml2argv-nvme-explicit-controller.xml | 20 +++++++++++++ tests/bhyvexml2argvtest.c | 1 + ...yvexml2xmlout-nvme-explicit-controller.xml | 28 +++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 7 files changed, 65 insertions(+) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-expli= cit-controller.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-expli= cit-controller.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-expli= cit-controller.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-nvme-e= xplicit-controller.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index f0c3cf03c5..956fcab06c 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -479,6 +479,8 @@ bhyveBuildNVMeControllerArgStr(const virDomainDef *def, virBufferAsprintf(&opt, ",maxq=3D%d", disk->queues); if (disk->queue_size) virBufferAsprintf(&opt, ",qsz=3D%d", disk->queue_size); + if (controller->opts.nvmeopts.serial) + virBufferAsprintf(&opt, ",ser=3D%s", controller->opts.nvmeopts= .serial); =20 nvme_opts =3D virBufferContentAndReset(&opt); =20 diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-explicit-con= troller.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-explicit-c= ontroller.args new file mode 100644 index 0000000000..74dd4baa37 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-explicit-controller= .args @@ -0,0 +1,9 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,nvme,/tmp/freebsd.img,maxq=3D2,qsz=3D256,ser=3DBHYVE-NVME0-01234 \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-explicit-con= troller.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-explicit= -controller.ldargs new file mode 100644 index 0000000000..5905f4b3e6 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-explicit-controller= .ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /tmp/freebsd.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-explicit-con= troller.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-explicit-co= ntroller.xml new file mode 100644 index 0000000000..9781d3aaef --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-explicit-controller= .xml @@ -0,0 +1,20 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + BHYVE-NVME0-01234 + + + + + +
+ + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 71322d1330..436eecb003 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -280,6 +280,7 @@ mymain(void) DO_TEST_FAILURE("serial-invalid-port"); DO_TEST("nvme"); DO_TEST("2-nvme-2-controllers"); + DO_TEST("nvme-explicit-controller"); DO_TEST_FAILURE("2-nvme-same-controller"); DO_TEST("sata-rotation-rate"); DO_TEST_FAILURE("disk-virtio-rotation-rate"); diff --git a/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-nvme-explicit= -controller.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-nvme-exp= licit-controller.xml new file mode 100644 index 0000000000..f646267ec5 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-nvme-explicit-contro= ller.xml @@ -0,0 +1,28 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + + BHYVE-NVME0-01234 +
+ + + + diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 120bdd42e5..51ce2adb33 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -129,6 +129,7 @@ mymain(void) DO_TEST_DIFFERENT("4-consoles"); DO_TEST_DIFFERENT("nvme"); DO_TEST_DIFFERENT("2-nvme-2-controllers"); + DO_TEST_DIFFERENT("nvme-explicit-controller"); DO_TEST_DIFFERENT("passthru-multiple-devs"); DO_TEST_DIFFERENT("slirp"); DO_TEST_DIFFERENT("virtio-scsi"); --=20 2.52.0