From nobody Mon Feb 9 00:30:47 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=1661439963; cv=none; d=zohomail.com; s=zohoarc; b=NGoHmX4qAXwaSGux+Uae2/jLSYYPktJhKY0FL1pvbJTo1jW7sVgtqLTUCH2OKdc+Gl//tFR5T6gvLlqQJh58Jl1hINgivl0BEGb7n7sqoocM9QmrDf1Ms4nIM7Ce94Vk291CNav7DAnqfjbFmwwG/mBqHl8mW4NNcQvweEd8ML0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661439963; 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=JaOTtD5NINHrdGJM2HhxOI95KTjtBhm9R8rK7IlDphU=; b=BUp5szjFrbh7V6G2S8IFyEIF2mjf//WaS186hX3BbbgBZESKf8gR2KM9r9tcuEhVQ0yqmKA4FuooFTi85RyNAhwQQzjTC5BbDREzNLsnbBPvxO1ax7p+LcvA77FHbsC0Ase0Tawh/auulpRw+QzIl/v4NA+HS1CD5hDV6eO/Y+c= 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 166143996395645.011460620873095; Thu, 25 Aug 2022 08:06:03 -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-271-gFeQA-meMeuhwS6IPx4j7Q-1; Thu, 25 Aug 2022 11:05:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B7D54811E87; Thu, 25 Aug 2022 15:05:26 +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 A23732166B26; Thu, 25 Aug 2022 15:05:26 +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 86D4A1946A43; Thu, 25 Aug 2022 15:05:26 +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 710F91946A43 for ; Thu, 25 Aug 2022 15:05:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 60FBF9458A; Thu, 25 Aug 2022 15:05:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD9FA4C816 for ; Thu, 25 Aug 2022 15:05:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661439962; 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=JaOTtD5NINHrdGJM2HhxOI95KTjtBhm9R8rK7IlDphU=; b=UmjDQ3QZqxCooMg7PnRIDruzAF8oUvTpCzD3kQ9qYt2isLTmbqyisPLvvlmQdbbe4Dt1or plwM+TgaSaT+IdLbqo/aXLwimRCpT4QxdgG20pPIdFDv8s0tKKrJqwiihOrz5nwxviKafq avggaD3Cn69WEfayviUv764PxqJdxck= X-MC-Unique: gFeQA-meMeuhwS6IPx4j7Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/8] qemuxml2*test: Remove 'q35-virtio-pci' test case Date: Thu, 25 Aug 2022 17:05:15 +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.78 on 10.11.54.6 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: 1661439965299100001 Content-Type: text/plain; charset="utf-8" As noted by the comments the only difference was the qemu capabilities asserted. Now that we use only real caps for this test case it makes no sense to have two copies. Signed-off-by: Peter Krempa --- .../q35-virtio-pci.x86_64-4.2.0.args | 66 -------- .../q35-virtio-pci.x86_64-latest.args | 67 -------- tests/qemuxml2argvdata/q35-virtio-pci.xml | 1 - tests/qemuxml2argvtest.c | 7 - tests/qemuxml2xmloutdata/q35-virtio-pci.xml | 154 ------------------ tests/qemuxml2xmltest.c | 19 --- 6 files changed, 314 deletions(-) delete mode 100644 tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args delete mode 100644 tests/qemuxml2argvdata/q35-virtio-pci.x86_64-latest.args delete mode 120000 tests/qemuxml2argvdata/q35-virtio-pci.xml delete mode 100644 tests/qemuxml2xmloutdata/q35-virtio-pci.xml 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 deleted file mode 100644 index 15daab14b7..0000000000 --- a/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args +++ /dev/null @@ -1,66 +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 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/qemuxml2argvdata/q35-virtio-pci.x86_64-latest.args b/tes= ts/qemuxml2argvdata/q35-virtio-pci.x86_64-latest.args deleted file mode 100644 index 4a84c2e621..0000000000 --- a/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-latest.args +++ /dev/null @@ -1,67 +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 '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ --accel tcg \ --cpu qemu64 \ --m 2048 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ --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 '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ --device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ --device '{"driver":"pcie-root-port","port":16,"chassis":3,"id":"pci.3","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ --device '{"driver":"pcie-root-port","port":17,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x1"}' \ --device '{"driver":"pcie-root-port","port":18,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x2"}' \ --device '{"driver":"pcie-root-port","port":19,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x2.0x3"}' \ --device '{"driver":"pcie-root-port","port":20,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x2.0x4"}' \ --device '{"driver":"pcie-root-port","port":21,"chassis":8,"id":"pci.8","bu= s":"pcie.0","addr":"0x2.0x5"}' \ --device '{"driver":"pcie-root-port","port":22,"chassis":9,"id":"pci.9","bu= s":"pcie.0","addr":"0x2.0x6"}' \ --device '{"driver":"pcie-root-port","port":23,"chassis":10,"id":"pci.10","= bus":"pcie.0","addr":"0x2.0x7"}' \ --device '{"driver":"pcie-root-port","port":24,"chassis":11,"id":"pci.11","= bus":"pcie.0","multifunction":true,"addr":"0x3"}' \ --device '{"driver":"pcie-root-port","port":25,"chassis":12,"id":"pci.12","= bus":"pcie.0","addr":"0x3.0x1"}' \ --device '{"driver":"pcie-root-port","port":26,"chassis":13,"id":"pci.13","= bus":"pcie.0","addr":"0x3.0x2"}' \ --device '{"driver":"pcie-root-port","port":27,"chassis":14,"id":"pci.14","= bus":"pcie.0","addr":"0x3.0x3"}' \ --device '{"driver":"pcie-root-port","port":28,"chassis":15,"id":"pci.15","= bus":"pcie.0","addr":"0x3.0x4"}' \ --device '{"driver":"nec-usb-xhci","id":"usb","bus":"pci.8","addr":"0x0"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.7","addr":"0x= 0"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.6"= ,"addr":"0x0"}' \ --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 '{"driver":"virtio-blk-pci","bus":"pci.9","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk1","bootindex":1}' \ --fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ --device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"/import/from/host","bus":"pci.3","addr":"0x0"}' \ --netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.4","addr":"0x0"}' \ --netdev user,id=3Dhostnet1 \ --device '{"driver":"e1000e","netdev":"hostnet1","id":"net1","mac":"00:11:2= 2:33:44:66","bus":"pci.5","addr":"0x0"}' \ --device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/inp= ut/event1234","bus":"pci.12","addr":"0x0"}' \ --device '{"driver":"virtio-mouse-pci","id":"input1","bus":"pci.13","addr":= "0x0"}' \ --device '{"driver":"virtio-keyboard-pci","id":"input2","bus":"pci.14","add= r":"0x0"}' \ --device '{"driver":"virtio-tablet-pci","id":"input3","bus":"pci.15","addr"= :"0x0"}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pcie.= 0","addr":"0x1"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.10","ad= dr":"0x0"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes= ":123,"period":1234,"bus":"pci.11","addr":"0x0"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.xml b/tests/qemuxml2argv= data/q35-virtio-pci.xml deleted file mode 120000 index 42e49a5403..0000000000 --- a/tests/qemuxml2argvdata/q35-virtio-pci.xml +++ /dev/null @@ -1 +0,0 @@ -q35-pcie.xml \ No newline at end of file diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 56a3b3a78f..303292c788 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2569,13 +2569,6 @@ mymain(void) /* verify that devices with pcie capability are assigned to a pcie slo= t */ 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_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_CAPS_VER("q35-pcie-autoadd", "4.2.0"); DO_TEST_CAPS_LATEST("q35-pcie-autoadd"); diff --git a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml b/tests/qemuxml2xm= loutdata/q35-virtio-pci.xml deleted file mode 100644 index d0f7bdb486..0000000000 --- a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml +++ /dev/null @@ -1,154 +0,0 @@ - - q35-test - 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 - 2097152 - 2097152 - 2 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - -
- - -
- - -
- - -
- - - - -
- - - - -
- - - - -
- - - -
- - -
- - -
- - -
- - - -