From nobody Fri May 16 06:35:52 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1497606614041758.5709846570462;
 Fri, 16 Jun 2017 02:50:14 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 9D7267F3FA;
	Fri, 16 Jun 2017 09:50:12 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 6DB7D9457B;
	Fri, 16 Jun 2017 09:50:12 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 26BEB180BAFD;
	Fri, 16 Jun 2017 09:50:12 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id v5G9o8FV031451 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 16 Jun 2017 05:50:08 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D055C7F35E; Fri, 16 Jun 2017 09:50:08 +0000 (UTC)
Received: from inaba.usersys.redhat.com (ovpn-12-86.pek2.redhat.com
	[10.72.12.86])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 974A17F35C
	for <libvir-list@redhat.com>; Fri, 16 Jun 2017 09:50:07 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9D7267F3FA
Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com;
 dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com;
 spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9D7267F3FA
From: Andrea Bolognani <abologna@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 16 Jun 2017 17:49:03 +0800
Message-Id: <1497606548-18870-20-git-send-email-abologna@redhat.com>
In-Reply-To: <1497606548-18870-1-git-send-email-abologna@redhat.com>
References: <1497606548-18870-1-git-send-email-abologna@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 19/24] tests: Add baseline tests for automatic
	PHB usage
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Fri, 16 Jun 2017 09:50:13 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

These tests demonstrate that, while it's now possible for the
user to create PHB explicitly and manually assign devices to
them, libvirt still defaults to extending the guest PCI
topology using PCI bridges and making suboptimal device
placement choices.

The next few commits will improve on these behaviors and the
tests outputs will automatically be updated to reflect this.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 .../qemuxml2argv-pseries-hostdevs-1.args           |  23 ++++
 .../qemuxml2argv-pseries-hostdevs-1.xml            |  38 +++++++
 .../qemuxml2argv-pseries-hostdevs-2.args           |  24 ++++
 .../qemuxml2argv-pseries-hostdevs-2.xml            |  37 ++++++
 .../qemuxml2argv-pseries-hostdevs-3.args           |  24 ++++
 .../qemuxml2argv-pseries-hostdevs-3.xml            |  31 +++++
 .../qemuxml2argv-pseries-many-buses-1.args         |  22 ++++
 .../qemuxml2argv-pseries-many-buses-1.xml          |  19 ++++
 .../qemuxml2argv-pseries-many-buses-2.args         |  22 ++++
 .../qemuxml2argv-pseries-many-buses-2.xml          |  18 +++
 .../qemuxml2argv-pseries-many-devices.args         |  53 +++++++++
 .../qemuxml2argv-pseries-many-devices.xml          |  48 ++++++++
 tests/qemuxml2argvtest.c                           |  36 ++++++
 .../qemuxml2xmlout-pseries-hostdevs-1.xml          |  46 ++++++++
 .../qemuxml2xmlout-pseries-hostdevs-2.xml          |  47 ++++++++
 .../qemuxml2xmlout-pseries-hostdevs-3.xml          |  49 ++++++++
 .../qemuxml2xmlout-pseries-many-buses-1.xml        |  33 ++++++
 .../qemuxml2xmlout-pseries-many-buses-2.xml        |  34 ++++++
 .../qemuxml2xmlout-pseries-many-devices.xml        | 126 +++++++++++++++++=
++++
 tests/qemuxml2xmltest.c                            |  36 ++++++
 20 files changed, 766 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.=
args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.=
xml
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.=
args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.=
xml
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.=
args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.=
xml
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-=
1.args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-=
1.xml
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-=
2.args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-=
2.xml
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-device=
s.args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-device=
s.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdev=
s-1.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdev=
s-2.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdev=
s-3.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-bu=
ses-1.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-bu=
ses-2.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-de=
vices.xml

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.args b/=
tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.args
new file mode 100644
index 0000000..88eb081
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.args
@@ -0,0 +1,23 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/home/test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-ppc64 \
+-name guest \
+-S \
+-M pseries \
+-m 512 \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s=
ock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \
+-boot c \
+-device vfio-pci,host=3D0001:01:00.0,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x1 \
+-device vfio-pci,host=3D0005:90:01.0,id=3Dhostdev1,bus=3Dpci.0,addr=3D0x2 \
+-device vfio-pci,host=3D0001:01:00.1,id=3Dhostdev2,bus=3Dpci.0,addr=3D0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.xml b/t=
ests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.xml
new file mode 100644
index 0000000..87fe145
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <!-- This hostdev will cause a new PHB to be created because its
+         isolation group is 2 -->
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
+      </source>
+    </hostdev>
+    <!-- This hostdev can't share the PHB that was just created, because
+         its isolation group is 3 -->
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x0'/>
+      </source>
+    </hostdev>
+    <!-- This hostdev will be placed on the first PHB, since its isolation
+         group is 2 just like the first hostdev -->
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x1'/>
+      </source>
+    </hostdev>
+    <controller type=3D'usb' model=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.args b/=
tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.args
new file mode 100644
index 0000000..c43e15d
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.args
@@ -0,0 +1,24 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/home/test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-ppc64 \
+-name guest \
+-S \
+-M pseries \
+-m 512 \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s=
ock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \
+-boot c \
+-device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x1 \
+-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.1,addr=3D0x1 \
+-device vfio-pci,host=3D0001:01:00.0,id=3Dhostdev0,bus=3Dpci.1,addr=3D0x2 \
+-device vfio-pci,host=3D0005:90:01.0,id=3Dhostdev1,bus=3Dpci.0,addr=3D0x2
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.xml b/t=
ests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.xml
new file mode 100644
index 0000000..551b588
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.xml
@@ -0,0 +1,37 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <!-- This device will cause a new PHB to be created because of its
+         address -->
+    <controller type=3D'scsi' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <!-- This hostdev will share the same PHB as the SCSI controller
+         despite being in a separate isolation group, because the
+         address has been requested explicitly by the user -->
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </hostdev>
+    <!-- This hostdev can use neither the PHB that was just created, nor
+         the default one, because its isolation group is 3 -->
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x0'/>
+      </source>
+    </hostdev>
+    <controller type=3D'usb' model=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.args b/=
tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.args
new file mode 100644
index 0000000..99df2e7
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.args
@@ -0,0 +1,24 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/home/test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-ppc64 \
+-name guest \
+-S \
+-M pseries \
+-m 512 \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s=
ock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \
+-boot c \
+-device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x1 \
+-device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.0,addr=3D0x2 \
+-device vfio-pci,host=3D0001:01:00.0,id=3Dhostdev0,bus=3Dpci.2,addr=3D0x1 \
+-device vfio-pci,host=3D0001:01:00.1,id=3Dhostdev1,bus=3Dpci.0,addr=3D0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.xml b/t=
ests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.xml
new file mode 100644
index 0000000..0e61a17
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.xml
@@ -0,0 +1,31 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <!-- This hostdev will cause a new PHB to be created because its
+         isolation group is 2. It will be PHB 2 due to the address -->
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </hostdev>
+    <!-- This hostdev will be placed on the same PHB, since its isolation
+         group is also 2 -->
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x1'/>
+      </source>
+    </hostdev>
+    <controller type=3D'usb' model=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.args =
b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.args
new file mode 100644
index 0000000..bf78fc1
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.args
@@ -0,0 +1,22 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/home/test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-ppc64 \
+-name guest \
+-S \
+-M pseries \
+-m 512 \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s=
ock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \
+-boot c \
+-device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x1 \
+-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.1,addr=3D0x1
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.xml b=
/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.xml
new file mode 100644
index 0000000..c52349d
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.xml
@@ -0,0 +1,19 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <!-- The SCSI controller is plugged into PCI bus 1, but since said bus
+         is not present in the configuration libvirt will have to add it -=
->
+    <controller type=3D'scsi' model=3D'virtio-scsi'>
+      <address type=3D'pci' bus=3D'1' slot=3D'1'/>
+    </controller>
+    <controller type=3D'usb' model=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args =
b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args
new file mode 100644
index 0000000..1cb5831
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args
@@ -0,0 +1,22 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/home/test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-ppc64 \
+-name guest \
+-S \
+-M pseries \
+-m 512 \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s=
ock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \
+-boot c \
+-device spapr-pci-host-bridge,index=3D1,id=3Dpci.2 \
+-device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x1
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.xml b=
/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.xml
new file mode 100644
index 0000000..7065626
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.xml
@@ -0,0 +1,18 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <!-- PCI buses 0 and 2 are present in the configuration, libvirt will
+         have to fill in the blanks and add bus 1 -->
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'pci' index=3D'2' model=3D'pci-root'/>
+    <controller type=3D'usb' model=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.args =
b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.args
new file mode 100644
index 0000000..1db4533
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.args
@@ -0,0 +1,53 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/home/test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-ppc64 \
+-name guest \
+-S \
+-M pseries \
+-m 512 \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s=
ock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \
+-boot c \
+-device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x1 \
+-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \
+-device virtio-scsi-pci,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \
+-device virtio-scsi-pci,id=3Dscsi2,bus=3Dpci.0,addr=3D0x4 \
+-device virtio-scsi-pci,id=3Dscsi3,bus=3Dpci.0,addr=3D0x5 \
+-device virtio-scsi-pci,id=3Dscsi4,bus=3Dpci.0,addr=3D0x6 \
+-device virtio-scsi-pci,id=3Dscsi5,bus=3Dpci.0,addr=3D0x7 \
+-device virtio-scsi-pci,id=3Dscsi6,bus=3Dpci.0,addr=3D0x8 \
+-device virtio-scsi-pci,id=3Dscsi7,bus=3Dpci.0,addr=3D0x9 \
+-device virtio-scsi-pci,id=3Dscsi8,bus=3Dpci.0,addr=3D0xa \
+-device virtio-scsi-pci,id=3Dscsi9,bus=3Dpci.0,addr=3D0xb \
+-device virtio-scsi-pci,id=3Dscsi10,bus=3Dpci.0,addr=3D0xc \
+-device virtio-scsi-pci,id=3Dscsi11,bus=3Dpci.0,addr=3D0xd \
+-device virtio-scsi-pci,id=3Dscsi12,bus=3Dpci.0,addr=3D0xe \
+-device virtio-scsi-pci,id=3Dscsi13,bus=3Dpci.0,addr=3D0xf \
+-device virtio-scsi-pci,id=3Dscsi14,bus=3Dpci.0,addr=3D0x10 \
+-device virtio-scsi-pci,id=3Dscsi15,bus=3Dpci.0,addr=3D0x11 \
+-device virtio-scsi-pci,id=3Dscsi16,bus=3Dpci.0,addr=3D0x12 \
+-device virtio-scsi-pci,id=3Dscsi17,bus=3Dpci.0,addr=3D0x13 \
+-device virtio-scsi-pci,id=3Dscsi18,bus=3Dpci.0,addr=3D0x14 \
+-device virtio-scsi-pci,id=3Dscsi19,bus=3Dpci.0,addr=3D0x15 \
+-device virtio-scsi-pci,id=3Dscsi20,bus=3Dpci.0,addr=3D0x16 \
+-device virtio-scsi-pci,id=3Dscsi21,bus=3Dpci.0,addr=3D0x17 \
+-device virtio-scsi-pci,id=3Dscsi22,bus=3Dpci.0,addr=3D0x18 \
+-device virtio-scsi-pci,id=3Dscsi23,bus=3Dpci.0,addr=3D0x19 \
+-device virtio-scsi-pci,id=3Dscsi24,bus=3Dpci.0,addr=3D0x1a \
+-device virtio-scsi-pci,id=3Dscsi25,bus=3Dpci.0,addr=3D0x1b \
+-device virtio-scsi-pci,id=3Dscsi26,bus=3Dpci.0,addr=3D0x1c \
+-device virtio-scsi-pci,id=3Dscsi27,bus=3Dpci.0,addr=3D0x1d \
+-device virtio-scsi-pci,id=3Dscsi28,bus=3Dpci.0,addr=3D0x1e \
+-device virtio-scsi-pci,id=3Dscsi29,bus=3Dpci.0,addr=3D0x1f \
+-device virtio-scsi-pci,id=3Dscsi30,bus=3Dpci.1,addr=3D0x1 \
+-device virtio-scsi-pci,id=3Dscsi31,bus=3Dpci.1,addr=3D0x2
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.xml b=
/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.xml
new file mode 100644
index 0000000..f3daba4
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <!-- pci-root has 31 slots and there are 32 SCSI controllers here, so
+         libvirt will automatically add at least one more PCI controller -=
->
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'scsi' model=3D'virtio-scsi'/>
+    <controller type=3D'usb' model=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 2b75647..03290c1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1717,6 +1717,42 @@ mymain(void)
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CHARDEV,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
=20
+    DO_TEST("pseries-many-devices",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST("pseries-many-buses-1",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST("pseries-many-buses-2",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST("pseries-hostdevs-1",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
+            QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST("pseries-hostdevs-2",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST("pseries-hostdevs-3",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_DEVICE_VFIO_PCI);
+
     DO_TEST("disk-ide-drive-split",
             QEMU_CAPS_NODEFCONFIG,
             QEMU_CAPS_IDE_CD);
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-1.xml=
 b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-1.xml
new file mode 100644
index 0000000..34defea
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-1.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </hostdev>
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x0'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </hostdev>
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x1'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </hostdev>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-2.xml=
 b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-2.xml
new file mode 100644
index 0000000..62bead5
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-2.xml
@@ -0,0 +1,47 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pci-bridge'>
+      <model name=3D'pci-bridge'/>
+      <target chassisNr=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </hostdev>
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0005' bus=3D'0x90' slot=3D'0x01' function=3D'=
0x0'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </hostdev>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-3.xml=
 b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-3.xml
new file mode 100644
index 0000000..77c0909
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-3.xml
@@ -0,0 +1,49 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pci-bridge'>
+      <model name=3D'pci-bridge'/>
+      <target chassisNr=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
+      <model name=3D'pci-bridge'/>
+      <target chassisNr=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x0'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </hostdev>
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <driver name=3D'vfio'/>
+      <source>
+        <address domain=3D'0x0001' bus=3D'0x01' slot=3D'0x00' function=3D'=
0x1'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </hostdev>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-1.x=
ml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-1.xml
new file mode 100644
index 0000000..9044936
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-1.xml
@@ -0,0 +1,33 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pci-bridge'>
+      <model name=3D'pci-bridge'/>
+      <target chassisNr=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.x=
ml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.xml
new file mode 100644
index 0000000..75dfabf
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pci-bridge'>
+      <model name=3D'pci-bridge'/>
+      <target chassisNr=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.x=
ml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.xml
new file mode 100644
index 0000000..b596fe6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.xml
@@ -0,0 +1,126 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'2' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'3' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'4' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'5' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'6' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x08' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'7' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x09' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'8' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'9' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0b' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'10' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0c' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'11' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0d' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'12' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0e' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'13' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0f' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'14' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x10' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'15' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x11' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'16' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x12' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'17' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x13' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'18' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x14' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'19' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x15' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'20' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x16' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'21' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x17' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'22' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x18' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'23' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x19' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'24' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1a' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'25' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1b' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'26' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1c' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'27' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1d' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'28' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'29' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'30' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'31' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pci-bridge'>
+      <model name=3D'pci-bridge'/>
+      <target chassisNr=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 603a797..a122464 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -682,6 +682,42 @@ mymain(void)
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CHARDEV,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
=20
+    DO_TEST("pseries-many-devices",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST("pseries-many-buses-1",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST("pseries-many-buses-2",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST("pseries-hostdevs-1",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
+            QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST("pseries-hostdevs-2",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST("pseries-hostdevs-3",
+            QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
+            QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
+            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
+            QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_DEVICE_VFIO_PCI);
+
     DO_TEST("balloon-device-auto", NONE);
     DO_TEST("balloon-device-period", NONE);
     DO_TEST("channel-virtio-auto", NONE);
--=20
2.7.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list