From nobody Tue Sep 9 03:13:56 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1737721391183724.0130744127531; Fri, 24 Jan 2025 04:23:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2077B14D7; Fri, 24 Jan 2025 07:23:10 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D99F01560; Fri, 24 Jan 2025 07:21:59 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5F7B013FD; Fri, 24 Jan 2025 07:21:54 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 D97751397 for ; Fri, 24 Jan 2025 07:21:53 -0500 (EST) 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-153-6ktbWtYKN9C1wjTVMFAc8Q-1; Fri, 24 Jan 2025 07:21:52 -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 2EF8619560B1 for ; Fri, 24 Jan 2025 12:21:50 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 439D81800358; Fri, 24 Jan 2025 12:21:49 +0000 (UTC) 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, HEADER_FROM_DIFFERENT_DOMAINS,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,T_SCC_BODY_TEXT_LINE 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=1737721313; 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=YHSZcAxaQuwg5XzzSyvEi3fvx6RErxBEpYGM30EMat8=; b=hh6eGAjkoiKHCkFVn57djEvR97eW1+tKv0o34jo43TqF/6uJSykt9FHAmECSyw3OV5In/8 pcHLkpNn232pdqUKBGxyXFZ6Q4GTo8gI5Y0y72HXr/SmRb2ZRkwIYgFTnYr4I/DlazlHh/ jNlpInDhtlaTHA+p5DrC46Wvt41zLKs= X-MC-Unique: 6ktbWtYKN9C1wjTVMFAc8Q-1 X-Mimecast-MFC-AGG-ID: 6ktbWtYKN9C1wjTVMFAc8Q From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 2/8] qemu_command: Use qemuBuildVirtioDevProps() to build cmd line for virtio-mem and virtio-pmem Date: Fri, 24 Jan 2025 13:21:36 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: DDl7d7HnRnyZeA5vtXxVXLoDBRavCJ0VbnzRCe7748Q_1737721310 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: KVFSNTFVOR7TPU2D66S7QIOGXTJQ57S4 X-Message-ID-Hash: KVFSNTFVOR7TPU2D66S7QIOGXTJQ57S4 X-MailFrom: mprivozn@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 CC: david@redhat.com 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1737721392777019100 Content-Type: text/plain; charset="utf-8"; x-default="true" Both, virtio-mem and virtio-pmem devices follow traditional QEMU naming convention: their suffix determines what bus they live on. For instance, virtio-mem-pci, virtio-mem-ccw, virtio-pmem-pci. We already have a function that constructs device name following this convention: qemuBuildVirtioDevGetConfigDev(). While there's no virtio-pmem-ccw device yet, the function can still be used. Another advantage of using the function is - it'll be easier in future when we want to configure various virtio aspects of memory devices (like ats, iommu_platform, etc.). Signed-off-by: Michal Privoznik Reviewed-by: Boris Fiuczynski --- src/qemu/qemu_command.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1f28de6194..f10d0ffce5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -959,6 +959,23 @@ qemuBuildVirtioDevGetConfigDev(const virDomainDeviceDe= f *device, break; } =20 + case VIR_DOMAIN_DEVICE_MEMORY: + switch (device->data.memory->model) { + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: + *baseName =3D "virtio-pmem"; + break; + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: + *baseName =3D "virtio-mem"; + break; + case VIR_DOMAIN_MEMORY_MODEL_DIMM: + case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: + case VIR_DOMAIN_MEMORY_MODEL_NONE: + case VIR_DOMAIN_MEMORY_MODEL_LAST: + break; + } + break; + case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_WATCHDOG: case VIR_DOMAIN_DEVICE_GRAPHICS: @@ -971,7 +988,6 @@ qemuBuildVirtioDevGetConfigDev(const virDomainDeviceDef= *device, case VIR_DOMAIN_DEVICE_SHMEM: case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: - case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_IOMMU: case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_PSTORE: @@ -3479,12 +3495,16 @@ qemuBuildMemoryDeviceProps(virQEMUDriverConfig *cfg, break; =20 case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: - device =3D "virtio-pmem-pci"; + /* Deliberately not setting @device. */ + if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_MEMORY, = mem, priv->qemuCaps))) + return NULL; address =3D mem->target.virtio_pmem.address; break; =20 case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: - device =3D "virtio-mem-pci"; + /* Deliberately not setting @device. */ + if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_MEMORY, = mem, priv->qemuCaps))) + return NULL; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI= _PREALLOC) && qemuBuildMemoryGetPagesize(cfg, def, mem, NULL, NULL, NULL, &p= realloc) < 0) @@ -3506,7 +3526,7 @@ qemuBuildMemoryDeviceProps(virQEMUDriverConfig *cfg, } =20 if (virJSONValueObjectAdd(&props, - "s:driver", device, + "S:driver", device, "k:node", mem->targetNode, "P:label-size", labelsize * 1024, "P:block-size", blocksize * 1024, --=20 2.45.2