From nobody Thu Mar 28 13:11:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) client-ip=209.132.183.24; envelope-from=libvir-list-bounces@redhat.com; helo=mx3-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by mx.zohomail.com with SMTPS id 1487875448504592.0219401515111; Thu, 23 Feb 2017 10:44:08 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1NIeORB029642; Thu, 23 Feb 2017 13:40:24 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1NIdQVD028003 for ; Thu, 23 Feb 2017 13:39:26 -0500 Received: from inaba.usersys.redhat.com ([10.34.129.229]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1NIdNf4021101 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 23 Feb 2017 13:39:25 -0500 From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 23 Feb 2017 19:39:19 +0100 Message-Id: <1487875160-31707-2-git-send-email-abologna@redhat.com> In-Reply-To: <1487875160-31707-1-git-send-email-abologna@redhat.com> References: <1487875160-31707-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-loop: libvir-list@redhat.com Cc: laine@laine.org Subject: [libvirt] [PATCH v2 1/2] tests: Sync tests between qemuxml2argv and qemuxml2xml X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In some cases, only one of the two transformations was checked; in other cases, the capabilities set differed. --- Note that the input file for the "pci-bridge" test case had to be changed to make it usable for qemuxml2argv. .../qemuxml2argvdata/qemuxml2argv-pci-bridge.args | 90 +++++++++ tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml | 97 +++------- .../qemuxml2argv-vcpu-placement-static.args | 20 ++ tests/qemuxml2argvtest.c | 74 ++++--- .../qemuxml2xmlout-boot-floppy-q35.xml | 32 +++ .../qemuxml2xmlout-bootindex-floppy-q35.xml | 32 +++ .../qemuxml2xmlout-intel-iommu-machine.xml | 26 +++ .../qemuxml2xmlout-pci-bridge.xml | 98 ++++------ .../qemuxml2xmloutdata/qemuxml2xmlout-pci-many.xml | 214 +++++++++++++++++= ++++ ...qemuxml2xmlout-video-device-pciaddr-default.xml | 51 +++++ tests/qemuxml2xmltest.c | 154 +++++++++++---- 11 files changed, 697 insertions(+), 191 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-stat= ic.args create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy-q35= .xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-bootindex-flopp= y-q35.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-mac= hine.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-many.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-device-pc= iaddr-default.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.args b/tests/qe= muxml2argvdata/qemuxml2argv-pci-bridge.args new file mode 100644 index 0000000..d1d51b3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.args @@ -0,0 +1,90 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/libexec/qemu-kvm \ +-name fdr-br \ +-S \ +-M pc-1.2 \ +-m 2048 \ +-smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-fdr-br/monitor.sock,server,nowait \ +-boot c \ +-device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x3 \ +-device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.0,addr=3D0x4 \ +-usb \ +-drive file=3D/var/iso/f18kde.iso,format=3Draw,if=3Dnone,media=3Dcdrom,\ +id=3Ddrive-ide0-1-0,readonly=3Don \ +-device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ +-device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3Dpci.0,add= r=3D0x5 \ +-net user,vlan=3D0,name=3Dhostnet0 \ +-device e1000,vlan=3D1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpci.0,addr= =3D0x7 \ +-net user,vlan=3D1,name=3Dhostnet1 \ +-device e1000,vlan=3D2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpci.0,addr= =3D0x8 \ +-net user,vlan=3D2,name=3Dhostnet2 \ +-device e1000,vlan=3D3,id=3Dnet3,mac=3D52:54:00:45:28:cb,bus=3Dpci.0,addr= =3D0x9 \ +-net user,vlan=3D3,name=3Dhostnet3 \ +-device e1000,vlan=3D4,id=3Dnet4,mac=3D52:54:00:ee:b9:a8,bus=3Dpci.0,addr= =3D0xa \ +-net user,vlan=3D4,name=3Dhostnet4 \ +-device e1000,vlan=3D5,id=3Dnet5,mac=3D52:54:00:a9:f7:17,bus=3Dpci.0,addr= =3D0xb \ +-net user,vlan=3D5,name=3Dhostnet5 \ +-device e1000,vlan=3D6,id=3Dnet6,mac=3D52:54:00:df:2b:f3,bus=3Dpci.0,addr= =3D0xc \ +-net user,vlan=3D6,name=3Dhostnet6 \ +-device e1000,vlan=3D7,id=3Dnet7,mac=3D52:54:00:78:94:b4,bus=3Dpci.0,addr= =3D0xd \ +-net user,vlan=3D7,name=3Dhostnet7 \ +-device e1000,vlan=3D8,id=3Dnet8,mac=3D52:54:00:6b:9b:06,bus=3Dpci.0,addr= =3D0xe \ +-net user,vlan=3D8,name=3Dhostnet8 \ +-device e1000,vlan=3D9,id=3Dnet9,mac=3D52:54:00:17:df:bc,bus=3Dpci.0,addr= =3D0xf \ +-net user,vlan=3D9,name=3Dhostnet9 \ +-device rtl8139,vlan=3D10,id=3Dnet10,mac=3D52:54:00:3b:d0:51,bus=3Dpci.0,a= ddr=3D0x10 \ +-net user,vlan=3D10,name=3Dhostnet10 \ +-device e1000,vlan=3D11,id=3Dnet11,mac=3D52:54:00:8d:2d:17,bus=3Dpci.0,add= r=3D0x11 \ +-net user,vlan=3D11,name=3Dhostnet11 \ +-device e1000,vlan=3D12,id=3Dnet12,mac=3D52:54:00:a7:66:af,bus=3Dpci.0,add= r=3D0x12 \ +-net user,vlan=3D12,name=3Dhostnet12 \ +-device e1000,vlan=3D13,id=3Dnet13,mac=3D52:54:00:54:ab:d7,bus=3Dpci.0,add= r=3D0x13 \ +-net user,vlan=3D13,name=3Dhostnet13 \ +-device e1000,vlan=3D14,id=3Dnet14,mac=3D52:54:00:1f:99:90,bus=3Dpci.0,add= r=3D0x14 \ +-net user,vlan=3D14,name=3Dhostnet14 \ +-device e1000,vlan=3D15,id=3Dnet15,mac=3D52:54:00:c8:43:87,bus=3Dpci.0,add= r=3D0x15 \ +-net user,vlan=3D15,name=3Dhostnet15 \ +-device e1000,vlan=3D16,id=3Dnet16,mac=3D52:54:00:df:22:b2,bus=3Dpci.0,add= r=3D0x16 \ +-net user,vlan=3D16,name=3Dhostnet16 \ +-device e1000,vlan=3D17,id=3Dnet17,mac=3D52:54:00:d2:9a:47,bus=3Dpci.0,add= r=3D0x17 \ +-net user,vlan=3D17,name=3Dhostnet17 \ +-device e1000,vlan=3D18,id=3Dnet18,mac=3D52:54:00:86:05:e2,bus=3Dpci.0,add= r=3D0x18 \ +-net user,vlan=3D18,name=3Dhostnet18 \ +-device e1000,vlan=3D19,id=3Dnet19,mac=3D52:54:00:8c:1c:c2,bus=3Dpci.0,add= r=3D0x19 \ +-net user,vlan=3D19,name=3Dhostnet19 \ +-device e1000,vlan=3D20,id=3Dnet20,mac=3D52:54:00:48:58:92,bus=3Dpci.0,add= r=3D0x1a \ +-net user,vlan=3D20,name=3Dhostnet20 \ +-device e1000,vlan=3D21,id=3Dnet21,mac=3D52:54:00:99:e5:bf,bus=3Dpci.0,add= r=3D0x1b \ +-net user,vlan=3D21,name=3Dhostnet21 \ +-device e1000,vlan=3D22,id=3Dnet22,mac=3D52:54:00:b1:8c:25,bus=3Dpci.0,add= r=3D0x1c \ +-net user,vlan=3D22,name=3Dhostnet22 \ +-device e1000,vlan=3D23,id=3Dnet23,mac=3D52:54:00:60:e0:d0,bus=3Dpci.0,add= r=3D0x1d \ +-net user,vlan=3D23,name=3Dhostnet23 \ +-device e1000,vlan=3D24,id=3Dnet24,mac=3D52:54:00:37:00:6a,bus=3Dpci.0,add= r=3D0x1e \ +-net user,vlan=3D24,name=3Dhostnet24 \ +-device e1000,vlan=3D25,id=3Dnet25,mac=3D52:54:00:c7:c8:ad,bus=3Dpci.0,add= r=3D0x1f \ +-net user,vlan=3D25,name=3Dhostnet25 \ +-device e1000,vlan=3D26,id=3Dnet26,mac=3D52:54:00:4e:a7:cf,bus=3Dpci.1,add= r=3D0x1 \ +-net user,vlan=3D26,name=3Dhostnet26 \ +-device e1000,vlan=3D27,id=3Dnet27,mac=3D52:54:00:00:79:69,bus=3Dpci.1,add= r=3D0x2 \ +-net user,vlan=3D27,name=3Dhostnet27 \ +-device e1000,vlan=3D28,id=3Dnet28,mac=3D52:54:00:47:00:6f,bus=3Dpci.1,add= r=3D0x3 \ +-net user,vlan=3D28,name=3Dhostnet28 \ +-device e1000,vlan=3D29,id=3Dnet29,mac=3D52:54:00:2a:8c:8b,bus=3Dpci.1,add= r=3D0x4 \ +-net user,vlan=3D29,name=3Dhostnet29 \ +-device e1000,vlan=3D30,id=3Dnet30,mac=3D52:54:00:ec:d5:e3,bus=3Dpci.1,add= r=3D0x5 \ +-net user,vlan=3D30,name=3Dhostnet30 \ +-device e1000,vlan=3D31,id=3Dnet31,mac=3D52:54:00:7e:6e:c8,bus=3Dpci.1,add= r=3D0x6 \ +-net user,vlan=3D31,name=3Dhostnet31 \ +-vnc 127.0.0.1:0 \ +-k en-us \ +-vga cirrus \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml b/tests/qem= uxml2argvdata/qemuxml2argv-pci-bridge.xml index 683c269..2e8f539 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml @@ -35,164 +35,131 @@ - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.args= b/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.args new file mode 100644 index 0000000..387ffd2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.args @@ -0,0 +1,20 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name dummy2 \ +-S \ +-M pc-q35-2.3 \ +-m 128 \ +-smp 2,maxcpus=3D6,sockets=3D6,cores=3D1,threads=3D1 \ +-object iothread,id=3Diothread1 \ +-object iothread,id=3Diothread2 \ +-uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-dummy2/monitor.sock,server,nowait \ +-no-acpi \ +-boot c diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f55b04b..1298ac6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1393,23 +1393,29 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-controller-default-q35", QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI); + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); DO_TEST_FAILURE("usb-controller-default-unavailable-q35", QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PCI_OHCI, QEMU_CAPS_NEC_USB_XHCI); DO_TEST("usb-controller-explicit-q35", QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI); + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI); DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, + QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PIIX3_USB_UHCI); DO_TEST("usb-controller-xhci", QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_= UHCI, @@ -1572,6 +1578,10 @@ mymain(void) QEMU_CAPS_OBJECT_IOTHREAD, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST("vcpu-placement-static", + QEMU_CAPS_KVM, + QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_OBJECT_IOTHREAD); =20 DO_TEST("numatune-memory", NONE); DO_TEST_PARSE_ERROR("numatune-memory-invalid-nodeset", NONE); @@ -1682,10 +1692,11 @@ mymain(void) QEMU_CAPS_IDE_CD, QEMU_CAPS_BLOCKIO); =20 DO_TEST("video-device-pciaddr-default", - QEMU_CAPS_KVM, QEMU_CAPS_VNC, + QEMU_CAPS_KVM, + QEMU_CAPS_VNC, + QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_DEVICE_PCI_BRIDGE); + QEMU_CAPS_DEVICE_QXL); DO_TEST("video-vga-nodevice", QEMU_CAPS_DEVICE_VGA); DO_TEST("video-vga-device", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -1785,9 +1796,15 @@ mymain(void) DO_TEST_PARSE_ERROR("pci-slot-invalid", NONE); DO_TEST_PARSE_ERROR("pci-function-invalid", NONE); =20 - DO_TEST("pci-autoadd-addr", QEMU_CAPS_DEVICE_PCI_BRIDGE, + DO_TEST("pci-bridge", + QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_VNC, + QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST("pci-autoadd-addr", + QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("pci-autoadd-idx", QEMU_CAPS_DEVICE_PCI_BRIDGE, + DO_TEST("pci-autoadd-idx", + QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("pci-autofill-addr", QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("pci-many", @@ -1796,16 +1813,19 @@ mymain(void) DO_TEST("pci-bridge-many-disks", QEMU_CAPS_DEVICE_PCI_BRIDGE); DO_TEST("pcie-root", - QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420); + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_ICH9_AHCI, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_QXL); DO_TEST("q35", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, + QEMU_CAPS_PCI_MULTIFUNCTION, + QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST_PARSE_ERROR("q35-dmi-bad-address1", @@ -1832,7 +1852,8 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, + QEMU_CAPS_PCI_MULTIFUNCTION, + QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("q35-usb2-multi", @@ -1840,7 +1861,8 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, + QEMU_CAPS_PCI_MULTIFUNCTION, + QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("q35-usb2-reorder", @@ -1848,7 +1870,8 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, + QEMU_CAPS_PCI_MULTIFUNCTION, + QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); /* verify that devices with pcie capability are assigned to a pcie slo= t */ @@ -2020,7 +2043,8 @@ mymain(void) QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, + QEMU_CAPS_PCI_MULTIFUNCTION, + QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI); /* Make sure the user can always override libvirt's default device * placement policy by providing an explicit PCI address */ @@ -2190,7 +2214,8 @@ mymain(void) QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420); + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-virt-2.6-virtio-pci-default", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, @@ -2466,12 +2491,15 @@ mymain(void) QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); =20 DO_TEST("acpi-table", NONE); - DO_TEST("intel-iommu", QEMU_CAPS_DEVICE_PCI_BRIDGE, + DO_TEST("intel-iommu", + QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_INTEL_IOMMU); - DO_TEST("intel-iommu-machine", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_= MACHINE_OPT, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_MACHINE_IOMMU); + DO_TEST("intel-iommu-machine", + QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_MACHINE_OPT, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, + QEMU_CAPS_MACHINE_IOMMU); =20 DO_TEST("cpu-hotplug-startup", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); =20 diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy-q35.xml b/= tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy-q35.xml new file mode 100644 index 0000000..b94ad85 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy-q35.xml @@ -0,0 +1,32 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + +
+ + +
+ + + + + + + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bootindex-floppy-q35.x= ml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-bootindex-floppy-q35.xml new file mode 100644 index 0000000..b94ad85 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-bootindex-floppy-q35.xml @@ -0,0 +1,32 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + +
+ + +
+ + + + + + + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-machine.xm= l b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-machine.xml new file mode 100644 index 0000000..de921f6 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-machine.xml @@ -0,0 +1,26 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + +
+ + + + + + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml b/tests= /qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml index 61de009..6769bac 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml @@ -43,195 +43,163 @@
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + - - +
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
- + -
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-many.xml b/tests/q= emuxml2xmloutdata/qemuxml2xmlout-pci-many.xml new file mode 100644 index 0000000..375ff14 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-many.xml @@ -0,0 +1,214 @@ + + fdr-br + 3ec6cbe1-b5a2-4515-b800-31a61855df41 + 2097152 + 2097152 + 2 + + hvm + + + + + + + + + destroy + restart + restart + + /usr/libexec/qemu-kvm + + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + +
+ + +
+ + + + +