From nobody Thu May 15 23:07:38 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.zohomail.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: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1504804418935179.921496131431; Thu, 7 Sep 2017 10:13:38 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F6CAC04B924; Thu, 7 Sep 2017 17:13:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3DBDD6BF94; Thu, 7 Sep 2017 17:13:37 +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 0B14E62CEC; Thu, 7 Sep 2017 17:13:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v87H0NBO015796 for ; Thu, 7 Sep 2017 13:00:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id E18A119F1A; Thu, 7 Sep 2017 17:00:23 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.219]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4339C61343 for ; Thu, 7 Sep 2017 17:00:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5F6CAC04B924 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 7 Sep 2017 19:00:13 +0200 Message-Id: <20170907170013.13474-3-abologna@redhat.com> In-Reply-To: <20170907170013.13474-1-abologna@redhat.com> References: <20170907170013.13474-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/2] conf: Add all controllers using virDomainControllerInsert() 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-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 07 Sep 2017 17:13:38 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Doing so is smarter than just appending them, because it takes the controller index into account and will prevent problematic situations such as a PCI Bridge being listed before the PCI controller it's supposed to be plugged into, which QEMU can't cope with. Although the QEMU command line for affected guests will be altered, none of the changes should impact the guest ABI. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1479674 Signed-off-by: Andrea Bolognani --- src/conf/domain_conf.c | 2 +- .../qemuxml2argv-channel-virtio-default.args | 2 +- .../qemuxml2argv-channel-virtio-unix.args | 2 +- .../qemuxml2argv-chardev-reconnect.args | 2 +- .../qemuxml2argv-pci-autoadd-idx.args | 16 ++++++++-------- .../qemuxml2argv-pseries-many-buses-2.args | 4 ++-- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 6 +++--- ...2xmlout-aarch64-virtio-pci-manual-addresses.xml | 6 +++--- .../qemuxml2xmlout-channel-virtio-auto.xml | 2 +- ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 6 +++--- .../qemuxml2xmlout-pci-autoadd-idx.xml | 22 +++++++++++-------= ---- .../qemuxml2xmlout-pseries-many-buses-2.xml | 6 +++--- .../qemuxml2xmlout-pseries-phb-default-missing.xml | 8 ++++---- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b1b9d161c..388701680 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16845,7 +16845,7 @@ virDomainDefAddController(virDomainDefPtr def, int = type, int idx, int model) cont->idx =3D idx; cont->model =3D model; =20 - if (VIR_APPEND_ELEMENT_COPY(def->controllers, def->ncontrollers, cont)= < 0) + if (virDomainControllerInsert(def, cont) < 0) goto error; =20 return cont; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.arg= s b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args index 1d1501b39..4ebca6e06 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args @@ -19,8 +19,8 @@ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ -no-acpi \ -boot c \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b= /tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args index 8e0452a9f..baed9c853 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args @@ -19,8 +19,8 @@ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ -no-acpi \ -boot c \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args b/t= ests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args index 8c6586e48..f4f35b07e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-chardev-reconnect.args @@ -19,8 +19,8 @@ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ -no-acpi \ -boot c \ --device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ -usb \ -chardev socket,id=3Dcharsmartcard0,path=3D/tmp/channel/asdf,reconnect=3D2= 0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args b/tes= ts/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args index 6b2f21bba..5e8c57bd5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args @@ -17,14 +17,14 @@ QEMU_AUDIO_DRV=3Dnone \ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ -boot c \ --device pci-bridge,chassis_nr=3D8,id=3Dpci.8,bus=3Dpci.0,addr=3D0x3 \ --device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x4 \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.0,addr=3D0x5 \ --device pci-bridge,chassis_nr=3D3,id=3Dpci.3,bus=3Dpci.0,addr=3D0x6 \ --device pci-bridge,chassis_nr=3D4,id=3Dpci.4,bus=3Dpci.0,addr=3D0x7 \ --device pci-bridge,chassis_nr=3D5,id=3Dpci.5,bus=3Dpci.0,addr=3D0x8 \ --device pci-bridge,chassis_nr=3D6,id=3Dpci.6,bus=3Dpci.0,addr=3D0x9 \ --device pci-bridge,chassis_nr=3D7,id=3Dpci.7,bus=3Dpci.0,addr=3D0xa \ +-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 \ +-device pci-bridge,chassis_nr=3D3,id=3Dpci.3,bus=3Dpci.0,addr=3D0x5 \ +-device pci-bridge,chassis_nr=3D4,id=3Dpci.4,bus=3Dpci.0,addr=3D0x6 \ +-device pci-bridge,chassis_nr=3D5,id=3Dpci.5,bus=3Dpci.0,addr=3D0x7 \ +-device pci-bridge,chassis_nr=3D6,id=3Dpci.6,bus=3Dpci.0,addr=3D0x8 \ +-device pci-bridge,chassis_nr=3D7,id=3Dpci.7,bus=3Dpci.0,addr=3D0x9 \ +-device pci-bridge,chassis_nr=3D8,id=3Dpci.8,bus=3Dpci.0,addr=3D0xa \ -usb \ -drive file=3D/var/iso/f18kde.iso,format=3Draw,if=3Dnone,media=3Dcdrom,\ id=3Ddrive-ide0-1-0,readonly=3Don \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args = b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args index 13fed02f8..1a78db45f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args @@ -18,5 +18,5 @@ QEMU_AUDIO_DRV=3Dnone \ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ -boot c \ --device spapr-pci-host-bridge,index=3D1,id=3Dpci.2 \ --device spapr-pci-host-bridge,index=3D2,id=3Dpci.1 +-device spapr-pci-host-bridge,index=3D1,id=3Dpci.1 \ +-device spapr-pci-host-bridge,index=3D2,id=3Dpci.2 diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-def= ault.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-defau= lt.xml index e5496424b..3c0b71dde 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml @@ -32,9 +32,6 @@
- -
- @@ -65,6 +62,9 @@
+ +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-man= ual-addresses.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-= pci-manual-addresses.xml index 83d8dcc4a..ee9ec022c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-add= resses.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-add= resses.xml @@ -41,14 +41,14 @@
- -
-
+ +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xm= l b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml index 6fd035815..c2c07732b 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml @@ -31,10 +31,10 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-a= ddress.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-a= ddress.xml index 8e93056ee..998cbb5aa 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.= xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.= xml @@ -22,6 +22,9 @@
+ +
+
@@ -29,9 +32,6 @@
- -
- diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml b/= tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml index c6437391c..f44398d6c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml @@ -32,45 +32,45 @@
- - - -
- -
+
-
+
-
+
-
+
-
+
-
+
+
+ + + +
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.x= ml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.xml index 14f3e3624..7e0bb2053 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-buses-2.xml @@ -18,15 +18,15 @@ - + - - + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-default-mi= ssing.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-default-mis= sing.xml index 62708b4a4..2c1e64e88 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-default-missing.x= ml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-phb-default-missing.x= ml @@ -14,6 +14,10 @@ destroy /usr/bin/qemu-system-ppc64 + + + + @@ -23,10 +27,6 @@ - - - - --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list