From nobody Sun Feb 8 16:06:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677853776; cv=none; d=zohomail.com; s=zohoarc; b=AeHsNvXH0E25gzZr8nA/LAi7COSpQrJffr8Mel6jQCeh5UHnDUYcKv3zwVO5oh47+9rSA3jQQjXNkHB7cP1nR8VU9DN8RWHMJo6IT9HPRIX3/0TjMTUHMm7wXckt8ajM/vPKNftu7M4v75khlCFeeBnYN6iypeVm0due7aU3xFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677853776; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MCCtzV/ppotCTdHMp/h6FVOK+7z7nwASopKAF3lELxc=; b=IlpaguxSxUneKKUZsqlDCVWnvqto40cd9fBJzI1GbhxLLsleQsz/0GJGtXggXVlUUDaOfNwq7mn9FEZFDqch3M+ciSZIpA5rcZjv5VWcihzC6jr9Wcjs4iWVDMHR4/GIISvxets06qtkLeHqgKFH3/7QeQ0ZHiEd7XmDi1KGwRk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1677853776685317.8753061800843; Fri, 3 Mar 2023 06:29:36 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-410-AdfnOjoSOwKu6JpItx7YKg-1; Fri, 03 Mar 2023 09:29:30 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7717B38041D3; Fri, 3 Mar 2023 14:29:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 620B440CF8EF; Fri, 3 Mar 2023 14:29:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A519F1943BC3; Fri, 3 Mar 2023 14:28:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6C81A1942B57 for ; Fri, 3 Mar 2023 14:28:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 615E94011AC8; Fri, 3 Mar 2023 14:28:28 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id DAF4C403570D for ; Fri, 3 Mar 2023 14:28:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677853775; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=MCCtzV/ppotCTdHMp/h6FVOK+7z7nwASopKAF3lELxc=; b=fut7mMnA8xwULmJ0QTeliYzqleMwRMv74TYlWCANmNtyZPCfIrF/HwAM/e63Oaop5z94WI +5ntdjOEik7MRmBKAgbS/xCyVQPHTGARgqr1s4khaU2OW4WILseRP81AYM8FtWhu1P18tY YwRi+hSs7LQlTlwf27YZs3bR45hm/O4= X-MC-Unique: AdfnOjoSOwKu6JpItx7YKg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 23/31] qemuxml2(argv|xml)test: Convert last fake-caps riscv64 tests to real caps Date: Fri, 3 Mar 2023 15:27:57 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677853778962100003 Content-Type: text/plain; charset="utf-8" Preserve testing of the MMIO use case in case when GPEX is complied out of qemu. Signed-off-by: Peter Krempa --- ...s =3D> riscv64-virt-pci.riscv64-latest.args} | 8 +++++--- ....args =3D> riscv64-virt.riscv64-latest.args} | 10 ++++++---- tests/qemuxml2argvtest.c | 10 ++++++---- ...ml =3D> riscv64-virt-pci.riscv64-latest.xml} | 0 ...rt.xml =3D> riscv64-virt.riscv64-latest.xml} | 20 +++++++++++++++++-- tests/qemuxml2xmltest.c | 6 ++---- 6 files changed, 37 insertions(+), 17 deletions(-) rename tests/qemuxml2argvdata/{riscv64-virt-pci.args =3D> riscv64-virt-pci= .riscv64-latest.args} (67%) rename tests/qemuxml2argvdata/{riscv64-virt.args =3D> riscv64-virt.riscv64= -latest.args} (67%) rename tests/qemuxml2xmloutdata/{riscv64-virt-pci.xml =3D> riscv64-virt-pc= i.riscv64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{riscv64-virt.xml =3D> riscv64-virt.riscv6= 4-latest.xml} (53%) diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args b/tests/qemuxml2a= rgvdata/riscv64-virt-pci.riscv64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/riscv64-virt-pci.args rename to tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args index d981bfe2c7..b6c16591ee 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-pci.args +++ b/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args @@ -9,10 +9,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-riscv64/.config \ /usr/bin/qemu-system-riscv64 \ -name guest=3Driscv64,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-risc= v64/master-key.aes \ --machine virt,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-riscv64/master-key.aes"}' \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram \ -accel tcg \ -m 2048 \ +-object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":2147483648}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid fd65fc03-8838-4c4d-9d8d-395802488790 \ @@ -28,6 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-riscv64/.config \ -append root=3D/dev/vda \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/riscv64.qc= ow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpcie.0,addr=3D0x1,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pcie.0","addr":"0x1","drive":"l= ibvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvd= ata/riscv64-virt.riscv64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/riscv64-virt.args rename to tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args index 05f8752120..3a770d77ff 100644 --- a/tests/qemuxml2argvdata/riscv64-virt.args +++ b/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args @@ -9,10 +9,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-riscv64/.config \ /usr/bin/qemu-system-riscv64 \ -name guest=3Driscv64,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-risc= v64/master-key.aes \ --machine virt,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-riscv64/master-key.aes"}' \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram \ -accel tcg \ -m 2048 \ +-object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":2147483648}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid fd65fc03-8838-4c4d-9d8d-395802488790 \ @@ -28,9 +29,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-riscv64/.config \ -append 'console=3DttyS0 ro root=3D/dev/vda' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/stage4-dis= k.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,booti= ndex=3D1 \ +-device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"vi= rtio-disk0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-device,id=3Dballoon0 \ +-device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 90d96f2109..db846c1ea4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2911,10 +2911,12 @@ mymain(void) DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages"); DO_TEST_CAPS_LATEST_PARSE_ERROR("vhost-user-fs-readonly"); - DO_TEST("riscv64-virt", - QEMU_CAPS_DEVICE_VIRTIO_MMIO); - DO_TEST("riscv64-virt-pci", - QEMU_CAPS_OBJECT_GPEX); + /* The generic pcie bridge emulation device can be compiled out of qem= u. */ + DO_TEST_CAPS_ARCH_LATEST_FULL("riscv64-virt", "riscv64", + ARG_QEMU_CAPS_DEL, + QEMU_CAPS_OBJECT_GPEX, + QEMU_CAPS_LAST); + DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-pci", "riscv64"); DO_TEST_CAPS_LATEST("virtio-transitional"); DO_TEST_CAPS_LATEST("virtio-non-transitional"); diff --git a/tests/qemuxml2xmloutdata/riscv64-virt-pci.xml b/tests/qemuxml2= xmloutdata/riscv64-virt-pci.riscv64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/riscv64-virt-pci.xml rename to tests/qemuxml2xmloutdata/riscv64-virt-pci.riscv64-latest.xml diff --git a/tests/qemuxml2xmloutdata/riscv64-virt.xml b/tests/qemuxml2xmlo= utdata/riscv64-virt.riscv64-latest.xml similarity index 53% rename from tests/qemuxml2xmloutdata/riscv64-virt.xml rename to tests/qemuxml2xmloutdata/riscv64-virt.riscv64-latest.xml index 8a5c5dd985..9868f3ae12 100644 --- a/tests/qemuxml2xmloutdata/riscv64-virt.xml +++ b/tests/qemuxml2xmloutdata/riscv64-virt.riscv64-latest.xml @@ -20,8 +20,24 @@ -
+
+ + + + +
+ + + + +
+ + + + +
+ @@ -32,7 +48,7 @@