From nobody Fri Dec 12 15:14:29 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=1761724873; cv=none; d=zohomail.com; s=zohoarc; b=aH+7midNiF8NFdP3utleEye3yrWSkEvrjOP4ahfMPMVycDbNu2I3L37Q38MQIOvZdAEYUQxsdhRqioSPq162SrAMEQRBJRNNDTrY30TuOFcLwWF+Fk8pBoK0r5sPoR/iERnv713mZsSu+kYkDbPlciUtyqH0fJ0SyWfOQBnerRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761724873; h=Content-Type:Content-Transfer-Encoding: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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=FMGMlUKbDfjOsOUPrlstHgVsSSWDlBmJ1b0Z+HY+l88=; b=X6jkXSVp84ppoTW21jJlzfJyYnFHHovEZrYRnGBxzuw0lqYXLRFOxjfLKcNg4QgFQ636urbjboJPAyOR5FNeULc/2xJRQHNH4Fz+A7I5I9v8NMV4KFy1Jkghs4lf6tK6vwZfFWMtYHFHUP3fvROVvAtPpTlpArGleCFiNiBJm1U= 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 1761724873942347.7020547779049; Wed, 29 Oct 2025 01:01:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 0610E419A7; Wed, 29 Oct 2025 04:01:12 -0400 (EDT) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 764B541C25; Wed, 29 Oct 2025 03:56:41 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E6C3441851; Wed, 29 Oct 2025 03:53:27 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 273B941850 for ; Wed, 29 Oct 2025 03:53:27 -0400 (EDT) Received: from mx-prod-mc-04.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-214-OKZnXvN1PE2SoXvSb6yEHw-1; Wed, 29 Oct 2025 03:53:24 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 04F8219541BF for ; Wed, 29 Oct 2025 07:53:24 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4EEEF180057E for ; Wed, 29 Oct 2025 07:53:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761724406; 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=FMGMlUKbDfjOsOUPrlstHgVsSSWDlBmJ1b0Z+HY+l88=; b=B+aAUbaGv6QFPGic3hFXrIjmlPc/Hj+M6oBzqoTD4Yzn1dqCYJDqTRPTca0DS+59Y6Wahh d6YYJDpQGZ+APowRPd0ncEEzSvWmXi9iVlFy29qKdJGtJPxT2RNCoPd64saEFxT4gTuHvc WkvTZqpgTR0Bn1kWLaBQL4J1U6Svomg= X-MC-Unique: OKZnXvN1PE2SoXvSb6yEHw-1 X-Mimecast-MFC-AGG-ID: OKZnXvN1PE2SoXvSb6yEHw_1761724404 To: devel@lists.libvirt.org Subject: [PATCH 6/7] qemu_command: Generate virtio options for memory device Date: Wed, 29 Oct 2025 08:53:06 +0100 Message-ID: <4a59c4f06183f994dafe23f7dc09cbaf66f5557e.1761724370.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9qvZ-IiC3Hn7PgthjjV0mcVUPA9hvJFTO_ILQ_sWRC4_1761724404 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: AGPSGLO7RRGIRP74575ZYNI3FKE3O5A6 X-Message-ID-Hash: AGPSGLO7RRGIRP74575ZYNI3FKE3O5A6 X-MailFrom: mprivozn@redhat.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 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: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1761724880076158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Thanks to previous refactors (namely v11.1.0-rc1~142) this is trivial. There's all the infrastructure needed to generate virtio options onto cmd line, all that's left to do is set a pointer to appropriate struct member. Resolves: https://issues.redhat.com/browse/RHEL-7493 Signed-off-by: Michal Privoznik Reviewed-by: Jiri Denemark --- src/qemu/qemu_command.c | 2 ++ tests/qemuxmlconfdata/virtio-options.x86_64-latest.args | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fcf5fc1935..c538a9fb2f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -983,9 +983,11 @@ qemuBuildVirtioDevGetConfigDev(const virDomainDeviceDe= f *device, switch (device->data.memory->model) { case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: *baseName =3D "virtio-pmem"; + *virtioOptions =3D device->data.memory->virtio; break; case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: *baseName =3D "virtio-mem"; + *virtioOptions =3D device->data.memory->virtio; break; case VIR_DOMAIN_MEMORY_MODEL_DIMM: case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: diff --git a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args b/test= s/qemuxmlconfdata/virtio-options.x86_64-latest.args index f2b9ee2afe..0f65cefd57 100644 --- a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-scsi-pci","iommu_platform":true,"ats":true,"pac= ked":true,"page-per-vq":true,"id":"scsi0","bus":"pci.0","addr":"0x8"}' \ -device '{"driver":"virtio-serial-pci","iommu_platform":true,"ats":true,"p= acked":true,"page-per-vq":true,"id":"virtio-serial0","bus":"pci.0","addr":"= 0x9"}' \ -object '{"qom-type":"memory-backend-file","id":"memvirtiomem0","mem-path"= :"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":21474= 83648,"host-nodes":[1,2,3],"policy":"bind"}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"request= ed-size":1073741824,"memdev":"memvirtiomem0","prealloc":true,"memaddr":5637= 144576,"dynamic-memslots":true,"id":"virtiomem0","bus":"pci.0","addr":"0x5"= }' \ +-device '{"driver":"virtio-mem-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":true,"node":0,"block-size":2097152,"requested-size":= 1073741824,"memdev":"memvirtiomem0","prealloc":true,"memaddr":5637144576,"d= ynamic-memslots":true,"id":"virtiomem0","bus":"pci.0","addr":"0x5"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"virtio-blk-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":true,"bus":"pci.0","addr":"0xa","drive":"libvirt-1-s= torage","id":"virtio-disk0","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --=20 2.51.0