From nobody Sun Feb 8 13:10:42 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=1677853798; cv=none; d=zohomail.com; s=zohoarc; b=Pf/elmtrw10E8gmt+rjpze6P4d1TWkYotb27dzPtcx7pCFIxHTo7e7LOSlTaG46fzxxT/MvxVbOQ8sf4xvcuxfjBCTRzpuItVC//bLJCJY+QTYS/5jo/qdLacO25DZ2ctjIpmDBIdKFTPoViT76STsQBkysXF8ypGprY6Tu/97k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677853798; 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=vP6jicBkNg0Tf3N2xolUtvUgppjcLyUUwrWzm2bp0BM=; b=NZtIyep35G+o+zVkbYpLxAqaAG9fYYe3KQ+MOSfwUAD6ItuC0vAzM9rCzqxVaNsGaQmU0LgIyiwxFdEflnsWILTmcD6xPwk+OswRdi/WDjPj3s3qGgAFgRPOcEm7GrdGDiHe/SP2vg2aFanmHhFXg+lQPt2FvsZO4UiHihouGQQ= 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 1677853798489203.2129343547573; Fri, 3 Mar 2023 06:29:58 -0800 (PST) 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-49-Fa2rNMqcMRW_6gvh53y4Rg-1; Fri, 03 Mar 2023 09:29:51 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB6C0802C18; Fri, 3 Mar 2023 14:29:46 +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 D7BC31121318; Fri, 3 Mar 2023 14:29:46 +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 4E75C1942B79; Fri, 3 Mar 2023 14:28:41 +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 42917194B0E0 for ; Fri, 3 Mar 2023 14:28:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 37D5F4011AC8; Fri, 3 Mar 2023 14:28:39 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id B41774097544 for ; Fri, 3 Mar 2023 14:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677853797; 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=vP6jicBkNg0Tf3N2xolUtvUgppjcLyUUwrWzm2bp0BM=; b=bbSres+8GwGi2rtrmhV0m7uybGWhtPNPsuv0PhgqAoBd1nRckj/efN147jZ9LaLOuLa4c8 BDe+gK9rwlZtNEw352KrT9Fv1IjMIf9eJGlo+e0x6xeOEVzd/zt6XhMdKGSuahtXh8zaTZ FRuSW4A1LQzrLr8KFhuKxfIbsQKBwiQ= X-MC-Unique: Fa2rNMqcMRW_6gvh53y4Rg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 30/31] tests: qemuxml2argvdata: Port 'qemu-system-arm' cases with fake tests to 'qemu-system-aarch64' Date: Fri, 3 Mar 2023 15:28:04 +0100 Message-Id: <086e5159b9daee089246f4cd33a744d64aa2a147.1677853487.git.pkrempa@redhat.com> 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.3 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: 1677853799230100001 Content-Type: text/plain; charset="utf-8" 'qemu-system-aarch64' is superset of the soon to be deprecated 'qemu-system-arm' binary. We can move over all of our fake-caps tests to real caps on aarch64. Signed-off-by: Peter Krempa --- ... aarch64-kvm-32-on-64.aarch64-latest.args} | 15 ++++-- .../qemuxml2argvdata/aarch64-kvm-32-on-64.xml | 2 +- ... arm-vexpressa9-basic.aarch64-latest.args} | 9 ++-- .../qemuxml2argvdata/arm-vexpressa9-basic.xml | 2 +- ...arm-vexpressa9-nodevs.aarch64-latest.args} | 9 ++-- .../arm-vexpressa9-nodevs.xml | 2 +- ...arm-vexpressa9-virtio.aarch64-latest.args} | 23 ++++---- .../arm-vexpressa9-virtio.xml | 2 +- .../arm-virt-virtio.aarch64-latest.args | 54 +++++++++++++++++++ tests/qemuxml2argvdata/arm-virt-virtio.args | 45 ---------------- tests/qemuxml2argvdata/arm-virt-virtio.xml | 2 +- tests/qemuxml2argvtest.c | 18 ++----- 12 files changed, 99 insertions(+), 84 deletions(-) rename tests/qemuxml2argvdata/{aarch64-kvm-32-on-64.args =3D> aarch64-kvm-= 32-on-64.aarch64-latest.args} (53%) rename tests/qemuxml2argvdata/{arm-vexpressa9-basic.args =3D> arm-vexpress= a9-basic.aarch64-latest.args} (71%) rename tests/qemuxml2argvdata/{arm-vexpressa9-nodevs.args =3D> arm-vexpres= sa9-nodevs.aarch64-latest.args} (65%) rename tests/qemuxml2argvdata/{arm-vexpressa9-virtio.args =3D> arm-vexpres= sa9-virtio.aarch64-latest.args} (54%) create mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.a= rgs delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.args diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args b/tests/qemux= ml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args similarity index 53% rename from tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args rename to tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args index 0b22efecd2..7bdb6aaf44 100644 --- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args @@ -6,14 +6,15 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-armtest/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-armtest/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -/usr/bin/qemu-system-arm \ +/usr/bin/qemu-system-aarch64 \ -name guest=3Darmtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-armt= est/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-armtest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host,aarch64=3Doff \ -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-ef08be936e6a \ @@ -28,12 +29,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -kernel /arm.kernel \ -initrd /arm.initrd \ -append 'console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwait physmap.en= abled=3D0' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ -blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ -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-pci","bus":"pci.2","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -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-kvm-32-on-64.xml b/tests/qemuxm= l2argvdata/aarch64-kvm-32-on-64.xml index 0df5e4c926..c145b5f246 100644 --- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.xml +++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.xml @@ -21,7 +21,7 @@ restart restart - /usr/bin/qemu-system-arm + /usr/bin/qemu-system-aarch64 diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args b/tests/qemux= ml2argvdata/arm-vexpressa9-basic.aarch64-latest.args similarity index 71% rename from tests/qemuxml2argvdata/arm-vexpressa9-basic.args rename to tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.args index b175c67dcd..37ad2f0910 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.args @@ -6,13 +6,15 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-armtest/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-armtest/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -/usr/bin/qemu-system-arm \ +/usr/bin/qemu-system-aarch64 \ -name guest=3Darmtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-armt= est/master-key.aes \ --machine vexpress-a9,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-armtest/master-key.aes"}' \ +-machine vexpress-a9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dvexp= ress.highmem \ -accel tcg \ +-cpu cortex-a9 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1= 073741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \ @@ -35,4 +37,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml b/tests/qemuxm= l2argvdata/arm-vexpressa9-basic.xml index ec9374f88b..80efab2c49 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml +++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml @@ -21,7 +21,7 @@ restart restart - /usr/bin/qemu-system-arm + /usr/bin/qemu-system-aarch64 diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args b/tests/qemu= xml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args similarity index 65% rename from tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args rename to tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args index f9638c5c80..a8dbc2b033 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args @@ -6,13 +6,15 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-armtest/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-armtest/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -/usr/bin/qemu-system-arm \ +/usr/bin/qemu-system-aarch64 \ -name guest=3Darmtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-armt= est/master-key.aes \ --machine vexpress-a9,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-armtest/master-key.aes"}' \ +-machine vexpress-a9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dvexp= ress.highmem \ -accel tcg \ +-cpu cortex-a9 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1= 073741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \ @@ -30,4 +32,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -dtb /arm.dtb \ -usb \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml b/tests/qemux= ml2argvdata/arm-vexpressa9-nodevs.xml index 3f318c8bb2..44ee27a659 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml +++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml @@ -21,6 +21,6 @@ restart restart - /usr/bin/qemu-system-arm + /usr/bin/qemu-system-aarch64 diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args b/tests/qemu= xml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args similarity index 54% rename from tests/qemuxml2argvdata/arm-vexpressa9-virtio.args rename to tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args index bb2097bd48..6f53f01300 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args @@ -6,13 +6,15 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-armtest/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-armtest/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -/usr/bin/qemu-system-arm \ +/usr/bin/qemu-system-aarch64 \ -name guest=3Darmtest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-armt= est/master-key.aes \ --machine vexpress-a9,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-armtest/master-key.aes"}' \ +-machine vexpress-a9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dvexp= ress.highmem \ -accel tcg \ +-cpu cortex-a9 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1= 073741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \ @@ -28,19 +30,20 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -initrd /arm.initrd \ -append 'console=3DttyAMA0,115200n8 rw root=3D/dev/vda3 rootwait physmap.e= nabled=3D0' \ -dtb /arm.dtb \ --device virtio-serial-device,id=3Dvirtio-serial0 \ +-device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \ -usb \ -blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ -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}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ +-device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","ma= c":"52:54:00:09:a4:37"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -chardev pty,id=3Dcharconsole1 \ --device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \ +-device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-device,id=3Dballoon0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ --device virtio-rng-device,rng=3Dobjrng0,id=3Drng0 \ +-device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ +-device '{"driver":"virtio-rng-device","rng":"objrng0","id":"rng0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml b/tests/qemux= ml2argvdata/arm-vexpressa9-virtio.xml index 2acf3c9680..b498d1761b 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml +++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml @@ -21,7 +21,7 @@ restart restart - /usr/bin/qemu-system-arm + /usr/bin/qemu-system-aarch64 diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args b/t= ests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args new file mode 100644 index 0000000000..970644e10c --- /dev/null +++ b/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args @@ -0,0 +1,54 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-armtest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-armtest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-armtest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Darmtest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-armtest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-accel tcg \ +-cpu cortex-a15 \ +-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-ef08be936e6a \ +-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 \ +-kernel /arm.kernel \ +-initrd /arm.initrd \ +-append 'console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwait physmap.en= abled=3D0' \ +-dtb /arm.dtb \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ +-device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.2"= ,"addr":"0x0"}' \ +-blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-netdev user,id=3Dhostnet0 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 \ +-chardev pty,id=3Dcharconsole1 \ +-device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x0"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .5","addr":"0x0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args b/tests/qemuxml2ar= gvdata/arm-virt-virtio.args deleted file mode 100644 index be24dc0e71..0000000000 --- a/tests/qemuxml2argvdata/arm-virt-virtio.args +++ /dev/null @@ -1,45 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-armtest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-armtest/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-armtest/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -/usr/bin/qemu-system-arm \ --name guest=3Darmtest,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-armt= est/master-key.aes \ --machine virt,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 1024 \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \ --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 \ --kernel /arm.kernel \ --initrd /arm.initrd \ --append 'console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwait physmap.en= abled=3D0' \ --dtb /arm.dtb \ --device virtio-serial-device,id=3Dvirtio-serial0 \ --blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ --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 \ --netdev user,id=3Dhostnet0 \ --device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ --chardev pty,id=3Dcharserial0 \ --serial chardev:charserial0 \ --chardev pty,id=3Dcharconsole1 \ --device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-device,id=3Dballoon0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ --device virtio-rng-device,rng=3Dobjrng0,id=3Drng0 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.xml b/tests/qemuxml2arg= vdata/arm-virt-virtio.xml index 913c96eef0..39620070bd 100644 --- a/tests/qemuxml2argvdata/arm-virt-virtio.xml +++ b/tests/qemuxml2argvdata/arm-virt-virtio.xml @@ -21,7 +21,7 @@ restart restart - /usr/bin/qemu-system-arm + /usr/bin/qemu-system-aarch64 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 33dcb247de..1f9a2b4d96 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2450,15 +2450,10 @@ mymain(void) QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_QXL); - DO_TEST_NOCAPS("arm-vexpressa9-nodevs"); - DO_TEST_NOCAPS("arm-vexpressa9-basic"); - DO_TEST("arm-vexpressa9-virtio", - QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("arm-virt-virtio", - QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_DEVICE_PL011, - QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-nodevs", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-basic", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-virtio", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("arm-virt-virtio", "aarch64"); DO_TEST("aarch64-virt-virtio", QEMU_CAPS_DEVICE_VIRTIO_MMIO, @@ -2576,10 +2571,7 @@ mymain(void) DO_TEST_PARSE_ERROR("aarch64-gic-not-arm", QEMU_CAPS_KVM, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST("aarch64-kvm-32-on-64", - QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_DEVICE_PL011, - QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST("aarch64-kvm-32-on-64", "aarch64"); DO_TEST("aarch64-pci-serial", QEMU_CAPS_DEVICE_PCI_SERIAL, QEMU_CAPS_OBJECT_GPEX, --=20 2.39.2