From nobody Tue Sep 9 09:54: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=fail; 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=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1748860769; cv=none; d=zohomail.com; s=zohoarc; b=Efgu4ADGlj3e2qHDArLPoNpFBNXfQ2sKYJ/YhtO1PAogM69B+F0HS2Qlwam9X79VYV2ulZC9mhDoK89Od9HZvexxpfu1nlDtJ+mgoklgyEKhcBZj6bX+7hPqnuzSRoysSuSl67Ww/XY0dbxMvuYe1U9uScDy+V2Dy4Ah6oJsLR8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748860769; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=V1jH5zaC9vJc43rkAVx4rG8OxlXw9yBBj9kz3DEp6Xw=; b=KMOEZpz3v76jiTRAIV/AqH+EfB2Ln2zMbvW0dU1gQravkzLU9MQIq0u8cmCRb7biko4R97Sk+n1YUlVE3GADykjAA1PmcpE7ZzRAkjKWvL6ArGQ59PSn/SLKY121YDmRdzf5WGMyT8RsGhTdi8fJ4SulZg5cuPy2oHcNkONAEU8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1748860769259720.8140221826574; Mon, 2 Jun 2025 03:39:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4F94D144D; Mon, 2 Jun 2025 06:39:28 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 858F91538; Mon, 2 Jun 2025 06:31:38 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0CB631386; Mon, 2 Jun 2025 06:31:09 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2F1AEE7D for ; Mon, 2 Jun 2025 06:31:07 -0400 (EDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-694-lDhh1vptMdOrBiTNgsR6BQ-1; Mon, 02 Jun 2025 06:31:05 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a4ff581df3so777309f8f.1 for ; Mon, 02 Jun 2025 03:31:04 -0700 (PDT) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4f0097539sm14721917f8f.63.2025.06.02.03.30.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jun 2025 03:31:00 -0700 (PDT) Received: from wheatley.brq.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id AF0E5B55DC7B for ; Mon, 02 Jun 2025 12:30:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748860266; 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: in-reply-to:in-reply-to:references:references; bh=tVnxIQJFVJbf4MNKdZK0SXU5Kgjl4hDfneoz7oi/N/g=; b=SrdX56X7EWHnBqnl+uD/CXZF2YuXZys3VbQhM3Ov36qyKmyWZRPpBFb5dHORKDxfTmz4kX G3/zc24Dgg71utk9oxyfYEt47Wu6QAxIhGrq48C/rXfmsn6RfvkG52KzNazA/L26b72aGE MTL8WL7/FWMUfjL3w5yTpV21JokMcvk= X-MC-Unique: lDhh1vptMdOrBiTNgsR6BQ-1 X-Mimecast-MFC-AGG-ID: lDhh1vptMdOrBiTNgsR6BQ_1748860264 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748860264; x=1749465064; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tVnxIQJFVJbf4MNKdZK0SXU5Kgjl4hDfneoz7oi/N/g=; b=F4+JfBF26tfPROdWHdo5xE7IZHWuQpuqnIk3thHRH+Qi72sTxszxaf6uZM+IvpRd3l N53WkYwQ8CA6OfRDozFMZwMts5+FjPeg93spIvQrkD2JTQqiBxrLX3RC7ARNky+FkpBa 8igpRVFiLBSg2lTAfSyj38rf7wATJHmfvgK5y0Oamft/051cvuHiRbfFq5qEYYL6YyCj SbEa7823D1/mItpQ72k5m8sak+o48VmuYncLJBZr9E2iE/nMPV/oQwaqPQ6Q9kmAFjxh u+J/HAgEBfnuZVutRl5RROhTP69r22UVTmPLFnPINb/S3jAbCh1q0KWOB2d24wyoXB9R kBDQ== X-Gm-Message-State: AOJu0YxYt7da3IARaxrRakb444XaGIT1r5rYjijf/oKiDpDG1t3GQxEw GoRF0BICewig4sqG6jjIDOAA2Qae5kIG8XZoaCE+xdD7GxB4lISjUpzEUTRxNcfkd4gthUPLBen HrWDIJYmTskrgGk728xetm8EtFQMy3DujWmwZpS5LalH4Ms50j/8/4SQ18YaY7uriM8X2DWDCbw 9fA4fjZXIw/Ee6nYYEzOQVdGBNBaYRI+n4duapIg2e+q8= X-Gm-Gg: ASbGnctg/8loZWJGOgoCd4L2mXVj59uW8+pmOliS+v2u7QeWCs3616Mbqmqr7cKG+v8 GpmYhubAH2ZK5JEZ6k9qtEhRxpTPHNQQUoM77vJ4cO+TcC52PC+rh1VguGL/3BEDkWq8AYNQmnz k1DJKYpvpfTCPlvIk+r9o9FGRJBqIP5MxJZBlbBTv14vhE8/8X648be8+Eyb/V7xD/zE2IKSvVR CIw4XRhZnSQTtW0AzOsGHJFi1KF8ypeFuUu2SgU7TtBDf2PGlzFELoWtl10tSAZRbRJCMiMcO+y ophNuJGjCEwMYBEmf0OF X-Received: by 2002:a05:6000:4282:b0:3a4:c71a:8119 with SMTP id ffacd0b85a97d-3a4f79e7555mr11376891f8f.25.1748860263676; Mon, 02 Jun 2025 03:31:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFuDVffOx7YI45QNjd+x327/PITh7tlhl/YfdFKGJdTtaz5LZ3gPdRMY+0Korask98vzWY+DQ== X-Received: by 2002:a05:6000:4282:b0:3a4:c71a:8119 with SMTP id ffacd0b85a97d-3a4f79e7555mr11376857f8f.25.1748860263186; Mon, 02 Jun 2025 03:31:03 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH 09/11] qemu: Add support for emulated NVMe disks Date: Mon, 2 Jun 2025 12:30:52 +0200 Message-ID: <1e77c90c8b14a092b7232939fb7e74f57e0cfa57.1748860220.git.mkletzan@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: dJtpjXHggicD0qXTp5mZDI1hfwfQnYq0tfpxv63Rfts_1748860264 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VKLUVPFBYE75QAV3GJ3V3SR25RJTENLT X-Message-ID-Hash: VKLUVPFBYE75QAV3GJ3V3SR25RJTENLT X-MailFrom: mkletzan@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1748860771460116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Martin Kletzander Without any hotplug. Signed-off-by: Martin Kletzander Signed-off-by: Honglei Wang --- src/qemu/qemu_command.c | 18 ++++++- src/qemu/qemu_validate.c | 13 +++++ .../disk-target-nvme.x86_64-latest.args | 39 ++++++++++++++ .../disk-target-nvme.x86_64-latest.xml | 53 +++++++++++++++++++ tests/qemuxmlconfdata/disk-target-nvme.xml | 32 +++++++++++ tests/qemuxmlconftest.c | 1 + 6 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.ar= gs create mode 100644 tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/disk-target-nvme.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9ec9ce343b50..78bcae380c14 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -533,6 +533,18 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, break; =20 case VIR_DOMAIN_DISK_BUS_NVME: + if (!(controllerAlias =3D virDomainControllerAliasFind(domainDef, + VIR_DOMAIN_CO= NTROLLER_TYPE_NVME, + info->addr.dr= ive.controller))) + return -1; + + if (virJSONValueObjectAdd(&props, + "s:bus", controllerAlias, + "u:nsid", info->addr.drive.unit + 1, + NULL) < 0) + return -1; + break; + case VIR_DOMAIN_DISK_BUS_VIRTIO: case VIR_DOMAIN_DISK_BUS_USB: case VIR_DOMAIN_DISK_BUS_XEN: @@ -1724,6 +1736,9 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, break; =20 case VIR_DOMAIN_DISK_BUS_NVME: + driver =3D "nvme-ns"; + break; + case VIR_DOMAIN_DISK_BUS_XEN: case VIR_DOMAIN_DISK_BUS_UML: case VIR_DOMAIN_DISK_BUS_SD: @@ -1793,7 +1808,8 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (disk->geometry.trans !=3D VIR_DOMAIN_DISK_TRANS_DEFAULT) biosCHSTrans =3D virDomainDiskGeometryTransTypeToString(disk->geom= etry.trans); =20 - if (disk->serial) { + /* NVMe disks have serial numbers attached to controllers, not namespa= ces */ + if (disk->serial && disk->bus !=3D VIR_DOMAIN_DISK_BUS_NVME) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; =20 virBufferEscape(&buf, '\\', " ", "%s", disk->serial); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 8730cf4e941f..1da5771877ed 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3204,6 +3204,19 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDom= ainDiskDef *disk, break; =20 case VIR_DOMAIN_DISK_BUS_NVME: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVME_NS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("NVMe disks are not supported with this QEMU = binary")); + return -1; + } + + if (disk->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unexpected address type for nvme disk")); + return -1; + } + break; + case VIR_DOMAIN_DISK_BUS_XEN: case VIR_DOMAIN_DISK_BUS_SD: case VIR_DOMAIN_DISK_BUS_NONE: diff --git a/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args b/te= sts/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args new file mode 100644 index 000000000000..9551f1f2904b --- /dev/null +++ b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args @@ -0,0 +1,39 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-bar \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-bar/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-bar/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-bar/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dbar,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-bar/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 00010203-0405-4607-8809-0a0b0c0d0e0f \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"nvme","id":"nvme0","serial":"abcdefgh","bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"nvme","id":"nvme1","serial":"ASDF","num_queues":4,"ioe= ventfd":true,"bus":"pci.0","addr":"0x3"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"nvme-ns","bus":"nvme0","nsid":1,"drive":"libvirt-2-sto= rage","id":"nvme0-0-0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"nvme-ns","bus":"nvme0","nsid":2,"drive":"libvirt-1-sto= rage","id":"nvme0-0-1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.xml b/tes= ts/qemuxmlconfdata/disk-target-nvme.x86_64-latest.xml new file mode 100644 index 000000000000..2a46300e6d36 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.xml @@ -0,0 +1,53 @@ + + bar + 00010203-0405-4607-8809-0a0b0c0d0e0f + 219136 + 219136 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + + + + + abcdefgh +
+ + + abcdefgh +
+ + + ASDF + +
+ + +
+ + + + +