From nobody Mon Feb 9 10:32:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1680262027; cv=none; d=zohomail.com; s=zohoarc; b=NnextNkYpEzxDpq6r43RWULwL5a4yTW9LoVXOADqP2Akd0tbbyPdPXkkRWjXl8uDeO83w7hEOVonPG+QnkItBs4PqJsEpv2Vg6i+c/rLNdTnWc/chz0mLr4YWEhWW62a5II7fMqdu76g7Sigq647UErb+fBMXzgfnoLGR5vHmwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680262027; 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=/nCsYmwF+BCYBU4HnXqwUNn/SF6O1rFSDYirliUVYWU=; b=dPh985lvy1V2kiY/0AQ5u942GRm9pn6qEaE+veuiATPhu6ZsKQgAiLjzanN6hd/qJrCoAtN2PvGljchcLd0C7Ewti24YgWH2WJMQIxvEbNO/SmX+OK+xBFxEQ6LDOS4ksSoLZPNDCJNV0mFmgNWqGa77X5oylfX56bUHeaZ31EM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1680262027123264.65695267068565; Fri, 31 Mar 2023 04:27:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-497-Rj4VI2XCOqyBmdVxOMyIyw-1; Fri, 31 Mar 2023 07:26:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A5BDA100DEB8; Fri, 31 Mar 2023 11:26:32 +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 8C79B14171B6; Fri, 31 Mar 2023 11:26:32 +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 6ECB81946A4A; Fri, 31 Mar 2023 11:26:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1CF3A19466DF for ; Fri, 31 Mar 2023 11:26:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E4F67112131B; Fri, 31 Mar 2023 11:26:29 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D4B41121319 for ; Fri, 31 Mar 2023 11:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680262026; 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=/nCsYmwF+BCYBU4HnXqwUNn/SF6O1rFSDYirliUVYWU=; b=I8UkEfW6zciRayHDbPniWoWQmc2nOSlLJhromRWK62B1fX612MYR/pCPC3r8pJJCICpJht v5Bz+Cs1TmRmqXNwn86bPWr/XeFyRDoLH8UifKw3YYX3NQzPpOQOFYo2H/6yf87Tbb+38d rU5bv1nfD4BvoM2wKgayzO53vchaoKc= X-MC-Unique: Rj4VI2XCOqyBmdVxOMyIyw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/21] qemuxml2argvtest: Update 'aarch64-virtio-pci-manual-addresses' case Date: Fri, 31 Mar 2023 13:26:06 +0200 Message-Id: <20adacf8168fa35fbc838cd38e2d117a26ae12d9.1680260939.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.7 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: 1680262028417100005 Content-Type: text/plain; charset="utf-8" With all supported qemu versions we'll pick PCIe to use for the implicit address busses (those lacking an explicit controller) and thus the addresses must reflect that. Update the test to add the new flags, and fix the addresses. Additionally add a real-caps version of the test. Signed-off-by: Peter Krempa --- ...o-pci-manual-addresses.aarch64-latest.args | 49 ++++++++++++ .../aarch64-virtio-pci-manual-addresses.args | 10 ++- .../aarch64-virtio-pci-manual-addresses.xml | 4 +- tests/qemuxml2argvtest.c | 4 + ...io-pci-manual-addresses.aarch64-latest.xml | 75 +++++++++++++++++++ .../aarch64-virtio-pci-manual-addresses.xml | 24 ++++-- tests/qemuxml2xmltest.c | 4 + 7 files changed, 157 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addres= ses.aarch64-latest.args create mode 100644 tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addr= esses.aarch64-latest.xml diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.aar= ch64-latest.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-address= es.aarch64-latest.args new file mode 100644 index 0000000000..dcf5d187fa --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.aarch64-la= test.args @@ -0,0 +1,49 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-accel tcg \ +-cpu cortex-a53 \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-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 \ +-no-acpi \ +-boot strict=3Don \ +-kernel /aarch64.kernel \ +-initrd /aarch64.initrd \ +-append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ +-dtb /aarch64.dtb \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ +-device '{"driver":"pcie-root-port","port":16,"chassis":3,"id":"pci.3","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"pcie-root-port","port":18,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.4","addr":"0x= 0"}' \ +-blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt= -1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-1-format","id":"scsi0-0= -0-0","bootindex":1}' \ +-netdev user,id=3Dhostnet0 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.3","addr":"0x0"}' \ +-netdev user,id=3Dhostnet1 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:09:a4:38","bus":"pci.5","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.arg= s b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args index 65c2b3b706..bdc5e7b798 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args @@ -32,14 +32,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64test/.config \ -dtb /aarch64.dtb \ -device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1 \ -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device pci-bridge,chassis_nr=3D3,id=3Dpci.3,bus=3Dpci.1,addr=3D0x1 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.3,addr=3D0x1 \ +-device pcie-root-port,port=3D16,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ +-device pcie-root-port,port=3D17,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x2.0x1 \ +-device pcie-root-port,port=3D18,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x2.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.4,addr=3D0x0 \ -blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt= -1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi0-0-0-0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.3,addr=3D0x2 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.3,addr=3D0x0 \ -netdev user,id=3Dhostnet1 \ --device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:09:a4:38= ,bus=3Dpci.2,addr=3D0x1 \ +-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:09:a4:38= ,bus=3Dpci.5,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml= b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml index fee32588f7..d1c3ccc70e 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml @@ -41,12 +41,12 @@
-
+
-
+
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index faa5077112..7b2ae88658 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2358,11 +2358,15 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64"); /* Example of using virtio-pci with no explicit PCI controller but with manual PCI addresses */ + DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch= 64"); DO_TEST("aarch64-virtio-pci-manual-addresses", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, + QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, + QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, + QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-video-virtio-gpu-pci", diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.a= arch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addr= esses.aarch64-latest.xml new file mode 100644 index 0000000000..63c2636f5e --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.aarch64-= latest.xml @@ -0,0 +1,75 @@ + + aarch64test + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1048576 + 1 + + hvm + /aarch64.kernel + /aarch64.initrd + earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo= twait + /aarch64.dtb + + + + + + + + + cortex-a53 + + + destroy + restart + restart + + /usr/bin/qemu-system-aarch64 + + + + +
+ + + + +
+ + + + +
+ + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ +