From nobody Mon Feb 9 16:21:57 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=1680262029; cv=none; d=zohomail.com; s=zohoarc; b=FvGS1N5jBPASZX76YvoccvllCb1rHyhsxniGyG6RMojMqwfv3vy7A092ia1Dw6yQHBNBlJno1/VrqOdnN+fBnYd7XId0RTzwynRD6ahm4YisxQVAhzSDSXdfR0jQpWoo0IrSXixfIeCKcaHFohn9Rjw+oANM7pT3KcwFIHGsN9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680262029; 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=JWXdn3VX+OW8wsw54Oz98q9JPWxGIX0WgQEAaReLb98=; b=ETDdI3igy3WqfjsuZ3s9gjCJCodOT1WgbU8GxtryPnAWuEjZyse440MPwHeEMESobiykCFP3sugKZ/VDYgO8EpkxZMh3ZCUEwQ7PBN4mvDnGNbR4QHRDBcMYLw8xbVuxTcCzHcCY8SD1ogvHdxCXz6wC4IOFtTcNDlpOEEpCWw4= 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 1680262029366253.3553559565272; Fri, 31 Mar 2023 04:27:09 -0700 (PDT) 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-471-nTZovXp1P9KIEZUblpu5xQ-1; Fri, 31 Mar 2023 07:26:43 -0400 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 EA49038601B5; Fri, 31 Mar 2023 11:26:37 +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 CD0851121315; Fri, 31 Mar 2023 11:26:37 +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 AEB5E1946A43; Fri, 31 Mar 2023 11:26:37 +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 BBB6019472C0 for ; Fri, 31 Mar 2023 11:26:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 84CBC1121315; Fri, 31 Mar 2023 11:26:33 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B8861121319 for ; Fri, 31 Mar 2023 11:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680262028; 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=JWXdn3VX+OW8wsw54Oz98q9JPWxGIX0WgQEAaReLb98=; b=TFgIZPZ9qeE1FcaRRX2YuEf7Lr8nggNc1zRKm9yUb1KYqh0gPkjrJMiIZzQZOllOI4lyQE M6k5mW/1qmQS76nzRaMwvLU55uqUV4lPFdEbS0bfw7vTsZVrdWmOyh61UGM50qZh8s23+p ppZszvvPZl6Lf9oUVy3fyXztnHvGzY8= X-MC-Unique: nTZovXp1P9KIEZUblpu5xQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/21] qemuxml2argvtest: Modernize the rest of 'aarch64' cases Date: Fri, 31 Mar 2023 13:26:09 +0200 Message-Id: <7887a4a753154816234d5d1010f8228f7fb7d0a2.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.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: 1680262030506100011 Content-Type: text/plain; charset="utf-8" Use real capabilities for them. Signed-off-by: Peter Krempa --- ...h64-aavmf-virtio-mmio.aarch64-latest.args} | 20 +++++----- ...rch64-cpu-passthrough.aarch64-latest.args} | 10 +++-- ...=3D> aarch64-pci-serial.aarch64-latest.args} | 15 ++++--- ...arch64-tpm-wrong-model.aarch64-latest.err} | 0 ...arch64-traditional-pci.aarch64-latest.args | 37 +++++++++++++++++ .../aarch64-traditional-pci.args | 34 ---------------- ...aarch64-video-default.aarch64-latest.args} | 13 +++--- ...4-video-virtio-gpu-pci.aarch64-latest.args | 37 +++++++++++++++++ .../aarch64-video-virtio-gpu-pci.args | 35 ---------------- ...ch64-virt-default-nic.aarch64-latest.args} | 10 +++-- tests/qemuxml2argvtest.c | 40 ++++--------------- 11 files changed, 123 insertions(+), 128 deletions(-) rename tests/qemuxml2argvdata/{aarch64-aavmf-virtio-mmio.args =3D> aarch64= -aavmf-virtio-mmio.aarch64-latest.args} (57%) rename tests/qemuxml2argvdata/{aarch64-cpu-passthrough.args =3D> aarch64-c= pu-passthrough.aarch64-latest.args} (58%) rename tests/qemuxml2argvdata/{aarch64-pci-serial.args =3D> aarch64-pci-se= rial.aarch64-latest.args} (52%) rename tests/qemuxml2argvdata/{aarch64-tpm-wrong-model.err =3D> aarch64-tp= m-wrong-model.aarch64-latest.err} (100%) create mode 100644 tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-= latest.args delete mode 100644 tests/qemuxml2argvdata/aarch64-traditional-pci.args rename tests/qemuxml2argvdata/{aarch64-video-default.args =3D> aarch64-vid= eo-default.aarch64-latest.args} (54%) create mode 100644 tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aar= ch64-latest.args delete mode 100644 tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args rename tests/qemuxml2argvdata/{aarch64-virt-default-nic.args =3D> aarch64-= virt-default-nic.aarch64-latest.args} (56%) diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/= qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args similarity index 57% rename from tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args rename to tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.a= rgs index c387eb6989..220ed0213a 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-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 \ @@ -30,16 +31,17 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64test/.config \ -initrd /aarch64.initrd \ -append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ -dtb /aarch64.dtb \ --device virtio-serial-device,id=3Dvirtio-serial0 \ +-device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \ -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 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=3Dcharconsole0 \ --device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ +-device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -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/aarch64-cpu-passthrough.args b/tests/qe= muxml2argvdata/aarch64-cpu-passthrough.aarch64-latest.args similarity index 58% rename from tests/qemuxml2argvdata/aarch64-cpu-passthrough.args rename to tests/qemuxml2argvdata/aarch64-cpu-passthrough.aarch64-latest.args index 1b6007f822..09e85ae107 100644 --- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.aarch64-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-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=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -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 \ @@ -26,8 +27,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch6= 4test/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ +-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"}' \ -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 virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,booti= ndex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"li= bvirt-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/aarch64-pci-serial.args b/tests/qemuxml= 2argvdata/aarch64-pci-serial.aarch64-latest.args similarity index 52% rename from tests/qemuxml2argvdata/aarch64-pci-serial.args rename to tests/qemuxml2argvdata/aarch64-pci-serial.aarch64-latest.args index 3bc1435c33..703462ce11 100644 --- a/tests/qemuxml2argvdata/aarch64-pci-serial.args +++ b/tests/qemuxml2argvdata/aarch64-pci-serial.aarch64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-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-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-ef08be936e8b \ @@ -25,11 +27,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64test/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --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 pcie-root-port,port=3D16,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ -add-fd set=3D0,fd=3D1751,opaque=3Dserial0-log \ -chardev pty,id=3Dcharserial0,logfile=3D/dev/fdset/0,logappend=3Don \ --device pci-serial,chardev=3Dcharserial0,id=3Dserial0,bus=3Dpci.2,addr=3D0= x1 \ +-device '{"driver":"pci-serial","chardev":"charserial0","id":"serial0","bu= s":"pci.2","addr":"0x1"}' \ -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-tpm-wrong-model.err b/tests/qem= uxml2argvdata/aarch64-tpm-wrong-model.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-tpm-wrong-model.err rename to tests/qemuxml2argvdata/aarch64-tpm-wrong-model.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-latest.= args b/tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-latest.args new file mode 100644 index 0000000000..4a5c94d951 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/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-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 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-chardev pty,id=3Dcharserial0 \ +-device '{"driver":"pci-serial","chardev":"charserial0","id":"serial0","bu= s":"pci.2","addr":"0x1"}' \ +-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-traditional-pci.args b/tests/qe= muxml2argvdata/aarch64-traditional-pci.args deleted file mode 100644 index ba419aa46d..0000000000 --- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=3Dguest,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,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-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 \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --chardev pty,id=3Dcharserial0 \ --device pci-serial,chardev=3Dcharserial0,id=3Dserial0,bus=3Dpci.2,addr=3D0= x1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args b/tests/qemu= xml2argvdata/aarch64-video-default.aarch64-latest.args similarity index 54% rename from tests/qemuxml2argvdata/aarch64-video-default.args rename to tests/qemuxml2argvdata/aarch64-video-default.aarch64-latest.args index ab19ac1c75..e3135fc2e6 100644 --- a/tests/qemuxml2argvdata/aarch64-video-default.args +++ b/tests/qemuxml2argvdata/aarch64-video-default.aarch64-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= -vgpu/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64-vgpu,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64-vgpu/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64-vgpu/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a57 \ -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 f3197c89-6457-44fe-b26d-897090ba6541 \ @@ -25,10 +26,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64-vgpu/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --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 ioh3420,port=3D16,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x2 \ +-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"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.2,addr=3D0x1 \ +-device '{"driver":"virtio-gpu-pci","id":"video0","max_outputs":1,"bus":"p= ci.1","addr":"0x0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aarch64-la= test.args b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aarch64-lat= est.args new file mode 100644 index 0000000000..ca31701d94 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aarch64-latest.ar= gs @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64-vgpu \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64-vgpu,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64-vgpu/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-accel tcg \ +-cpu cortex-a57 \ +-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 f3197c89-6457-44fe-b26d-897090ba6541 \ +-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 \ +-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","multifunction":true,"addr":"0x1.0x1"}' \ +-netdev user,id=3Dhostnet0 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:73:34:53","bootindex":1,"bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-gpu-pci","id":"video0","max_outputs":1,"bus":"p= ci.2","addr":"0x0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args b/tes= ts/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args deleted file mode 100644 index 74529a9168..0000000000 --- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args +++ /dev/null @@ -1,35 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64-vgpu \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=3Daarch64-vgpu,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64-vgpu/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ --accel tcg \ --cpu cortex-a57 \ --m 1024 \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid f3197c89-6457-44fe-b26d-897090ba6541 \ --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 \ --device ioh3420,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunction= =3Don,addr=3D0x1 \ --device ioh3420,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,multifunction= =3Don,addr=3D0x1.0x1 \ --netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:73:34:53= ,bootindex=3D1,bus=3Dpci.1,addr=3D0x0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.2,addr=3D0x0 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args b/tests/q= emuxml2argvdata/aarch64-virt-default-nic.aarch64-latest.args similarity index 56% rename from tests/qemuxml2argvdata/aarch64-virt-default-nic.args rename to tests/qemuxml2argvdata/aarch64-virt-default-nic.aarch64-latest.ar= gs index 2c60c8d57b..3628a9b65b 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args +++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.aarch64-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= -virt-default/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64-virt-default-nic,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64-virt-default/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64-virt-default/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 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -29,7 +30,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch6= 4-virt-default/.config \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ -append console=3DttyAMA0 \ +-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"}' \ -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"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-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 a10bed05d5..e055d372fa 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2119,7 +2119,7 @@ mymain(void) DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-pstate"); DO_TEST_CAPS_LATEST_PPC64("tpm-emulator-spapr"); DO_TEST_CAPS_ARCH_LATEST("aarch64-tpm", "aarch64"); - DO_TEST_PARSE_ERROR_NOCAPS("aarch64-tpm-wrong-model"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-tpm-wrong-model", "aarch= 64"); DO_TEST_CAPS_LATEST("tpm-external"); g_setenv(TEST_TPM_ENV_VAR, TPM_VER_2_0, true); @@ -2359,24 +2359,11 @@ mymain(void) /* 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-video-virtio-gpu-pci", - QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_VIRTIO_GPU); - DO_TEST("aarch64-video-default", - QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, - QEMU_CAPS_VNC); - DO_TEST("aarch64-aavmf-virtio-mmio", - QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("aarch64-virt-default-nic", - QEMU_CAPS_DEVICE_VIRTIO_MMIO); - qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64); - DO_TEST("aarch64-cpu-passthrough", - QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST("aarch64-video-virtio-gpu-pci", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-video-default", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-default-nic", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-cpu-passthrough", "aarch64"); DO_TEST_FULL("aarch64-gic-none", ".aarch64-4.2.0", ARG_GIC, GIC_NONE, ARG_CAPS_ARCH, "aarch64", @@ -2425,19 +2412,8 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-virt", "aarch64"= ); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-arm", "ppc64"); 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, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT); - DO_TEST("aarch64-traditional-pci", - QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCI_SERIAL); + DO_TEST_CAPS_ARCH_LATEST("aarch64-pci-serial", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-traditional-pci", "aarch64"); /* aarch64 doesn't support the same CPU features as x86 */ DO_TEST_CAPS_ARCH_LATEST_FAILURE("aarch64-features-wrong", "aarch64"); --=20 2.39.2