From nobody Mon May 13 00:25:21 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705075786117808.0552084790469; Fri, 12 Jan 2024 08:09:46 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0AD451DCA; Fri, 12 Jan 2024 11:09:45 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2BB201DB1; Fri, 12 Jan 2024 11:06:04 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 045D21D37; Fri, 12 Jan 2024 11:05:52 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 834E31CE4 for ; Fri, 12 Jan 2024 11:05:52 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-210-du7GGc67OK2HkVsDrGtIgA-1; Fri, 12 Jan 2024 11:05:50 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 683A5101A52A for ; Fri, 12 Jan 2024 16:05:50 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id D48E33C25 for ; Fri, 12 Jan 2024 16:05:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: du7GGc67OK2HkVsDrGtIgA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 1/7] virDomainDefMaybeAddVirtioSerialController: Reformat hard to read linebreaks Date: Fri, 12 Jan 2024 17:05:41 +0100 Message-ID: <751c9b419c04dd86f56a8bd5fea8f8b13bad4794.1705075252.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: FRHQ7GL2YLW4IGY47ZFD3VG7S37VJLMN X-Message-ID-Hash: FRHQ7GL2YLW4IGY47ZFD3VG7S37VJLMN X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705075787303100001 Format the code the usual way despite having more than 80 columns so that it's easier to read. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 46c808b801..b70b774965 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21874,7 +21874,8 @@ virDomainDefMaybeAddVirtioSerialController(virDomai= nDef *def) idx =3D channel->info.addr.vioserial.controller; if (virDomainDefMaybeAddController(def, - VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, idx, -1) < 0) + VIR_DOMAIN_CONTROLLER_TYPE_= VIRTIO_SERIAL, + idx, -1) < 0) return -1; } } @@ -21884,12 +21885,12 @@ virDomainDefMaybeAddVirtioSerialController(virDom= ainDef *def) if (console->targetType =3D=3D VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_= VIRTIO) { int idx =3D 0; - if (console->info.type =3D=3D - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL) + if (console->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_V= IRTIO_SERIAL) idx =3D console->info.addr.vioserial.controller; if (virDomainDefMaybeAddController(def, - VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, idx, -1) < 0) + VIR_DOMAIN_CONTROLLER_TYPE_= VIRTIO_SERIAL, + idx, -1) < 0) return -1; } } --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Mon May 13 00:25:21 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705076631605526.8662129423599; Fri, 12 Jan 2024 08:23:51 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2D4E81DF2; Fri, 12 Jan 2024 11:23:50 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E00911D9F; Fri, 12 Jan 2024 11:06:43 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 005061D38; Fri, 12 Jan 2024 11:06:14 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4D84C1CE4 for ; Fri, 12 Jan 2024 11:05:54 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-314-VczqegkoMR6VHuze0B3jjw-1; Fri, 12 Jan 2024 11:05:51 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AD2DD101A52A for ; Fri, 12 Jan 2024 16:05:51 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF6543C25 for ; Fri, 12 Jan 2024 16:05:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: VczqegkoMR6VHuze0B3jjw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/7] conf: domain: Insert auto-added controllers in same order as in XML parser Date: Fri, 12 Jan 2024 17:05:42 +0100 Message-ID: <60cf57842f63149d40c8ec635090f55c5e945f41.1705075252.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: M2R4OGE4MCGTJZRIWFNFPQNMKIDBG4XG X-Message-ID-Hash: M2R4OGE4MCGTJZRIWFNFPQNMKIDBG4XG X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705076633041100001 'virDomainDefAddController' which is used in code-paths which auto-add controllers to the definition such as 'virDomainDefMaybeAddController', 'virDomainDefAddUSBController', 'qemuDomainDefAddDefaultDevices' was adding the controller at the end of the list. However that is not how the XML parser would order the controller in the list as it uses virDomainControllerInsert grouping them by type and additional properties. This would cause that auto-added controllers would re-order: - between first and any subsequent run of the VM (even on commandline) - after a libvirtd/virtqemud restart - after any update of the definition based on the 'define' operation (e.g. virsh edit) To ensure that the ordering of controllers is identical always use virDomainControllerInsert. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 2 +- .../channel-virtio-default.x86_64-latest.args | 2 +- .../channel-virtio-unix.x86_64-latest.args | 2 +- .../chardev-reconnect.x86_64-latest.args | 2 +- .../pci-autoadd-idx.x86_64-latest.args | 16 +++++++------- .../pseries-many-buses-2.ppc64-latest.args | 4 ++-- .../aarch64-virt-graphics.aarch64-latest.xml | 6 ++--- .../aarch64-virt-headless.aarch64-latest.xml | 6 ++--- .../aarch64-virt-virtio.aarch64-4.2.0.xml | 6 ++--- .../aarch64-virt-virtio.aarch64-latest.xml | 6 ++--- ...rch64-virtio-pci-default.aarch64-4.2.0.xml | 6 ++--- ...ch64-virtio-pci-default.aarch64-latest.xml | 6 ++--- ...io-pci-manual-addresses.aarch64-latest.xml | 6 ++--- .../arm-virt-virtio.aarch64-latest.xml | 6 ++--- .../channel-virtio-auto.x86_64-latest.xml | 2 +- .../channel-virtio-autoadd.x86_64-latest.xml | 2 +- .../channel-virtio-default.x86_64-latest.xml | 6 ++--- .../channel-virtio-unix.x86_64-latest.xml | 6 ++--- .../chardev-reconnect.x86_64-latest.xml | 6 ++--- .../cpu-host-model-kvm.x86_64-4.2.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-5.0.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-5.1.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-5.2.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-6.0.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-6.1.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-6.2.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-7.0.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-7.1.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-7.2.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-8.0.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-8.1.0.xml | 12 +++++----- .../cpu-host-model-kvm.x86_64-latest.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-4.2.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-5.0.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-5.1.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-5.2.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-6.0.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-6.1.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-6.2.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-7.0.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-7.1.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-7.2.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-8.0.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-8.1.0.xml | 12 +++++----- .../cpu-host-model-tcg.x86_64-latest.xml | 12 +++++----- .../disk-floppy-q35.x86_64-latest.xml | 8 +++---- ...dev-scsi-autogen-address.x86_64-latest.xml | 6 ++--- ...f-aarch64-virt-headless.aarch64-latest.xml | 6 ++--- .../hvf-x86_64-q35-headless.x86_64-latest.xml | 6 ++--- ...ach-virt-console-virtio.aarch64-latest.xml | 6 ++--- .../net-isolated-port.x86_64-latest.xml | 12 +++++----- .../pci-autoadd-idx.x86_64-latest.xml | 22 +++++++++---------- .../pcie-expander-bus.x86_64-latest.xml | 10 ++++----- .../pcie-root.x86_64-latest.xml | 12 +++++----- ...cie-switch-upstream-port.x86_64-latest.xml | 10 ++++----- .../pcihole64-q35.x86_64-latest.xml | 12 +++++----- .../pseries-many-buses-2.ppc64-latest.xml | 6 ++--- ...eries-phb-default-missing.ppc64-latest.xml | 8 +++---- .../qemuxml2xmloutdata/q35.x86_64-latest.xml | 12 +++++----- .../riscv64-virt-graphics.riscv64-latest.xml | 6 ++--- .../riscv64-virt-headless.riscv64-latest.xml | 6 ++--- .../user-aliases2.x86_64-latest.xml | 8 +++---- .../watchdog-q35-multiple.x86_64-latest.xml | 12 +++++----- .../x86_64-q35-graphics.x86_64-latest.xml | 6 ++--- .../x86_64-q35-headless.x86_64-latest.xml | 6 ++--- 65 files changed, 295 insertions(+), 295 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b70b774965..2283688ba0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16149,7 +16149,7 @@ virDomainDefAddController(virDomainDef *def, cont->idx =3D idx; cont->model =3D model; - VIR_APPEND_ELEMENT_COPY(def->controllers, def->ncontrollers, cont); + virDomainControllerInsert(def, cont); return cont; } diff --git a/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args index aec67fe1ae..193157ad0a 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -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":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args index 131508cd9a..e7bacb617c 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -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":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ diff --git a/tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args b/= tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args index 4f6ab7d2b9..b86eba21a2 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -chardev socket,id=3Dcharsmartcard0,path=3D/var/lib/libvirt/qemu/channel/t= arget/asdf,reconnect=3D20 \ -device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args b/te= sts/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args index c4731e8e56..aa0a145fea 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-b= r/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pci-bridge","chassis_nr":8,"id":"pci.8","bus":"pci.0",= "addr":"0x3"}' \ --device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0",= "addr":"0x4"}' \ --device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0",= "addr":"0x5"}' \ --device '{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0",= "addr":"0x6"}' \ --device '{"driver":"pci-bridge","chassis_nr":4,"id":"pci.4","bus":"pci.0",= "addr":"0x7"}' \ --device '{"driver":"pci-bridge","chassis_nr":5,"id":"pci.5","bus":"pci.0",= "addr":"0x8"}' \ --device '{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0",= "addr":"0x9"}' \ --device '{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0",= "addr":"0xa"}' \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0",= "addr":"0x3"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0",= "addr":"0x4"}' \ +-device '{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0",= "addr":"0x5"}' \ +-device '{"driver":"pci-bridge","chassis_nr":4,"id":"pci.4","bus":"pci.0",= "addr":"0x6"}' \ +-device '{"driver":"pci-bridge","chassis_nr":5,"id":"pci.5","bus":"pci.0",= "addr":"0x7"}' \ +-device '{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0",= "addr":"0x8"}' \ +-device '{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0",= "addr":"0x9"}' \ +-device '{"driver":"pci-bridge","chassis_nr":8,"id":"pci.8","bus":"pci.0",= "addr":"0xa"}' \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args = b/tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args index 624b34b250..74e81b306c 100644 --- a/tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.2"}' \ --device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.1"}' \ +-device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1"}' \ +-device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.= xml b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml index e00283cd6d..c7bddf4063 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml @@ -42,9 +42,6 @@
- -
- @@ -85,6 +82,9 @@
+ +
+ diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.= xml b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml index 70e84662b1..5029092842 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml @@ -42,9 +42,6 @@
- -
- @@ -80,6 +77,9 @@
+ +
+ diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-4.2.0.xml= b/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-4.2.0.xml index 41091952e2..3c657b4c91 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-4.2.0.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-4.2.0.xml @@ -33,9 +33,6 @@
- -
- @@ -66,6 +63,9 @@
+ +
+ diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-latest.xm= l b/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-latest.xml index 1ea25a01f5..347cf2ba65 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-latest.xml @@ -33,9 +33,6 @@
- -
- @@ -66,6 +63,9 @@
+ +
+ diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.= 2.0.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.2.0= .xml index 41091952e2..3c657b4c91 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.2.0.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.2.0.xml @@ -33,9 +33,6 @@
- -
- @@ -66,6 +63,9 @@
+ +
+ diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-la= test.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-late= st.xml index 1ea25a01f5..347cf2ba65 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-latest.xml @@ -33,9 +33,6 @@
- -
- @@ -66,6 +63,9 @@
+ +
+ diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.a= arch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addr= esses.aarch64-latest.xml index 63c2636f5e..db33608d6d 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.aarch64-= latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.aarch64-= latest.xml @@ -42,9 +42,6 @@
- -
- @@ -60,6 +57,9 @@
+ +
+ diff --git a/tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml b/= tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml index ffe1e4d8b0..1ae2d28ca2 100644 --- a/tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml @@ -34,9 +34,6 @@
- -
- @@ -67,6 +64,9 @@
+ +
+ diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml= b/tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml index 0056916d3a..92c9dc76af 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml @@ -35,10 +35,10 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-autoadd.x86_64-latest.= xml b/tests/qemuxml2xmloutdata/channel-virtio-autoadd.x86_64-latest.xml index 06a9a06705..5e9072ffbf 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-autoadd.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-autoadd.x86_64-latest.xml @@ -32,10 +32,10 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-default.x86_64-latest.= xml b/tests/qemuxml2xmloutdata/channel-virtio-default.x86_64-latest.xml index 8558bf4c82..cb11f31522 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-default.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-default.x86_64-latest.xml @@ -29,13 +29,13 @@
+ +
+
- -
-
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-unix.x86_64-latest.xml= b/tests/qemuxml2xmloutdata/channel-virtio-unix.x86_64-latest.xml index 9cce89d858..2cc17c666a 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-unix.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-unix.x86_64-latest.xml @@ -29,13 +29,13 @@
+ +
+
- -
-
diff --git a/tests/qemuxml2xmloutdata/chardev-reconnect.x86_64-latest.xml b= /tests/qemuxml2xmloutdata/chardev-reconnect.x86_64-latest.xml index a49818488e..1458da0cc2 100644 --- a/tests/qemuxml2xmloutdata/chardev-reconnect.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/chardev-reconnect.x86_64-latest.xml @@ -17,6 +17,9 @@ destroy /usr/bin/qemu-system-x86_64 + +
+
@@ -24,9 +27,6 @@
- -
- diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-4.2.0.xml b= /tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-4.2.0.xml index edfc1696ed..10af5b281b 100644 --- a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-4.2.0.xml +++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-4.2.0.xml @@ -16,12 +16,6 @@ /usr/bin/qemu-system-x86_64 - -
- - -
- @@ -37,6 +31,12 @@
+ +
+ + +
+