From nobody Tue Aug 4 22:20:35 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=1785520518; cv=none; d=zohomail.com; s=zohoarc; b=S+aoqSCB3ZgPMKmVhXWc9GD9xDSnkk2gf22EFJfvkc0e1pXYYRSsseX5tUfhCAQsM8XPS+eibU6IzsXjpFc2pXhyytixaTjg33cb8VrZDDo/rqDREmvyk7lZ0txGpbCsQFOe6+EHCMkwVV5IyVFYXzSuvXUe0z4S0D2cTz+yPqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785520518; 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=OAk80yQo9g9oubjQ2m2+fS5U7tjzaObDY8jcYwS+psI=; b=BQ+ftCSNDZAFMtJtZF192Z2vZ+1I39HIobaldv8IcYGCkOshseHKBcXZM8NNeS88LTTwY3jWQNVsRcJzzqJZZll91QCBREWf72K+rYDv3xxDWAq5gBi3cdofN9dmn1hFRUTVYbv8NCl8cK5Z5Cvzn88grHYT2IKm3ho7nZogPLo= 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 1785520518120839.1582943399094; Fri, 31 Jul 2026 10:55:18 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C04AF41885; Fri, 31 Jul 2026 13:55:16 -0400 (EDT) Received: from [172.19.199.10] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id B9DC4417F7; Fri, 31 Jul 2026 13:53:17 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id EFADA3FA30; Fri, 31 Jul 2026 13:53:01 -0400 (EDT) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) (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 780CE3FA58 for ; Fri, 31 Jul 2026 13:53:00 -0400 (EDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-c15d111ca99so141437866b.0 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:57 -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=1785520378; x=1786125178; 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=OAk80yQo9g9oubjQ2m2+fS5U7tjzaObDY8jcYwS+psI=; b=GHIo67pQyyzuTOPXJW/i/qpvy8KYVX6J7z50bm/rV3sYojmjkDPWNaKuF0B7bv6Ppy Ye/MRQ34U+Vf6UEAz968izX4yRzEW7LrC5l/Qxq2exRyMSKi+xhhI+Ymx6Eo4wV6yDL+ Zu+6U9dbUQs4Icshc9jQWOQpYYZuNdoG4b7lKvOoN3bxcZ3xx2Sgca2I0EFy0KYFd39E I/gBijilkp5xEx4DPsSZPVZpW8LZeLayYCpU1IsHaFdPONudTSGcG6VJQClxVJxSXi1i KuMVziJUXzNXTr9QH7grWkNwM6bEkLAGjtqBjnuo1uh17rhd5Dtf85zdNCkpL3yg8jkq Fn+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785520378; x=1786125178; 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=OAk80yQo9g9oubjQ2m2+fS5U7tjzaObDY8jcYwS+psI=; b=QynpQ4cDVpLoBTd0Ui+PFONj0tJXXjoJR58J5jU1Nb3splpKRmL/k7BXkNpdEO/vEV AoNtJEYho7fTOabnuWZwuQ9WQH5WckJtsB1+71odz6xl6S62LflBlgbR3fq421LasDRc 8IxHJrSndWv3JTdNVr+jF2qy2X0SON3EIO1nilgN8flWrPsSheD+yI0MVrKpAo65yRYA emTSQrPFOZnEzfONFa31gyqOxy3g6xvHpDfUx7VbgQsA0nPAoIG4Jno1cXFJQZtuV3DH Ny4YnixsNq8Ls2jmQMA/ysTA9wNGOkVtwZYuIB5B5h2JACTwKkZJsOhCAd1Y24Pqpzi6 bbZQ== X-Gm-Message-State: AOJu0YxWcIsJ//H7QOWh/p2R9xjMhW3X7FVmvlURBIYTbtO2izRcp4f6 Bz9274gyAoNx2dJUcR2X9kO0kIzAxki1rEsHCJ7tQ0Jy7rimrmp2t+hkfFjt7v+/ X-Gm-Gg: AR+sD12h7SDbk9pwjdzTln2ezRo2aoRJ8rRh9aEmCWv4lKY9gO/7IOq9TJXx30pGf+J KGqE4kKdLl+sJK7qYsSrk/rJvBBsHUAT0ZqHw+VUZrJA2NkMumheyyPMF1uAN86g3N9Ob0q89J/ guNcIHjET5J8qSACmuWvpJAuc/B33dBrbm8VDfX6HCR5VXaamyOTeUWmW4m+7v90BD+PjEXSHEB a9VInVNDgPprGKzZzep8cnpYUso9YDaOIGtZPSJ8RU5TBuJLyxGEB911/r1pBUZtO+hE0F0QNMg HNh8HWMXKVAtN0FELKpNUcYds+COfrpbU3cVvMcVMWDHzqOTkPU53pSs+1Mb4tLs7Qd2gdwYKo6 oSQ2GHixCX1EGR0w/ODiRojrwEKRWdTdN8185CVCvs1dADSu2t7qHNUzikMELgZKPK8+zo8P14/ BQw91crrs/MyphpZ4SCn5jVyCfC6d/ax0SjYqoUj6vFSCtbrVhgAXRUEvW9OSJ4ErgRFhA6bAle qzaVCSc2vyGwQfrJgNlehWuLfrriox7AFWmIIJ2zg7RGPWZw1AV6xc5I0XD8R8mFXL/21xm1qM= X-Received: by 2002:a17:907:e1c5:10b0:c1f:1520:4de5 with SMTP id a640c23a62f3a-c1fe7fc5018mr28691966b.1.1785520377880; Fri, 31 Jul 2026 10:52:57 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 1/3] bhyve: support setting serial number for SATA disks Date: Fri, 31 Jul 2026 19:52:03 +0200 Message-ID: <20260731175205.14822-2-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: 7KO4ZJWRSZ7ITLUX5V7HJTTRW6XWHHXT X-Message-ID-Hash: 7KO4ZJWRSZ7ITLUX5V7HJTTRW6XWHHXT 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: 1785520518756158501 Content-Type: text/plain; charset="utf-8" bhyve supports passing disk serial number using the "ser=3D" option, so update bhyveBuildAHCIControllerArgStr() to set it from the "serial" element. Closes: https://gitlab.com/libvirt/libvirt/-/work_items/901 Signed-off-by: Roman Bogorodskiy --- src/bhyve/bhyve_command.c | 3 +++ .../x86_64/bhyvexml2argv-sata-rotation-rate.args | 2 +- .../x86_64/bhyvexml2argv-sata-rotation-rate.xml | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index a4f9c8823b..f0c3cf03c5 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -333,6 +333,9 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def, if (disk->rotation_rate) virBufferAsprintf(&device, ",nmrr=3D%u", disk->rotation_rate); =20 + if (disk->serial) + virBufferAsprintf(&device, ",ser=3D%s", disk->serial); + virBufferAddBuffer(&buf, &device); } =20 diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rat= e.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.ar= gs index 2cf40953e8..3ae510e2ed 100644 --- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.args +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.args @@ -5,6 +5,6 @@ bhyve \ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd1.img,nmrr=3D7200,hd:/tmp/freebsd2.img,nmrr=3D5= 400,hd:/tmp/freebsd3.img,nmrr=3D1 \ +-s 2:0,ahci,hd:/tmp/freebsd1.img,nmrr=3D7200,ser=3DBHYVE-SER01-0001,hd:/tm= p/freebsd2.img,nmrr=3D5400,ser=3DBHYVE-SER02-0004,hd:/tmp/freebsd3.img,nmrr= =3D1,ser=3DBHYVE-SER03-1234 \ -s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 \ bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rat= e.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.xml index a0d80cb908..ed6da8e317 100644 --- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.xml +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-rotation-rate.xml @@ -8,16 +8,19 @@ + BHYVE-SER01-0001 + BHYVE-SER02-0004 + BHYVE-SER03-1234 --=20 2.52.0 From nobody Tue Aug 4 22:20:35 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 From nobody Tue Aug 4 22:20:35 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=1785520584; cv=none; d=zohomail.com; s=zohoarc; b=l+bR0bpY7HepOk6Z07/MKJ974FMUBDD0eBSi3hqpi6Y7IwIzwKzC0D7JLsxjica3+Pog0G3uiZMv7nZt+2v8OqJ6lQ7af6r0KdSj3PKtDP911IxNP3sOv8cnVe8mhgxdgOSfN5msP1EMY/4RRBtVXXX1NVAFS9NsPcdCpKXptig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785520584; 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=+50RaKnY1dvwDcr93fYsmnpq4BG+dVe/amM2aM09VUQ=; b=ljk3dfxnE6MHkEw/g1uX3gw+UYgSrexpwGXAsGl5kpu8wvhd0Rdv5VYjgV2StVyEnIYWundGe6Ch0985VMyny7B/jzrZWVuyOrMjQ0LB+jiv6brkyCmmohP75H8aCgZbtN/sK9dSUeNNc0Xm/jSYQ0NIz0wBeyJT5GB1c52u01Q= 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 1785520584489826.7860472654028; Fri, 31 Jul 2026 10:56:24 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 40C1641834; Fri, 31 Jul 2026 13:56:23 -0400 (EDT) Received: from [172.19.199.10] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 70D3F41B49; Fri, 31 Jul 2026 13:53:24 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 2268E3F323; Fri, 31 Jul 2026 13:53:02 -0400 (EDT) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (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 75F673FA54 for ; Fri, 31 Jul 2026 13:53:00 -0400 (EDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-c1f5208b38dso237095366b.0 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.58 (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=+50RaKnY1dvwDcr93fYsmnpq4BG+dVe/amM2aM09VUQ=; b=n1DP9o+CEneH3IOG9dvKWDwcIUzLG3Fq7bE/isLpQhBJKVidP1SOl6ND4cQ4f+weC+ nwcPv4YMCgl59D77SlLgXLYBjDvFLuDSfyW6NzqSRDA5pjIrRIAy4QImSlIUsfDJbXgn NxK+lvULjh+jFEdoLbmRsOijCw7TgIzV6FCEXrvppruzAlK93gh71ddDLFyYZMpiv1Rl T2baopRiLs6HS/7EtDRGs7C10nbEIb5aOBFIDSA4KyEfq4AScA3R7LRnu3cO2O3DY0WG WByozWCoOHCsPsSDennEHqodMjrKKjZvTiq/R3bVp+uNMcdAhVDDXXu4sKYT1y0GrkGn 2+Dw== 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=+50RaKnY1dvwDcr93fYsmnpq4BG+dVe/amM2aM09VUQ=; b=noItJMlKM3XdI7fyt4rUuOBYg53opIkwkT+bODX4wy/bLKmK2TUs0hYEyKWGI3qyO2 OmSVBA4zvttrdjSO+h2RQ74O7wrRDa/C9GIpojl7LZwA3mhH/3Y2ffAQqbBGzEluiz3v /wa+a9mlj7zNVGHw4dOMhhBwIwO+TkHp5Xu9tSUPHIO4gMQwSmjmrQnTuyU+gH3xWd7i AMduOqvB89TCe7KSuINwQjWdF78PNaQRrgOIIK5Sp0CkA+AQC60y21JZzP9mt8gfe4Nw FTA1Jy7Uu5FRvyqVkVS+X3DJxb8UHDLULapyuwsc6X1rPT/hUKVSn9EDm3yLu8BMSXgG ldxw== X-Gm-Message-State: AOJu0Yy2K8WEI8Ho+KVi2USBbm0k67iIM6p5GAxjSaFLI/EKd589PP7y FTjDhK0oBOEQx7xPu22XzDBSn7lRMkwPRF0SH3dVq+6oPSTTBZK+bOc2rGP8x/wZ X-Gm-Gg: AR+sD12q9Gm+YH6pY2Nj5HtT9BlKd7eNbkr0gd77OkAMFiMzG4pMaGJWIq0BYS10o6a D2sXT91Ki2jwBm7lLrvEDdkbpHK8RTRqMaaHVJ+1TmsKeJ86GD5s/f+NJ9D+bJALq4L6ptF5y0z EBHuwX70oiQ9c0OS7te4AGFOPlP/g+1T5hXQOmqtZWTTlRMk8tXvV2KpF7T9dUx7tVKIODgupyG /ii8cFWuq35fscAmqBgyGqwY6+/wnKQXd+dk9+XfF/jsDmJMw5sDvWX+iU67dcmM2I5sMrJgHim lqJ/LbuAum2AZemypQI1b+eIz+uN6yh7KD0fF7/gCwKy0pmgfyGEn/tr2duyaulqi2dz0bgNopq QotB2lNCP6d0CLqEHuaz9pOxMz8AVLrIz6a6r3PNuTlxBFHm0mkqIxVuYC58svJoRFLZQzthJrs eCINBcKzG7ncMDB7whqxzVS7WjZOL5kiROZq1ix46XtZT329euNoHZg0nNvg5mEPOohwmpKuu2w 7OrGwi23iPkzTtiWsPbYUqFwYnojdibtc/sxcRJ0+JWdwRi0bfozHd+KbHqp7d70diSRZLoIFg= X-Received: by 2002:a17:907:da15:b0:c15:cac2:1ec4 with SMTP id a640c23a62f3a-c1fe7ecaf45mr36561166b.1.1785520378857; Fri, 31 Jul 2026 10:52:58 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 3/3] bhyve: forbid "," in disk serial numbers Date: Fri, 31 Jul 2026 19:52:05 +0200 Message-ID: <20260731175205.14822-4-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: F46JTQZTJVCUVIAHEJ577JFQJTKUVFHX X-Message-ID-Hash: F46JTQZTJVCUVIAHEJ577JFQJTKUVFHX 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: 1785520585153158500 Content-Type: text/plain; charset="utf-8" As bhyve options are passed as a comma separated list, e.g.: -s N:0,ahci,hd:/tmp/my.img,nmrr=3D7200,ser=3DBHYVE-SER01-0001 Do not allow using "," in the serial name. This applies to both NVMe and SATA disks. Signed-off-by: Roman Bogorodskiy --- src/bhyve/bhyve_domain.c | 15 ++++++++++++ .../bhyvexml2argv-nvme-invalid-serial.xml | 20 ++++++++++++++++ ...bhyvexml2argv-sata-disk-invalid-serial.xml | 23 +++++++++++++++++++ tests/bhyvexml2argvtest.c | 2 ++ tests/bhyvexml2xmltest.c | 2 ++ 5 files changed, 62 insertions(+) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-inval= id-serial.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-disk-= invalid-serial.xml diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index b6344185b7..1c588d9243 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -338,6 +338,13 @@ bhyveDomainDeviceDefValidate(const virDomainDeviceDef = *dev, _("Bhyve virtio-serial controller supports = up to 16 ports")); return -1; } + } else if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_NVME= && + controller->opts.nvmeopts.serial) { + if (strchr(controller->opts.nvmeopts.serial, ',')) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Serial number may not contain ',' charac= ter")); + return -1; + } } break; } @@ -423,6 +430,14 @@ bhyveDomainDeviceDefValidate(const virDomainDeviceDef = *dev, return -1; } =20 + if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_SATA && disk->serial) { + if (strchr(disk->serial, ',')) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Serial number may not contain ',' charac= ter")); + return -1; + } + } + break; } case VIR_DOMAIN_DEVICE_NET: { diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-invalid-seri= al.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-invalid-serial.x= ml new file mode 100644 index 0000000000..b9da5352ea --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-nvme-invalid-serial.xml @@ -0,0 +1,20 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + BHYVE-NVME0,01234 + + + + + +
+ + + diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-disk-invalid= -serial.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-disk-invali= d-serial.xml new file mode 100644 index 0000000000..b5d7da8c1e --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sata-disk-invalid-serial= .xml @@ -0,0 +1,23 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + A,B,C + + + + + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 436eecb003..95969a641b 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -282,7 +282,9 @@ mymain(void) DO_TEST("2-nvme-2-controllers"); DO_TEST("nvme-explicit-controller"); DO_TEST_FAILURE("2-nvme-same-controller"); + DO_TEST_FAILURE("nvme-invalid-serial"); DO_TEST("sata-rotation-rate"); + DO_TEST_FAILURE("sata-disk-invalid-serial"); DO_TEST_FAILURE("disk-virtio-rotation-rate"); DO_TEST_FAILURE("disk-virtio-queue-opts"); DO_TEST("slirp"); diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 51ce2adb33..3c90673f5e 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -130,6 +130,7 @@ mymain(void) DO_TEST_DIFFERENT("nvme"); DO_TEST_DIFFERENT("2-nvme-2-controllers"); DO_TEST_DIFFERENT("nvme-explicit-controller"); + DO_TEST_FAILURE("nvme-invalid-serial"); DO_TEST_DIFFERENT("passthru-multiple-devs"); DO_TEST_DIFFERENT("slirp"); DO_TEST_DIFFERENT("virtio-scsi"); @@ -146,6 +147,7 @@ mymain(void) DO_TEST_FAILURE("virtio-console-too-many-ports"); DO_TEST_FAILURE("virtio-console-invalid-name"); DO_TEST_FAILURE("virtio-console-invalid-path"); + DO_TEST_FAILURE("sata-disk-invalid-serial"); =20 /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); --=20 2.52.0