From nobody Mon Feb 9 09:08:37 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=1661439943; cv=none; d=zohomail.com; s=zohoarc; b=C4VK1ojLLWtS+RV9TpQD4hOfoE+t4Ro4DCifWC/Rt7SYkPv0g2NPutkS9niQH+5Vxg0wwqADk6oTq1YDs3GRy5604dEns85Z/9xBq2NhV0hv9H6NwmEpnLzs65HdmT+DdRfguLFkAs33CWUM/M6WesS1MKJaUFh29tfhPBGQgl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661439943; 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=WHkd5YziEGpBRdak1tvYjzdiOpiJDBhncaCp094REZ8=; b=ho8E6k8AHzkLx9qlb3lxpCeCE57jZr0bE/wYXE/UqcMtIEhkNaR0DCDD+RVUZ5DUu5eSzlur3I4cph8Fb21nm5hq/BDyUKA8d9PNpLNEwBe671hxRnActChKeDrEv8aXWQ52HwsAfLBWxoVIF95Nh56EH+5r388hy9VgRt2LFO0= 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 1661439943241439.6926354832435; Thu, 25 Aug 2022 08:05:43 -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-266-4Yqvj7x9PnCUI0Qkp-WoVQ-1; Thu, 25 Aug 2022 11:05:37 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4D359800DB3; Thu, 25 Aug 2022 15:05:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 320FA492C3B; Thu, 25 Aug 2022 15:05: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 113C31946A62; Thu, 25 Aug 2022 15:05:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 884D41946A7A for ; Thu, 25 Aug 2022 15:05:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7997A94637; Thu, 25 Aug 2022 15:05:24 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD4FF9458A for ; Thu, 25 Aug 2022 15:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661439941; 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=WHkd5YziEGpBRdak1tvYjzdiOpiJDBhncaCp094REZ8=; b=Ug6JxuNx3vUGJHlkMy03M6ltcD9AS6lZ1l3UaHaYPW4EurJLAOuqGWHGT+F5UTyYeKZFHQ hGw5LaGrvHEpezdb++vXIy134kiN0au82e0BzFQLCvAJoXyn7qCRHLBj0iefKVlDuBcbAK LI13xnhiSDjd7Rx8BUwFAdqlZ4+bdZU= X-MC-Unique: 4Yqvj7x9PnCUI0Qkp-WoVQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/8] qemuxml2argvtest: Convert all test cases asserting QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY Date: Thu, 25 Aug 2022 17:05:14 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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 2.85 on 10.11.54.9 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: 1661439945481100002 Content-Type: text/plain; charset="utf-8" Turn them into DO_TEST_CAPS_VER bound to qemu-4.2 to show the minimum amount of change. We already have DO_TEST_CAPS_LATEST versions. Signed-off-by: Peter Krempa --- ...h64-virtio-pci-default.aarch64-4.2.0.args} | 17 ++- ...ev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args} | 4 +- ...35-default-devices-only.x86_64-4.2.0.args} | 12 +- tests/qemuxml2argvdata/q35-multifunction.args | 49 ------ .../q35-multifunction.x86_64-4.2.0.args | 51 +++++++ ...rgs =3D> q35-pcie-autoadd.x86_64-4.2.0.args} | 36 ++--- ...5-pcie.args =3D> q35-pcie.x86_64-4.2.0.args} | 34 +++-- ... q35-virt-manager-basic.x86_64-4.2.0.args} | 21 +-- tests/qemuxml2argvdata/q35-virtio-pci.args | 64 -------- .../q35-virtio-pci.x86_64-4.2.0.args | 66 ++++++++ tests/qemuxml2argvtest.c | 142 ++---------------- 11 files changed, 196 insertions(+), 300 deletions(-) rename tests/qemuxml2argvdata/{aarch64-virtio-pci-default.args =3D> aarch6= 4-virtio-pci-default.aarch64-4.2.0.args} (71%) rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pcie.args =3D> host= dev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args} (88%) rename tests/qemuxml2argvdata/{q35-default-devices-only.args =3D> q35-defa= ult-devices-only.x86_64-4.2.0.args} (67%) delete mode 100644 tests/qemuxml2argvdata/q35-multifunction.args create mode 100644 tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.a= rgs rename tests/qemuxml2argvdata/{q35-pcie-autoadd.args =3D> q35-pcie-autoadd= .x86_64-4.2.0.args} (59%) rename tests/qemuxml2argvdata/{q35-pcie.args =3D> q35-pcie.x86_64-4.2.0.ar= gs} (62%) rename tests/qemuxml2argvdata/{q35-virt-manager-basic.args =3D> q35-virt-m= anager-basic.x86_64-4.2.0.args} (75%) delete mode 100644 tests/qemuxml2argvdata/q35-virtio-pci.args create mode 100644 tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests= /qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args similarity index 71% rename from tests/qemuxml2argvdata/aarch64-virtio-pci-default.args rename to tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.a= rgs index 90c6fdead4..9491d65c61 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-aarc= h64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-machine virt-4.2,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ -accel tcg \ -cpu cortex-a53 \ -m 1024 \ @@ -30,16 +30,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.confi= g \ -initrd /aarch64.initrd \ -append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ -dtb /aarch64.dtb \ --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,addr=3D0x1.0x= 1 \ --device ioh3420,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1.0= x2 \ --device ioh3420,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=3D0x1.0= x3 \ --device ioh3420,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=3D0x1.0= x4 \ --device ioh3420,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=3D0x1.0= x5 \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ +-device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ +-device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,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 virtio-blk-pci,bus=3Dpci.3,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.3,addr=3D0x0,drive=3Dlibvirt-1= -format,id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ @@ -50,4 +50,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ -object rng-random,id=3Dobjrng0,filename=3D/dev/random \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.5,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args b/tes= ts/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args similarity index 88% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args rename to tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.= args index 098404ec3a..992d8ec905 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest2/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ +-cpu qemu64 \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ @@ -29,4 +30,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vhost-scsi-pci,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostde= v0,bus=3Dpci.1,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args b/tests/q= emuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args similarity index 67% rename from tests/qemuxml2argvdata/q35-default-devices-only.args rename to tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args index bc178aab47..a4de318a05 100644 --- a/tests/qemuxml2argvdata/q35-default-devices-only.args +++ b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-q35-= test/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 2048 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ @@ -25,10 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -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,addr=3D0x1.0x= 1 \ --device ioh3420,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1.0= x2 \ --device nec-usb-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-multifunction.args b/tests/qemuxml2= argvdata/q35-multifunction.args deleted file mode 100644 index f21bb11671..0000000000 --- a/tests/qemuxml2argvdata/q35-multifunction.args +++ /dev/null @@ -1,49 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-q35-test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-q35-test/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-q35-test/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dq35-test,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-q35-= test/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 2048 \ --overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ --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=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunctio= n=3Don,addr=3D0x2 \ --device ioh3420,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x2.0= x1 \ --device ioh3420,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x2.0= x2 \ --device ioh3420,port=3D24,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,multifunctio= n=3Don,addr=3D0x3 \ --device ioh3420,port=3D25,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,multifunctio= n=3Don,addr=3D0x3.0x1 \ --device ioh3420,port=3D32,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,multifunctio= n=3Doff,addr=3D0x4 \ --device ioh3420,port=3D33,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr=3D0x4.0= x1 \ --device ioh3420,port=3D8,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,multifunction= =3Don,addr=3D0x1 \ --device ioh3420,port=3D9,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,addr=3D0x1.0x= 1 \ --device ioh3420,port=3D10,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,addr=3D0x1= .0x2 \ --device ioh3420,port=3D11,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,addr=3D0x1= .0x3 \ --device ioh3420,port=3D12,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,addr=3D0x1= .0x4 \ --device ioh3420,port=3D13,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,addr=3D0x1= .0x5 \ --device ioh3420,port=3D14,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,addr=3D0x1= .0x6 \ --device ioh3420,port=3D15,chassis=3D15,id=3Dpci.15,bus=3Dpcie.0,addr=3D0x1= .0x7 \ --device ioh3420,port=3D19,chassis=3D16,id=3Dpci.16,bus=3Dpcie.0,addr=3D0x2= .0x3 \ --device ioh3420,port=3D20,chassis=3D17,id=3Dpci.17,bus=3Dpcie.0,addr=3D0x2= .0x4 \ --device ioh3420,port=3D21,chassis=3D18,id=3Dpci.18,bus=3Dpcie.0,addr=3D0x2= .0x5 \ --device nec-usb-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args b/t= ests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args new file mode 100644 index 0000000000..287268d1c8 --- /dev/null +++ b/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args @@ -0,0 +1,51 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-q35-test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-q35-test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-q35-test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dq35-test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-q35-= test/master-key.aes \ +-machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m 2048 \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ +-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=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ +-device pcie-root-port,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x2.0x1 \ +-device pcie-root-port,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2.0x2 \ +-device pcie-root-port,port=3D24,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,multi= function=3Don,addr=3D0x3 \ +-device pcie-root-port,port=3D25,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,multi= function=3Don,addr=3D0x3.0x1 \ +-device pcie-root-port,port=3D32,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,multi= function=3Doff,addr=3D0x4 \ +-device pcie-root-port,port=3D33,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x4.0x1 \ +-device pcie-root-port,port=3D8,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add= r=3D0x1.0x2 \ +-device pcie-root-port,port=3D11,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,add= r=3D0x1.0x3 \ +-device pcie-root-port,port=3D12,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,add= r=3D0x1.0x4 \ +-device pcie-root-port,port=3D13,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,add= r=3D0x1.0x5 \ +-device pcie-root-port,port=3D14,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,add= r=3D0x1.0x6 \ +-device pcie-root-port,port=3D15,chassis=3D15,id=3Dpci.15,bus=3Dpcie.0,add= r=3D0x1.0x7 \ +-device pcie-root-port,port=3D19,chassis=3D16,id=3Dpci.16,bus=3Dpcie.0,add= r=3D0x2.0x3 \ +-device pcie-root-port,port=3D20,chassis=3D17,id=3Dpci.17,bus=3Dpcie.0,add= r=3D0x2.0x4 \ +-device pcie-root-port,port=3D21,chassis=3D18,id=3Dpci.18,bus=3Dpcie.0,add= r=3D0x2.0x5 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2a= rgvdata/q35-pcie-autoadd.x86_64-4.2.0.args similarity index 59% rename from tests/qemuxml2argvdata/q35-pcie-autoadd.args rename to tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args index 3db83f2a10..787cbfa511 100644 --- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args +++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-q35-= test/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 2048 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ @@ -25,26 +26,26 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ioh3420,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunctio= n=3Don,addr=3D0x2 \ --device ioh3420,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x2.0= x1 \ --device ioh3420,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x2.0= x2 \ --device ioh3420,port=3D19,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=3D0x2.0= x3 \ --device ioh3420,port=3D20,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=3D0x2.0= x4 \ --device ioh3420,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=3D0x2.0= x5 \ --device ioh3420,port=3D22,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr=3D0x2.0= x6 \ --device ioh3420,port=3D23,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr=3D0x2.0= x7 \ --device ioh3420,port=3D24,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,multifunctio= n=3Don,addr=3D0x3 \ --device ioh3420,port=3D25,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,addr=3D0x3= .0x1 \ --device ioh3420,port=3D26,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,addr=3D0x3= .0x2 \ --device ioh3420,port=3D27,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,addr=3D0x3= .0x3 \ --device ioh3420,port=3D28,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,addr=3D0x3= .0x4 \ --device ioh3420,port=3D29,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,addr=3D0x3= .0x5 \ +-device pcie-root-port,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ +-device pcie-root-port,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x2.0x1 \ +-device pcie-root-port,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2.0x2 \ +-device pcie-root-port,port=3D19,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x2.0x3 \ +-device pcie-root-port,port=3D20,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x2.0x4 \ +-device pcie-root-port,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x2.0x5 \ +-device pcie-root-port,port=3D22,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x2.0x6 \ +-device pcie-root-port,port=3D23,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr= =3D0x2.0x7 \ +-device pcie-root-port,port=3D24,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,multi= function=3Don,addr=3D0x3 \ +-device pcie-root-port,port=3D25,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add= r=3D0x3.0x1 \ +-device pcie-root-port,port=3D26,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,add= r=3D0x3.0x2 \ +-device pcie-root-port,port=3D27,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,add= r=3D0x3.0x3 \ +-device pcie-root-port,port=3D28,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,add= r=3D0x3.0x4 \ +-device pcie-root-port,port=3D29,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,add= r=3D0x3.0x5 \ -device nec-usb-xhci,id=3Dusb,bus=3Dpci.6,addr=3D0x0 \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.5,addr=3D0x0 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.4,addr=3D0x0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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-pci,bus=3Dpci.7,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1,bootindex=3D1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.7,addr=3D0x0,drive=3Dlibvirt-1= -format,id=3Dvirtio-disk1,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.1,addr=3D0x0 \ -netdev user,id=3Dhostnet0 \ @@ -56,8 +57,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.12,addr=3D0x0 \ -device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.13,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1= \ +-device virtio-vga,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.8,addr=3D0x0 \ -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12= 34,bus=3Dpci.9,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/= q35-pcie.x86_64-4.2.0.args similarity index 62% rename from tests/qemuxml2argvdata/q35-pcie.args rename to tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args index 48e6ae0557..15daab14b7 100644 --- a/tests/qemuxml2argvdata/q35-pcie.args +++ b/tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -name guest=3Dq35-test,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-q35-= test/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 2048 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ @@ -27,25 +28,25 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -boot strict=3Don \ -device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ -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,multifunctio= n=3Don,addr=3D0x2 \ --device ioh3420,port=3D17,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=3D0x2.0= x1 \ --device ioh3420,port=3D18,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=3D0x2.0= x2 \ --device ioh3420,port=3D19,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=3D0x2.0= x3 \ --device ioh3420,port=3D20,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr=3D0x2.0= x4 \ --device ioh3420,port=3D21,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr=3D0x2.0= x5 \ --device ioh3420,port=3D22,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,addr=3D0x2.0= x6 \ --device ioh3420,port=3D23,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,addr=3D0x2= .0x7 \ --device ioh3420,port=3D24,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,multifunct= ion=3Don,addr=3D0x3 \ --device ioh3420,port=3D25,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,addr=3D0x3= .0x1 \ --device ioh3420,port=3D26,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,addr=3D0x3= .0x2 \ --device ioh3420,port=3D27,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,addr=3D0x3= .0x3 \ --device ioh3420,port=3D28,chassis=3D15,id=3Dpci.15,bus=3Dpcie.0,addr=3D0x3= .0x4 \ +-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 pcie-root-port,port=3D19,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x2.0x3 \ +-device pcie-root-port,port=3D20,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x2.0x4 \ +-device pcie-root-port,port=3D21,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr= =3D0x2.0x5 \ +-device pcie-root-port,port=3D22,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,addr= =3D0x2.0x6 \ +-device pcie-root-port,port=3D23,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add= r=3D0x2.0x7 \ +-device pcie-root-port,port=3D24,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,mul= tifunction=3Don,addr=3D0x3 \ +-device pcie-root-port,port=3D25,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,add= r=3D0x3.0x1 \ +-device pcie-root-port,port=3D26,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,add= r=3D0x3.0x2 \ +-device pcie-root-port,port=3D27,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,add= r=3D0x3.0x3 \ +-device pcie-root-port,port=3D28,chassis=3D15,id=3Dpci.15,bus=3Dpcie.0,add= r=3D0x3.0x4 \ -device nec-usb-xhci,id=3Dusb,bus=3Dpci.8,addr=3D0x0 \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.7,addr=3D0x0 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.6,addr=3D0x0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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-pci,bus=3Dpci.9,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1,bootindex=3D1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.9,addr=3D0x0,drive=3Dlibvirt-1= -format,id=3Dvirtio-disk1,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.3,addr=3D0x0 \ -netdev user,id=3Dhostnet0 \ @@ -57,8 +58,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.14,addr=3D0x0 \ -device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.15,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1= \ +-device virtio-vga,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.10,addr=3D0x0 \ -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12= 34,bus=3Dpci.11,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qem= uxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args similarity index 75% rename from tests/qemuxml2argvdata/q35-virt-manager-basic.args rename to tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args index fe00c9e0eb..14093a3f80 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic/.= config \ -name guest=3Dvirt-manager-basic,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-virt= -manager-basic/master-key.aes \ --machine q35,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-4.2,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \ -accel kvm \ +-cpu qemu64 \ -m 4096 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ @@ -21,22 +22,23 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic= /.config \ -chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ +-global kvm-pit.lost_tick_policy=3Ddelay \ -no-hpet \ -no-shutdown \ -global ICH9-LPC.disable_s3=3D1 \ -global ICH9-LPC.disable_s4=3D1 \ -boot strict=3Don \ --device ioh3420,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunctio= n=3Don,addr=3D0x2 \ --device ioh3420,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x2.0= x1 \ --device ioh3420,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x2.0= x2 \ --device ioh3420,port=3D19,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=3D0x2.0= x3 \ --device ioh3420,port=3D20,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=3D0x2.0= x4 \ --device ioh3420,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=3D0x2.0= x5 \ +-device pcie-root-port,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ +-device pcie-root-port,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x2.0x1 \ +-device pcie-root-port,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2.0x2 \ +-device pcie-root-port,port=3D19,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x2.0x3 \ +-device pcie-root-port,port=3D20,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x2.0x4 \ +-device pcie-root-port,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x2.0x5 \ -device nec-usb-xhci,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/basic.qcow= 2","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=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1= -format,id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:9a:e6:c6= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ @@ -48,7 +50,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic/.= config \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5901,tls-port=3D5902,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,image-compression=3Doff,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpcie.0,addr=3D0x1 \ +-device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,vram64_size_mb=3D0,vgamem_mb=3D16,bus=3Dpcie.0,addr=3D0x1 \ -device ich9-intel-hda,id=3Dsound0,bus=3Dpcie.0,addr=3D0x1b \ -device hda-duplex,id=3Dsound0-codec0,bus=3Dsound0.0,cad=3D0,audiodev=3Dau= dio1 \ -chardev spicevmc,id=3Dcharredir0,name=3Dusbredir \ @@ -56,4 +58,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic/.= config \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ -device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bus=3Dusb.0,port=3D3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2arg= vdata/q35-virtio-pci.args deleted file mode 100644 index fe42f07e82..0000000000 --- a/tests/qemuxml2argvdata/q35-virtio-pci.args +++ /dev/null @@ -1,64 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-q35-test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-q35-test/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-q35-test/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dq35-test,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-q35-= test/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 2048 \ --overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ --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 i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --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,multifunctio= n=3Don,addr=3D0x2 \ --device ioh3420,port=3D17,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=3D0x2.0= x1 \ --device ioh3420,port=3D18,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=3D0x2.0= x2 \ --device ioh3420,port=3D19,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=3D0x2.0= x3 \ --device ioh3420,port=3D20,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr=3D0x2.0= x4 \ --device ioh3420,port=3D21,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr=3D0x2.0= x5 \ --device ioh3420,port=3D22,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,addr=3D0x2.0= x6 \ --device ioh3420,port=3D23,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,addr=3D0x2= .0x7 \ --device ioh3420,port=3D24,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,multifunct= ion=3Don,addr=3D0x3 \ --device ioh3420,port=3D25,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,addr=3D0x3= .0x1 \ --device ioh3420,port=3D26,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,addr=3D0x3= .0x2 \ --device ioh3420,port=3D27,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,addr=3D0x3= .0x3 \ --device ioh3420,port=3D28,chassis=3D15,id=3Dpci.15,bus=3Dpcie.0,addr=3D0x3= .0x4 \ --device nec-usb-xhci,id=3Dusb,bus=3Dpci.4,addr=3D0x0 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.2,addr=3D0x4 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x3 \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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-pci,bus=3Dpci.2,addr=3D0x5,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1,bootindex=3D1 \ --fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ --device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.2,addr=3D0x1 \ --netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bus=3Dpci.2,addr=3D0x2 \ --netdev user,id=3Dhostnet1 \ --device e1000e,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:66,bus=3Dp= ci.3,addr=3D0x0 \ --device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus= =3Dpci.2,addr=3D0x8 \ --device virtio-mouse-pci,id=3Dinput1,bus=3Dpci.2,addr=3D0x9 \ --device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.2,addr=3D0xa \ --device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.2,addr=3D0xb \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1= \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x6 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12= 34,bus=3Dpci.2,addr=3D0x7 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args b/test= s/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args new file mode 100644 index 0000000000..15daab14b7 --- /dev/null +++ b/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args @@ -0,0 +1,66 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-q35-test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-q35-test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-q35-test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dq35-test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-q35-= test/master-key.aes \ +-machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m 2048 \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ +-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 i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ +-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,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 pcie-root-port,port=3D19,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x2.0x3 \ +-device pcie-root-port,port=3D20,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x2.0x4 \ +-device pcie-root-port,port=3D21,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr= =3D0x2.0x5 \ +-device pcie-root-port,port=3D22,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,addr= =3D0x2.0x6 \ +-device pcie-root-port,port=3D23,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add= r=3D0x2.0x7 \ +-device pcie-root-port,port=3D24,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,mul= tifunction=3Don,addr=3D0x3 \ +-device pcie-root-port,port=3D25,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,add= r=3D0x3.0x1 \ +-device pcie-root-port,port=3D26,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,add= r=3D0x3.0x2 \ +-device pcie-root-port,port=3D27,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,add= r=3D0x3.0x3 \ +-device pcie-root-port,port=3D28,chassis=3D15,id=3Dpci.15,bus=3Dpcie.0,add= r=3D0x3.0x4 \ +-device nec-usb-xhci,id=3Dusb,bus=3Dpci.8,addr=3D0x0 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.7,addr=3D0x0 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.6,addr=3D0x0 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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-pci,scsi=3Doff,bus=3Dpci.9,addr=3D0x0,drive=3Dlibvirt-1= -format,id=3Dvirtio-disk1,bootindex=3D1 \ +-fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ +-device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.3,addr=3D0x0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bus=3Dpci.4,addr=3D0x0 \ +-netdev user,id=3Dhostnet1 \ +-device e1000e,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:66,bus=3Dp= ci.5,addr=3D0x0 \ +-device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus= =3Dpci.12,addr=3D0x0 \ +-device virtio-mouse-pci,id=3Dinput1,bus=3Dpci.13,addr=3D0x0 \ +-device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.14,addr=3D0x0 \ +-device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.15,addr=3D0x0 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-vga,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.10,addr=3D0x0 \ +-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12= 34,bus=3Dpci.11,addr=3D0x0 \ +-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 2f31cc8e15..56a3b3a78f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2563,135 +2563,27 @@ mymain(void) QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_QXL); + /* Note: The real caps versions of the following tests based on qemu-4= .2.0 + * were added as a comparison point between fake caps testing and real= caps + * testing and don't have any other specific purpose */ /* verify that devices with pcie capability are assigned to a pcie slo= t */ - DO_TEST("q35-pcie", - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_CAPS_VER("q35-pcie", "4.2.0"); DO_TEST_CAPS_LATEST("q35-pcie"); /* same XML as q35-pcie, but don't set * QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, so virtio devices should * be assigned to legacy pci slots. This doesn't apply to the 'real' c= aps * tests as such configuration is not present in real life. */ - DO_TEST("q35-virtio-pci", - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_CAPS_VER("q35-virtio-pci", "4.2.0"); DO_TEST_CAPS_LATEST("q35-virtio-pci"); /* same as q35-pcie, but all PCI controllers are added automatically */ - DO_TEST("q35-pcie-autoadd", - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_CAPS_VER("q35-pcie-autoadd", "4.2.0"); DO_TEST_CAPS_LATEST("q35-pcie-autoadd"); - DO_TEST("q35-default-devices-only", - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_CAPS_VER("q35-default-devices-only", "4.2.0"); DO_TEST_CAPS_LATEST("q35-default-devices-only"); - DO_TEST("q35-multifunction", - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_CAPS_VER("q35-multifunction", "4.2.0"); DO_TEST_CAPS_LATEST("q35-multifunction"); - DO_TEST("q35-virt-manager-basic", - QEMU_CAPS_KVM, - QEMU_CAPS_MACHINE_VMPORT_OPT, - QEMU_CAPS_ICH9_DISABLE_S3, - QEMU_CAPS_ICH9_DISABLE_S4, - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_NEC_USB_XHCI, - QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_HDA_DUPLEX, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_USB_REDIR); + DO_TEST_CAPS_VER("q35-virt-manager-basic", "4.2.0"); DO_TEST_CAPS_LATEST("q35-virt-manager-basic"); /* Test automatic and manual setting of pcie-root-port attributes */ @@ -2786,11 +2678,7 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-vhost-scsi-pci-boot-fail= "); - DO_TEST("hostdev-scsi-vhost-scsi-pcie", - QEMU_CAPS_KVM, - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY); + DO_TEST_CAPS_VER("hostdev-scsi-vhost-scsi-pcie", "4.2.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pcie"); DO_TEST_PARSE_ERROR("hostdev-scsi-duplicate", QEMU_CAPS_VIRTIO_SCSI, @@ -2832,15 +2720,7 @@ mymain(void) q35 style PCI controllers will be added if the binary supports it, but virtio-mmio is always used unless PCI addresses are manually specified. */ - DO_TEST("aarch64-virtio-pci-default", - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - 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_IOH3420, - QEMU_CAPS_DEVICE_PL011, - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_ARCH_VER("aarch64-virtio-pci-default", "aarch64", "4.2.0"= ); DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64"); DO_TEST("aarch64-virt-2.6-virtio-pci-default", QEMU_CAPS_DEVICE_VIRTIO_MMIO, --=20 2.37.1