From nobody Mon Apr 13 10:52:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772816303; cv=none; d=zohomail.com; s=zohoarc; b=LZ5xMkTE/RWOf96CJmoDkPnubFJGAlfelJKRDZX8XmoZc9+q6AWY0QiK2cc2E1h15gEPkk5BbrtMuwih9nFT7vVM6dFFoM9i8O51Co/K52ZQ4Q0UADPkoI5PMl54j7u5MbdfISkYpK2540+EvWgSLgI7e9OE11Q1ZC+5UkWIbmw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772816303; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lrQBmgnF1i08tKD68piYgeyf689ewLMLSolggkqN1FE=; b=LRsgbvE4qBWFsiTJV0nCIvdB/rvf0ucLjmeFauTlFo6y2AO8yJ5uIzGFuw8INSisPzCZOWuT98iVzu8KH4AQi3Y5Cq76SKsHIxwIBW+hOpERiLnuq+asLhJ2GIsagdmextxEUiU3zW+6Xp+SH5LCb2S/68kxXwHgrVjmsl3cfR4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772816303117672.6308777008833; Fri, 6 Mar 2026 08:58:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyYUe-0004eM-JA; Fri, 06 Mar 2026 11:57:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyYUb-0004cf-7r for qemu-devel@nongnu.org; Fri, 06 Mar 2026 11:57:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyYUZ-0006ia-Gi for qemu-devel@nongnu.org; Fri, 06 Mar 2026 11:57:36 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-292-YPwarEp9MNqL3PItU4wCpg-1; Fri, 06 Mar 2026 11:57:31 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 087381956094; Fri, 6 Mar 2026 16:57:29 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.45.225.197]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 46A0518001FE; Fri, 6 Mar 2026 16:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772816254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lrQBmgnF1i08tKD68piYgeyf689ewLMLSolggkqN1FE=; b=b2cSeAxky1xT/1UFjsDMczVyIUNO5VUwYhF/VW9i6Bz/mUGgXH6/stlXvyW3bNDb+5tiEj JkqrgNIdbpuiZZse16FljvquoTtcAOpZqEl5NHwMps7IhsnTwW4RhRXc99JNPIGTYJz19V BJ6Hdl8l0Ww7yQLSyzE3F2IiQzvMklE= X-MC-Unique: YPwarEp9MNqL3PItU4wCpg-1 X-Mimecast-MFC-AGG-ID: YPwarEp9MNqL3PItU4wCpg_1772816249 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Keith Busch , Kevin Wolf , Stefan Hajnoczi , Avi Kivity , Fam Zheng , Hanna Reitz , Jesper Devantier , qemu-block@nongnu.org, Klaus Jensen , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 1/4] include/block: define constants for NVME string fields Date: Fri, 6 Mar 2026 16:57:14 +0000 Message-ID: <20260306165717.3360110-2-berrange@redhat.com> In-Reply-To: <20260306165717.3360110-1-berrange@redhat.com> References: <20260306165717.3360110-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772816305181154100 The version, model and serial fields accept fixed length strings. Add constants to enable user supplied strings to be validated. Signed-off-by: Daniel P. Berrang=C3=A9 --- include/block/nvme.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/block/nvme.h b/include/block/nvme.h index 9d7159ed7a..e4e7be5120 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -1134,12 +1134,16 @@ enum NvmeIdCns { NVME_ID_CNS_CS_IND_NS_ALLOCATED =3D 0x1f, }; =20 +#define NVME_ID_CTRL_SN_MAX_LEN 20 +#define NVME_ID_CTRL_MN_MAX_LEN 40 +#define NVME_ID_CTRL_FR_MAX_LEN 8 + typedef struct QEMU_PACKED NvmeIdCtrl { uint16_t vid; uint16_t ssvid; - uint8_t sn[20]; - uint8_t mn[40]; - uint8_t fr[8]; + uint8_t sn[NVME_ID_CTRL_SN_MAX_LEN]; + uint8_t mn[NVME_ID_CTRL_MN_MAX_LEN]; + uint8_t fr[NVME_ID_CTRL_FR_MAX_LEN]; uint8_t rab; uint8_t ieee[3]; uint8_t cmic; --=20 2.53.0 From nobody Mon Apr 13 10:52:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772816291; cv=none; d=zohomail.com; s=zohoarc; b=Dt4KcrFZ1YujiPuehSmXSvAV6KMvx6FVi4caGNV3fECSx/mHf9h+glzuomhMe/esvkhdftxzS/hH2vR+zgoAJXl8m9jpBD8X79RmZwlwPpDDlCvHOj6v0E++IG7hHTf9/zx5ATlxVt5h2xRAyggVbA7kfDTDMeEa1lHSy5qMoAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772816291; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=H2hTvCXF7y48kvG1MuleNY6neqOHdNPnnW2J7Zk4xgI=; b=ZilzM8KjW4UI/ErzuS/zpL7NtHYclyavOUMGnF7nQDy8BX+EMz5z+66qbWynYNpsfcYkrwx5cUk9VeMdkQ2w/pvF8DeYJqzO8k5AwA1sCVcZwi+Tr8d27iQ5Uy9vB+qAcapI3fxBjcmxacRsae/6MmgL+fIn0OIwCqMtph6yJkc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772816291116667.9565184953908; Fri, 6 Mar 2026 08:58:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyYUk-0004fO-7M; Fri, 06 Mar 2026 11:57:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyYUi-0004ev-MT for qemu-devel@nongnu.org; Fri, 06 Mar 2026 11:57:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyYUg-0006j0-85 for qemu-devel@nongnu.org; Fri, 06 Mar 2026 11:57:44 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-288-imH1wZ74PC-B-BVoDoZeYg-1; Fri, 06 Mar 2026 11:57:38 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E19B41956053; Fri, 6 Mar 2026 16:57:34 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.45.225.197]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7B2DE18001FE; Fri, 6 Mar 2026 16:57:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772816261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H2hTvCXF7y48kvG1MuleNY6neqOHdNPnnW2J7Zk4xgI=; b=NfQs9mkkam0TeJHeii8xwkDHCjCr5o2h0Siq2w20wiMXsO735bMXK7X1vwYTlN9cScJpu8 xPKlOnNRXrc//eADmHcA3AFTKh1GupcGXd5oY6QA1igXMLccwWRipnoVQIyIBq4wXL0NaH dQxS2S/ozJkDzepzmGpHKPUQVOvKejE= X-MC-Unique: imH1wZ74PC-B-BVoDoZeYg-1 X-Mimecast-MFC-AGG-ID: imH1wZ74PC-B-BVoDoZeYg_1772816255 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Keith Busch , Kevin Wolf , Stefan Hajnoczi , Avi Kivity , Fam Zheng , Hanna Reitz , Jesper Devantier , qemu-block@nongnu.org, Klaus Jensen , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 2/4] hw/nvme: report error for oversized 'serial' parameter Date: Fri, 6 Mar 2026 16:57:15 +0000 Message-ID: <20260306165717.3360110-3-berrange@redhat.com> In-Reply-To: <20260306165717.3360110-1-berrange@redhat.com> References: <20260306165717.3360110-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772816293221154100 The 'serial' accepted by the NVME device is at most 20 characters long. An over-sized user supplied value should be reported rather than silently truncated. Signed-off-by: Daniel P. Berrang=C3=A9 --- hw/nvme/ctrl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index cc4593cd42..e6b2e3b70a 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -8600,6 +8600,11 @@ static bool nvme_check_params(NvmeCtrl *n, Error **e= rrp) error_setg(errp, "serial property not set"); return false; } + if (strlen(params->serial) > NVME_ID_CTRL_SN_MAX_LEN) { + error_setg(errp, "'serial' parameter '%s' can be at most '%d' char= acters", + params->serial, NVME_ID_CTRL_SN_MAX_LEN); + return false; + } =20 if (params->mqes < 1) { error_setg(errp, "mqes property cannot be less than 1"); --=20 2.53.0 From nobody Mon Apr 13 10:52:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772816347; cv=none; d=zohomail.com; s=zohoarc; b=D1dCcFpPReTaPODJEeuRlCnHWvqVZQuY0gOu6NQqnhEmEzK6iajoTxAJmrYAVOjNLdVTuMFYwe4kccHYpOUEHFUkEV74k9/M9XVsbpQxgbN4XnQEQOvvnhnyH7dEROVZdXq2JZXSqEV1IuJs8oauAarQU1gaaojbe1LE7X/IC2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772816347; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bixJFigiCkrl9cifpW4RVb45ej0zL75PQtxcTkRAlW4=; b=F0TKeqSR+7BlzovobuY0jh/N5pK0tmclgHUsbwYen+qAZTCB6o9BUU8HE2m0dwh/eT47f8iFJso7+CZ8b/5UljdneOo8j5bYT+X+9G1eBfmiTCni5KuAKEuDnWHq26H+nL+osxeg1TdJGwPsGIKwJqXIGKa2KKf4eSLC8Ku6stI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772816347030906.9379475336768; Fri, 6 Mar 2026 08:59:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyYUr-0004h0-03; Fri, 06 Mar 2026 11:57:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyYUl-0004g8-Nj for qemu-devel@nongnu.org; Fri, 06 Mar 2026 11:57:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyYUk-0006jY-7X for qemu-devel@nongnu.org; Fri, 06 Mar 2026 11:57:47 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-597-tngVE4uSM_-rldvWeSK-Uw-1; Fri, 06 Mar 2026 11:57:41 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 069BF1800344; Fri, 6 Mar 2026 16:57:40 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.45.225.197]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7A53618001FE; Fri, 6 Mar 2026 16:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772816265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bixJFigiCkrl9cifpW4RVb45ej0zL75PQtxcTkRAlW4=; b=drH6kQ6BaxocwD6fXppxgBKarPvd6eVtimCfTNJuGBiN00FrwsNKD0QQSt8cQt58PfOEOP oXhrBzcjmo+3bO/n7isIWCDMSonu/o/xBEwOK5PyB5LrKMKUTJxGO1EpEwIFVWf5WKJk7A y1P/QYkukf7u3HHatv/8791dL/PYGCw= X-MC-Unique: tngVE4uSM_-rldvWeSK-Uw-1 X-Mimecast-MFC-AGG-ID: tngVE4uSM_-rldvWeSK-Uw_1772816260 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Keith Busch , Kevin Wolf , Stefan Hajnoczi , Avi Kivity , Fam Zheng , Hanna Reitz , Jesper Devantier , qemu-block@nongnu.org, Klaus Jensen , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 3/4] hw/nvme: add user controlled 'model' property Date: Fri, 6 Mar 2026 16:57:16 +0000 Message-ID: <20260306165717.3360110-4-berrange@redhat.com> In-Reply-To: <20260306165717.3360110-1-berrange@redhat.com> References: <20260306165717.3360110-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772816348892158500 This enables overriding the built in default "QEMU NVMe Ctrl" string with a user specified string. The value can be at most 40 characters in length. Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/system/devices/nvme.rst | 5 +++++ hw/nvme/ctrl.c | 14 ++++++++++++-- hw/nvme/nvme.h | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/system/devices/nvme.rst b/docs/system/devices/nvme.rst index 6509b35fcb..109c01a70d 100644 --- a/docs/system/devices/nvme.rst +++ b/docs/system/devices/nvme.rst @@ -60,6 +60,11 @@ parameters. the SMART / Health information extended log become available in the controller. We emulate version 5 of this log page. =20 +``model`` (default: ``QEMU NVMe Ctrl``) + Override the default reported model, which can be used when needing + to more closely impersonate a particular device type. The model name + can be a maximum of 40 characters in length. + Additional Namespaces --------------------- =20 diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index e6b2e3b70a..4067443309 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -43,7 +43,8 @@ * atomic.dn=3D, \ * atomic.awun, \ * atomic.awupf, \ - * subsys=3D + * subsys=3D, \ + * model=3D * -device nvme-ns,drive=3D,bus=3D,nsid=3D,\ * zoned=3D, \ * subsys=3D,shared=3D, \ @@ -8606,6 +8607,13 @@ static bool nvme_check_params(NvmeCtrl *n, Error **e= rrp) return false; } =20 + if (params->model && + strlen(params->model) > NVME_ID_CTRL_MN_MAX_LEN) { + error_setg(errp, "'model' parameter '%s' can be at most '%d' chara= cters", + params->model, NVME_ID_CTRL_MN_MAX_LEN); + return false; + } + if (params->mqes < 1) { error_setg(errp, "mqes property cannot be less than 1"); return false; @@ -9099,7 +9107,8 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) =20 id->vid =3D cpu_to_le16(pci_get_word(pci_conf + PCI_VENDOR_ID)); id->ssvid =3D cpu_to_le16(pci_get_word(pci_conf + PCI_SUBSYSTEM_VENDOR= _ID)); - strpadcpy((char *)id->mn, sizeof(id->mn), "QEMU NVMe Ctrl", ' '); + strpadcpy((char *)id->mn, sizeof(id->mn), + n->params.model ? n->params.model : "QEMU NVMe Ctrl", ' '); strpadcpy((char *)id->fr, sizeof(id->fr), QEMU_VERSION, ' '); strpadcpy((char *)id->sn, sizeof(id->sn), n->params.serial, ' '); =20 @@ -9379,6 +9388,7 @@ static const Property nvme_props[] =3D { DEFINE_PROP_LINK("subsys", NvmeCtrl, subsys, TYPE_NVME_SUBSYS, NvmeSubsystem *), DEFINE_PROP_STRING("serial", NvmeCtrl, params.serial), + DEFINE_PROP_STRING("model", NvmeCtrl, params.model), DEFINE_PROP_UINT32("cmb_size_mb", NvmeCtrl, params.cmb_size_mb, 0), DEFINE_PROP_UINT32("num_queues", NvmeCtrl, params.num_queues, 0), DEFINE_PROP_UINT32("max_ioqpairs", NvmeCtrl, params.max_ioqpairs, 64), diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h index d66f7dc82d..ebf1fcfdcd 100644 --- a/hw/nvme/nvme.h +++ b/hw/nvme/nvme.h @@ -542,6 +542,7 @@ typedef struct NvmeCQueue { =20 typedef struct NvmeParams { char *serial; + char *model; uint32_t num_queues; /* deprecated since 5.1 */ uint32_t max_ioqpairs; uint16_t msix_qsize; --=20 2.53.0 From nobody Mon Apr 13 10:52:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772816311; cv=none; d=zohomail.com; s=zohoarc; b=hMXNu2kF0xHxt0xmD3mgWNfgicPodR/NrBt4cADd3QeOgLp6Gjwjsmeydxls3wl8U9jR5XPpIztYQBMWgSBBadZwnvbDVFBJLaM9sRFZ8TkvnpRJK07t21bzA1r5MjyiiClWI2go8fUX6hEjuf3+fqUmYc7Ld/lAObhk7B4M66s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772816311; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=w2bToJGrR728ljxaaDhnpYVbNbwzFUcS0wZqN1H6Yss=; b=en8kSeQ5k6YKdc0S1DSvSxst7ufLRl8TJV71cuaBM0iRKu+Mm/0YHgeGXd87zFi7qhP1+vb934C3PYDDBhV/1Z/PtHRXbTXQ2wEFn7cyJ5TZOHoff1/BCIJQ4e0gSEbXmz5faOTOaJ1XVNcOe5L31PbyP7WTBREGGGrpOEQQ05E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772816311965695.9558655642074; Fri, 6 Mar 2026 08:58:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyYUx-0004hq-6w; Fri, 06 Mar 2026 11:57:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyYUv-0004hZ-8S for qemu-devel@nongnu.org; Fri, 06 Mar 2026 11:57:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vyYUr-0006kL-FE for qemu-devel@nongnu.org; Fri, 06 Mar 2026 11:57:56 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-556-3KRj2l_xOfmDk-6UktsDPA-1; Fri, 06 Mar 2026 11:57:47 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CC1AF1956089; Fri, 6 Mar 2026 16:57:45 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.45.225.197]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B5288180075D; Fri, 6 Mar 2026 16:57:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772816272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w2bToJGrR728ljxaaDhnpYVbNbwzFUcS0wZqN1H6Yss=; b=aYttQ/ugvJDGifIP3are413+1A69zqPzpVI8/TbXw+jbWpBH7QXS9FH6hdEtbWLA/pTSJo wihW6dRDXg13HCIpRLU9FdzFpu8XjSbjgaXHyzaKmO6jKhQI9QaUVcBe2+l7tHl4o84ctb 4DCOysUwL8ocshJXUJjMiWjJAq8pYVo= X-MC-Unique: 3KRj2l_xOfmDk-6UktsDPA-1 X-Mimecast-MFC-AGG-ID: 3KRj2l_xOfmDk-6UktsDPA_1772816266 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Keith Busch , Kevin Wolf , Stefan Hajnoczi , Avi Kivity , Fam Zheng , Hanna Reitz , Jesper Devantier , qemu-block@nongnu.org, Klaus Jensen , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 4/4] hw/nvme: add user controlled 'firmware-version' property Date: Fri, 6 Mar 2026 16:57:17 +0000 Message-ID: <20260306165717.3360110-5-berrange@redhat.com> In-Reply-To: <20260306165717.3360110-1-berrange@redhat.com> References: <20260306165717.3360110-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.411, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.679, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772816314247154100 This enables overriding the built in default QEMU project version string with a user specified string. The value can be at most 8 characters in length. Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/system/devices/nvme.rst | 5 +++++ hw/nvme/ctrl.c | 14 ++++++++++++-- hw/nvme/nvme.h | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/system/devices/nvme.rst b/docs/system/devices/nvme.rst index 109c01a70d..98a4401043 100644 --- a/docs/system/devices/nvme.rst +++ b/docs/system/devices/nvme.rst @@ -65,6 +65,11 @@ parameters. to more closely impersonate a particular device type. The model name can be a maximum of 40 characters in length. =20 +``firmware-version`` (default: current QEMU version number) + Override the default reported firmware version, which can be used when + needing to more closely impersonate a particular device type. The version + can be a maximum of 8 characters in length. + Additional Namespaces --------------------- =20 diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 4067443309..b392e053ab 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -44,7 +44,8 @@ * atomic.awun, \ * atomic.awupf, \ * subsys=3D, \ - * model=3D + * model=3D, \ + * firmware-version=3D * -device nvme-ns,drive=3D,bus=3D,nsid=3D,\ * zoned=3D, \ * subsys=3D,shared=3D, \ @@ -8614,6 +8615,13 @@ static bool nvme_check_params(NvmeCtrl *n, Error **e= rrp) return false; } =20 + if (params->firmware_version && + strlen(params->firmware_version) > NVME_ID_CTRL_FR_MAX_LEN) { + error_setg(errp, "'firmware-version' parameter '%s' can be at most= '%d' characters", + params->firmware_version, NVME_ID_CTRL_FR_MAX_LEN); + return false; + } + if (params->mqes < 1) { error_setg(errp, "mqes property cannot be less than 1"); return false; @@ -9109,7 +9117,8 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) id->ssvid =3D cpu_to_le16(pci_get_word(pci_conf + PCI_SUBSYSTEM_VENDOR= _ID)); strpadcpy((char *)id->mn, sizeof(id->mn), n->params.model ? n->params.model : "QEMU NVMe Ctrl", ' '); - strpadcpy((char *)id->fr, sizeof(id->fr), QEMU_VERSION, ' '); + strpadcpy((char *)id->fr, sizeof(id->fr), + n->params.firmware_version ? n->params.firmware_version : QE= MU_VERSION, ' '); strpadcpy((char *)id->sn, sizeof(id->sn), n->params.serial, ' '); =20 id->cntlid =3D cpu_to_le16(n->cntlid); @@ -9389,6 +9398,7 @@ static const Property nvme_props[] =3D { NvmeSubsystem *), DEFINE_PROP_STRING("serial", NvmeCtrl, params.serial), DEFINE_PROP_STRING("model", NvmeCtrl, params.model), + DEFINE_PROP_STRING("firmware-version", NvmeCtrl, params.firmware_versi= on), DEFINE_PROP_UINT32("cmb_size_mb", NvmeCtrl, params.cmb_size_mb, 0), DEFINE_PROP_UINT32("num_queues", NvmeCtrl, params.num_queues, 0), DEFINE_PROP_UINT32("max_ioqpairs", NvmeCtrl, params.max_ioqpairs, 64), diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h index ebf1fcfdcd..5ef3ebee29 100644 --- a/hw/nvme/nvme.h +++ b/hw/nvme/nvme.h @@ -543,6 +543,7 @@ typedef struct NvmeCQueue { typedef struct NvmeParams { char *serial; char *model; + char *firmware_version; uint32_t num_queues; /* deprecated since 5.1 */ uint32_t max_ioqpairs; uint16_t msix_qsize; --=20 2.53.0