From patchwork Thu Jan 28 20:30:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 60765 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp721539lbb; Thu, 28 Jan 2016 13:07:27 -0800 (PST) X-Received: by 10.140.104.146 with SMTP id a18mr6294648qgf.59.1454015247577; Thu, 28 Jan 2016 13:07:27 -0800 (PST) Return-Path: Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com. [209.132.183.24]) by mx.google.com with ESMTPS id d66si11530398qkj.38.2016.01.28.13.07.24 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Jan 2016 13:07:27 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.24 as permitted sender) client-ip=209.132.183.24; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.24 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com 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 u0SL3I0l013720; Thu, 28 Jan 2016 16:03:19 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u0SKUOhO026862 for ; Thu, 28 Jan 2016 15:30:24 -0500 Received: from colepc.redhat.com (ovpn-113-198.phx2.redhat.com [10.3.113.198]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0SKUGKp010886; Thu, 28 Jan 2016 15:30:23 -0500 From: Cole Robinson To: libvirt-list@redhat.com Date: Thu, 28 Jan 2016 15:30:13 -0500 Message-Id: <3acc622e20aa550df5227dd9f9822d8aa5143565.1454011611.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Thu, 28 Jan 2016 16:03:03 -0500 Subject: [libvirt] [PATCH 8/9] tests: qemuxml2xml: assign device addresses 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 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com We use the PreFormat callback for this. Many test cases need to be extended to pass in proper qemuCaps flags so AssignAddresses doesn't throw errors. One test case (pcie-root-port-too-many) is dropped, since it was meant only for checking an error condition in qemuxml2argv, and one we add in AssignAddresses it errors here too. Long term I think AssignAddresses should be handled in qemu's PostParse callback, but that's not entirely straightforward. Handling it here means we can get the test suite churn over with. --- .../qemuxml2xmlout-balloon-device-auto.xml | 12 +- .../qemuxml2xmlout-balloon-device-period.xml | 8 +- .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 12 +- .../qemuxml2xmlout-bios-nvram.xml | 12 +- .../qemuxml2xmlout-blkdeviotune.xml | 12 +- .../qemuxml2xmlout-blkiotune-device.xml | 12 +- .../qemuxml2xmlout-blkiotune.xml | 12 +- .../qemuxml2xmlout-boot-cdrom.xml | 8 +- .../qemuxml2xmlout-boot-floppy.xml | 8 +- ...muxml2xmlout-boot-menu-disable-with-timeout.xml | 12 +- .../qemuxml2xmlout-boot-menu-disable.xml | 12 +- ...emuxml2xmlout-boot-menu-enable-with-timeout.xml | 12 +- .../qemuxml2xmlout-boot-multi.xml | 12 +- .../qemuxml2xmlout-boot-network.xml | 8 +- .../qemuxml2xmlout-boot-order.xml | 14 +- .../qemuxml2xmlout-channel-guestfwd.xml | 12 +- .../qemuxml2xmlout-channel-virtio-auto.xml | 29 ++- .../qemuxml2xmlout-channel-virtio-state-active.xml | 12 +- ...emuxml2xmlout-channel-virtio-state-inactive.xml | 12 +- .../qemuxml2xmlout-channel-virtio.xml | 12 +- .../qemuxml2xmlout-chardev-label.xml | 13 +- .../qemuxml2xmlout-clock-catchup.xml | 12 +- .../qemuxml2xmlout-clock-localtime.xml | 8 +- .../qemuxml2xmlout-clock-timer-hyperv-rtc.xml | 8 +- .../qemuxml2xmlout-clock-utc.xml | 8 +- .../qemuxml2xmlout-console-compat-auto.xml | 12 +- .../qemuxml2xmlout-console-compat.xml | 8 +- .../qemuxml2xmlout-console-compat2.xml | 12 +- .../qemuxml2xmlout-console-virtio-many.xml | 16 +- .../qemuxml2xmlout-console-virtio.xml | 16 +- .../qemuxml2xmlout-controller-usb-order.xml | 4 +- .../qemuxml2xmlout-cpu-empty.xml | 8 +- .../qemuxml2xmlout-cpu-eoi-disabled.xml | 8 +- .../qemuxml2xmlout-cpu-eoi-enabled.xml | 8 +- .../qemuxml2xmlout-cpu-host-kvmclock.xml | 8 +- .../qemuxml2xmlout-cpu-host-model-features.xml | 12 +- ...emuxml2xmlout-cpu-host-passthrough-features.xml | 12 +- .../qemuxml2xmlout-cpu-kvmclock.xml | 8 +- .../qemuxml2xmlout-cpu-numa-disjoint.xml | 8 +- .../qemuxml2xmlout-cpu-numa-disordered.xml | 8 +- .../qemuxml2xmlout-cpu-numa-memshared.xml | 8 +- .../qemuxml2xmlout-cpu-numa-no-memory-element.xml | 8 +- .../qemuxml2xmlout-cpu-numa1.xml | 8 +- .../qemuxml2xmlout-cpu-numa2.xml | 8 +- .../qemuxml2xmlout-cputune-iothreads.xml | 12 +- ...l2xmlout-cputune-iothreadsched-zeropriority.xml | 12 +- .../qemuxml2xmlout-cputune-iothreadsched.xml | 12 +- .../qemuxml2xmlout-cputune-numatune.xml | 4 +- .../qemuxml2xmlout-cputune-zero-shares.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml | 12 +- .../qemuxml2xmlout-default-kvm-host-arch.xml | 8 +- .../qemuxml2xmlout-default-qemu-host-arch.xml | 8 +- .../qemuxml2xmlout-disk-active-commit.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml | 12 +- .../qemuxml2xmlout-disk-backing-chains-active.xml | 13 +- ...qemuxml2xmlout-disk-backing-chains-inactive.xml | 13 +- .../qemuxml2xmlout-disk-cdrom-empty.xml | 8 +- .../qemuxml2xmlout-disk-cdrom.xml | 8 +- .../qemuxml2xmlout-disk-copy_on_read.xml | 13 +- .../qemuxml2xmlout-disk-drive-boot-cdrom.xml | 8 +- .../qemuxml2xmlout-disk-drive-boot-disk.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-directsync.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-unsafe.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-v2-none.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-v2-wb.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-v2-wt.xml | 8 +- .../qemuxml2xmlout-disk-drive-copy-on-read.xml | 12 +- .../qemuxml2xmlout-disk-drive-discard.xml | 12 +- ...xml2xmlout-disk-drive-error-policy-enospace.xml | 8 +- ...qemuxml2xmlout-disk-drive-error-policy-stop.xml | 8 +- ...out-disk-drive-error-policy-wreport-rignore.xml | 8 +- .../qemuxml2xmlout-disk-drive-fat.xml | 12 +- .../qemuxml2xmlout-disk-drive-fmt-qcow.xml | 8 +- .../qemuxml2xmlout-disk-drive-network-gluster.xml | 6 +- ...emuxml2xmlout-disk-drive-network-iscsi-auth.xml | 6 +- .../qemuxml2xmlout-disk-drive-network-iscsi.xml | 6 +- ...emuxml2xmlout-disk-drive-network-nbd-export.xml | 9 +- ...l2xmlout-disk-drive-network-nbd-ipv6-export.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-nbd-unix.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-nbd.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-rbd-auth.xml | 9 +- ...uxml2xmlout-disk-drive-network-rbd-ceph-env.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-rbd.xml | 12 +- .../qemuxml2xmlout-disk-drive-network-sheepdog.xml | 9 +- .../qemuxml2xmlout-disk-floppy.xml | 8 +- .../qemuxml2xmlout-disk-many.xml | 8 +- .../qemuxml2xmlout-disk-mirror-active.xml | 14 +- .../qemuxml2xmlout-disk-mirror-inactive.xml | 14 +- .../qemuxml2xmlout-disk-mirror-old-inactive.xml | 14 +- .../qemuxml2xmlout-disk-mirror-old.xml | 14 +- .../qemuxml2xmlout-disk-scsi-device-auto.xml | 16 +- .../qemuxml2xmlout-disk-scsi-device.xml | 16 +- .../qemuxml2xmlout-disk-scsi-disk-vpd.xml | 16 +- ...muxml2xmlout-disk-scsi-lun-passthrough-sgio.xml | 16 +- .../qemuxml2xmlout-disk-scsi-megasas.xml | 16 +- .../qemuxml2xmlout-disk-scsi-virtio-scsi.xml | 16 +- .../qemuxml2xmlout-disk-scsi-vscsi.xml | 16 +- .../qemuxml2xmlout-disk-source-pool-mode.xml | 12 +- .../qemuxml2xmlout-disk-source-pool.xml | 12 +- .../qemuxml2xmlout-disk-usb-device.xml | 12 +- ...qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml | 9 +- .../qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml | 9 +- ...qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml | 9 +- .../qemuxml2xmlout-disk-virtio-scsi-num_queues.xml | 9 +- .../qemuxml2xmlout-disk-virtio.xml | 10 +- .../qemuxml2xmlout-disk-xenvbd.xml | 8 +- .../qemuxml2xmlout-encrypted-disk.xml | 8 +- .../qemuxml2xmlout-eoi-disabled.xml | 8 +- .../qemuxml2xmlout-eoi-enabled.xml | 8 +- .../qemuxml2xmlout-event_idx.xml | 13 +- .../qemuxml2xmlout-floppy-drive-fat.xml | 12 +- .../qemuxml2xmlout-graphics-listen-network.xml | 13 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 13 +- .../qemuxml2xmlout-graphics-sdl-fullscreen.xml | 9 +- .../qemuxml2xmlout-graphics-sdl.xml | 9 +- .../qemuxml2xmlout-graphics-spice-compression.xml | 14 +- .../qemuxml2xmlout-graphics-spice-qxl-vga.xml | 14 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 4 +- .../qemuxml2xmlout-graphics-spice.xml | 14 +- .../qemuxml2xmlout-graphics-vnc-sasl.xml | 9 +- .../qemuxml2xmlout-graphics-vnc-tls.xml | 9 +- .../qemuxml2xmlout-graphics-vnc-websocket.xml | 5 +- .../qemuxml2xmlout-graphics-vnc.xml | 9 +- .../qemuxml2xmlout-hostdev-pci-address.xml | 9 +- ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 20 +- .../qemuxml2xmlout-hostdev-scsi-large-unit.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-lsi.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-rawio.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-readonly.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-sgio.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-shareable.xml | 16 +- ...muxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml | 16 +- .../qemuxml2xmlout-hostdev-usb-address.xml | 8 +- .../qemuxml2xmlout-hostdev-vfio.xml | 13 +- .../qemuxml2xmlout-hugepages-pages.xml | 12 +- .../qemuxml2xmlout-hugepages-pages2.xml | 12 +- .../qemuxml2xmlout-hugepages-pages3.xml | 12 +- .../qemuxml2xmlout-hugepages-shared.xml | 12 +- .../qemuxml2xmlout-hugepages.xml | 12 +- .../qemuxml2xmlout-hyperv-off.xml | 8 +- .../qemuxml2xmlout-hyperv-panic.xml | 4 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml | 4 +- .../qemuxml2xmlout-input-usbmouse.xml | 8 +- .../qemuxml2xmlout-input-usbtablet.xml | 8 +- .../qemuxml2xmlout-interface-driver.xml | 13 +- .../qemuxml2xmlout-iothreads-disk-virtio-ccw.xml | 1 + .../qemuxml2xmlout-iothreads-disk.xml | 9 +- .../qemuxml2xmlout-iothreads-ids-partial.xml | 8 +- .../qemuxml2xmlout-iothreads-ids.xml | 8 +- .../qemuxml2xmlout-iothreads.xml | 8 +- .../qemuxml2xmlout-kvm-features-off.xml | 8 +- .../qemuxml2xmlout-kvm-features.xml | 4 +- .../qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml | 4 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml | 12 +- .../qemuxml2xmlout-machine-core-off.xml | 8 +- .../qemuxml2xmlout-machine-core-on.xml | 8 +- .../qemuxml2xmlout-memory-hotplug-dimm.xml | 12 +- .../qemuxml2xmlout-memory-hotplug-nonuma.xml | 8 +- .../qemuxml2xmlout-memory-hotplug.xml | 12 +- .../qemuxml2xmlout-memtune-unlimited.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml | 12 +- .../qemuxml2xmlout-metadata-duplicate.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-migrate.xml | 8 +- .../qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml | 12 +- .../qemuxml2xmlout-misc-acpi.xml | 8 +- .../qemuxml2xmlout-misc-disable-s3.xml | 8 +- .../qemuxml2xmlout-misc-disable-suspends.xml | 8 +- .../qemuxml2xmlout-misc-enable-s4.xml | 8 +- .../qemuxml2xmlout-misc-no-reboot.xml | 8 +- .../qemuxml2xmlout-misc-uuid.xml | 8 +- .../qemuxml2xmlout-net-bandwidth.xml | 4 +- .../qemuxml2xmlout-net-bandwidth2.xml | 4 +- .../qemuxml2xmlout-net-eth-ifname.xml | 9 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml | 9 +- .../qemuxml2xmlout-net-hostdev-vfio.xml | 13 +- .../qemuxml2xmlout-net-hostdev.xml | 13 +- .../qemuxml2xmlout-net-midonet.xml | 13 +- .../qemuxml2xmlout-net-openvswitch.xml | 13 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml | 13 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml | 9 +- .../qemuxml2xmlout-net-vhostuser.xml | 11 +- .../qemuxml2xmlout-net-virtio-device.xml | 13 +- .../qemuxml2xmlout-net-virtio-disable-offloads.xml | 13 +- ...qemuxml2xmlout-net-virtio-network-portgroup.xml | 15 +- .../qemuxml2xmlout-net-virtio.xml | 9 +- .../qemuxml2xmlout-nographics-vga.xml | 8 +- .../qemuxml2xmlout-nosharepages.xml | 8 +- ...emuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml | 12 +- ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 12 +- .../qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml | 12 +- ...emuxml2xmlout-numad-static-vcpu-no-numatune.xml | 12 +- .../qemuxml2xmlout-numatune-auto-prefer.xml | 8 +- .../qemuxml2xmlout-numatune-memnode-no-memory.xml | 8 +- .../qemuxml2xmlout-numatune-memnode.xml | 8 +- .../qemuxml2xmlout-panic-double.xml | 4 +- .../qemuxml2xmlout-panic-isa.xml | 12 +- .../qemuxml2xmlout-panic-no-address.xml | 12 +- .../qemuxml2xmlout-panic-pseries.xml | 8 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml | 12 +- .../qemuxml2xmlout-parallel-tcp.xml | 8 +- .../qemuxml2xmlout-pci-autoadd-addr.xml | 35 ++++ .../qemuxml2xmlout-pci-autoadd-idx.xml | 41 +++- .../qemuxml2xmlout-pci-bridge-many-disks.xml | 124 +++++++++++- .../qemuxml2xmlout-pci-bridge.xml | 44 ++++- .../qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml | 16 +- .../qemuxml2xmlout-pci-serial-dev-chardev.xml | 12 +- .../qemuxml2xmlout-pcie-root-port-too-many.xml | 62 ------ .../qemuxml2xmlout-pcie-root-port.xml | 23 ++- .../qemuxml2xmlout-pcie-root.xml | 15 +- .../qemuxml2xmlout-pcie-switch-downstream-port.xml | 69 +++++-- .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 34 +++- .../qemuxml2xmlout-pcihole64-gib.xml | 8 +- .../qemuxml2xmlout-pcihole64-none.xml | 8 +- .../qemuxml2xmlout-pcihole64-q35.xml | 16 +- .../qemuxml2xmlout-pcihole64.xml | 8 +- .../qemuxml2xmlout-pmu-feature-off.xml | 4 +- .../qemuxml2xmlout-pmu-feature.xml | 4 +- .../qemuxml2xmlout-pseries-nvram.xml | 4 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 8 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 8 +- .../qemuxml2xmlout-pv-spinlock-disabled.xml | 8 +- .../qemuxml2xmlout-pv-spinlock-enabled.xml | 8 +- .../qemuxml2xmlout-q35-usb2-multi.xml | 28 ++- .../qemuxml2xmlout-q35-usb2-reorder.xml | 28 ++- .../qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml | 14 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 22 ++- .../qemuxml2xmlout-qemu-ns-no-env.xml | 8 +- .../qemuxml2xmlout-reboot-timeout-disabled.xml | 4 +- .../qemuxml2xmlout-reboot-timeout-enabled.xml | 4 +- .../qemuxml2xmlout-restore-v2.xml | 8 +- .../qemuxml2xmlout-s390-defaultconsole.xml | 3 +- .../qemuxml2xmlout-seclabel-dac-none.xml | 12 +- .../qemuxml2xmlout-seclabel-device-multiple.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-baselabel.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-labelskip.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-none.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-override.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-relabel.xml | 12 +- .../qemuxml2xmlout-seclabel-none.xml | 12 +- .../qemuxml2xmlout-seclabel-static-labelskip.xml | 12 +- .../qemuxml2xmlout-seclabel-static.xml | 12 +- .../qemuxml2xmlout-serial-dev.xml | 8 +- .../qemuxml2xmlout-serial-file.xml | 8 +- .../qemuxml2xmlout-serial-many.xml | 8 +- .../qemuxml2xmlout-serial-pty.xml | 8 +- .../qemuxml2xmlout-serial-spiceport-nospice.xml | 12 +- .../qemuxml2xmlout-serial-spiceport.xml | 13 +- .../qemuxml2xmlout-serial-target-port-auto.xml | 12 +- .../qemuxml2xmlout-serial-tcp-telnet.xml | 8 +- .../qemuxml2xmlout-serial-tcp.xml | 8 +- .../qemuxml2xmlout-serial-udp.xml | 8 +- .../qemuxml2xmlout-serial-unix.xml | 8 +- .../qemuxml2xmlout-serial-vc.xml | 8 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 14 +- .../qemuxml2xmlout-smbios-multiple-type2.xml | 12 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml | 12 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml | 8 +- .../qemuxml2xmlout-sound-device.xml | 30 ++- tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml | 16 +- .../qemuxml2xmlout-tap-vhost-incorrect.xml | 14 +- .../qemuxml2xmlout-tap-vhost.xml | 13 +- .../qemuxml2xmlout-tpm-passthrough.xml | 8 +- .../qemuxml2xmlout-usb-ich9-ehci-addr.xml | 25 ++- .../qemuxml2xmlout-usb-redir-filter-version.xml | 8 +- .../qemuxml2xmlout-usb-redir-filter.xml | 4 +- .../qemuxml2xmlout-usb-redir.xml | 4 +- .../qemuxml2xmlout-vcpu-placement-static.xml | 3 + .../qemuxml2xmlout-vhost_queues.xml | 13 +- .../qemuxml2xmlout-video-virtio-gpu-device.xml | 13 +- .../qemuxml2xmlout-video-virtio-gpu-virgl.xml | 13 +- .../qemuxml2xmlout-virtio-input-passthrough.xml | 9 +- .../qemuxml2xmlout-virtio-input.xml | 16 +- .../qemuxml2xmlout-virtio-lun.xml | 13 +- .../qemuxml2xmlout-virtio-rng-egd.xml | 9 +- .../qemuxml2xmlout-virtio-rng-random.xml | 9 +- .../qemuxml2xmloutdata/qemuxml2xmlout-watchdog.xml | 8 +- tests/qemuxml2xmltest.c | 220 ++++++++++++++++----- 284 files changed, 2745 insertions(+), 829 deletions(-) delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-too-many.xml -- 2.5.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml index d9efca2..5cf3807 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml @@ -19,11 +19,17 @@
- + +
+ - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-period.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-period.xml index 8a96462..9220369 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-period.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-period.xml @@ -19,9 +19,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml index 0eee88c..e5bfe7c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml @@ -25,8 +25,12 @@
- - + +
+ + +
+ @@ -37,6 +41,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml index 0eee88c..e5bfe7c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml @@ -25,8 +25,12 @@
- - + +
+ + +
+ @@ -37,6 +41,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune.xml index 1e1c0e5..0094b27 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune.xml @@ -35,11 +35,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune-device.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune-device.xml index 3b8080d..9b203e0 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune-device.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune-device.xml @@ -38,11 +38,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune.xml index f7efcb9..90170f4 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune.xml @@ -22,11 +22,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-cdrom.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-cdrom.xml index 9c0e667..4642eb4 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-cdrom.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-cdrom.xml @@ -21,8 +21,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy.xml index 390bc67..574e4bc 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy.xml @@ -26,9 +26,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable-with-timeout.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable-with-timeout.xml index 8727c18..bfe3e97 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable-with-timeout.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable-with-timeout.xml @@ -21,11 +21,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable.xml index 8727c18..bfe3e97 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable.xml @@ -21,11 +21,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-enable-with-timeout.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-enable-with-timeout.xml index 82e366c..8c96bbd 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-enable-with-timeout.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-enable-with-timeout.xml @@ -21,11 +21,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-multi.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-multi.xml index 5e029bd..37dcabf 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-multi.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-multi.xml @@ -24,11 +24,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-network.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-network.xml index ad421da..1e3b3c9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-network.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-network.xml @@ -20,8 +20,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-order.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-order.xml index 4a6fbd4..823ddcf 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-order.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-order.xml @@ -32,6 +32,7 @@ +
@@ -40,17 +41,24 @@
- - + +
+ + +
+ +
- + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-guestfwd.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-guestfwd.xml index b5e5c23..099dfe9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-guestfwd.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-guestfwd.xml @@ -19,8 +19,12 @@
- - + +
+ + +
+ @@ -28,6 +32,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml index f2247c3..f208f06 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml @@ -19,20 +19,29 @@
- - - + +
+ + +
+ + +
+
- + +
+ +
-
+
@@ -40,18 +49,20 @@ -
+
-
+
-
+
- + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-active.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-active.xml index a8487cd..d1d59e4 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-active.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-active.xml @@ -20,8 +20,12 @@
- - + +
+ + +
+
@@ -40,6 +44,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-inactive.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-inactive.xml index 037b6e5..9e0b4bc 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-inactive.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-inactive.xml @@ -19,8 +19,12 @@
- - + +
+ + +
+
@@ -39,6 +43,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio.xml index 4ca270d..1a9768d 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio.xml @@ -19,8 +19,12 @@
- - + +
+ + +
+
@@ -31,6 +35,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml index 09094af..ee5d68f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml @@ -14,8 +14,12 @@ destroy /usr/bin/qemu - - + +
+ + +
+ @@ -37,11 +41,14 @@ - + +
+ +
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-catchup.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-catchup.xml index 1fe968b..28314bf 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-catchup.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-catchup.xml @@ -29,11 +29,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-localtime.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-localtime.xml index 642d276..64a6d65 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-localtime.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-localtime.xml @@ -20,8 +20,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-timer-hyperv-rtc.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-timer-hyperv-rtc.xml index c54af6a..b510b3f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-timer-hyperv-rtc.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-timer-hyperv-rtc.xml @@ -19,10 +19,14 @@ destroy /usr/bin/kvm - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-utc.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-utc.xml index 9da4df0..3e2af3b 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-utc.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-utc.xml @@ -20,8 +20,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml index b3ba4fc..8ebced6 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml @@ -19,8 +19,12 @@
- - + +
+ + +
+ @@ -30,6 +34,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml index 3eaeffa..92cb131 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml @@ -20,8 +20,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml index d79ac9d..dcb86da 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml @@ -20,10 +20,16 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml index 31d2793..3986664 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml @@ -19,9 +19,15 @@
- - - + +
+ + +
+ + +
+ @@ -40,6 +46,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml index f20abf9..1f78bff 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml @@ -19,15 +19,23 @@
- - + +
+ + +
+ - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml index e88b5cf..31b79ea 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml @@ -31,6 +31,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml index d1829d8..6c608f7 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-empty.xml @@ -14,10 +14,14 @@ destroy /usr/bin/qemu-kvm - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml index 59d50d3..7a51e3d 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml @@ -22,10 +22,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml index c2c494b..ae8ab6a 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml @@ -22,10 +22,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml index 98689f3..c2bdad9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml @@ -17,10 +17,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml index 530cc9a..161fcfe 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml @@ -25,11 +25,17 @@ destroy /usr/bin/qemu - - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features.xml index fceb6a6..935f8cd 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features.xml @@ -29,11 +29,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml index 003a1ed..4d222de 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml @@ -19,10 +19,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disjoint.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disjoint.xml index 08662d0..6474002 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disjoint.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disjoint.xml @@ -21,10 +21,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml index 8e35c3d..6df4c90 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml @@ -22,10 +22,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-memshared.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-memshared.xml index 244a615..0795595 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-memshared.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-memshared.xml @@ -21,10 +21,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-no-memory-element.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-no-memory-element.xml index 1c61772..64bab0f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-no-memory-element.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-no-memory-element.xml @@ -21,10 +21,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml index 1c61772..64bab0f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml @@ -21,10 +21,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml index 1c61772..64bab0f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml @@ -21,10 +21,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreads.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreads.xml index 4702dc8..6c95e05 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreads.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreads.xml @@ -30,11 +30,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml index 47580c9..5616c5c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml @@ -30,11 +30,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched.xml index 5177114..22819cf 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched.xml @@ -31,11 +31,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml index 1278b00..ff987e7 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml @@ -22,7 +22,9 @@ destroy /usr/bin/qemu-system-x86_64 - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-zero-shares.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-zero-shares.xml index 1e7f3bc..c52db0d 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-zero-shares.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-zero-shares.xml @@ -27,11 +27,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml index 951fef9..de9c331 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml @@ -27,11 +27,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml index 9fd32ac..6718df3 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml @@ -14,10 +14,14 @@ destroy /usr/bin/kvm - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml index a506b50..cd223f1 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml @@ -14,10 +14,14 @@ destroy /usr/bin/qemu-system-x86_64 - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-active-commit.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-active-commit.xml index 7889248..9822995 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-active-commit.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-active-commit.xml @@ -29,11 +29,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml index bbf5d55..7c35c7a 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml @@ -27,11 +27,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-active.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-active.xml index c4cbf6b..1337dfa 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-active.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-active.xml @@ -25,6 +25,7 @@ +
@@ -57,6 +58,7 @@ +
@@ -65,6 +67,7 @@ +
@@ -82,17 +85,23 @@ +
+
- + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-inactive.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-inactive.xml index 9101111..2c8a233 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-inactive.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-inactive.xml @@ -20,6 +20,7 @@ +
@@ -27,6 +28,7 @@ +
@@ -34,6 +36,7 @@ +
@@ -46,16 +49,22 @@ +
+
- + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml index 705c493..4398680 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml @@ -26,8 +26,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom.xml index 04f4976..0f0dd7f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml index 9c40895..7837510 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml @@ -29,16 +29,21 @@
- + +
+
- + +
+ +
@@ -48,6 +53,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-cdrom.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-cdrom.xml index 80a6978..0d0266b 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-cdrom.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-cdrom.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-disk.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-disk.xml index 809eb80..1bd0576 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-disk.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-boot-disk.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-directsync.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-directsync.xml index 497014f..e4d4a27 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-directsync.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-directsync.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-unsafe.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-unsafe.xml index e247651..8262282 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-unsafe.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-unsafe.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-none.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-none.xml index 2ee3118..8614f09 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-none.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-none.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wb.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wb.xml index 95800b6..0b08af4 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wb.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wb.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wt.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wt.xml index d0364ba..b58e964 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wt.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-cache-v2-wt.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-copy-on-read.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-copy-on-read.xml index 4e33edf..c47d3d0 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-copy-on-read.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-copy-on-read.xml @@ -20,11 +20,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml index df93310..deda117 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml @@ -29,11 +29,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-enospace.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-enospace.xml index 1b9557c..501b586 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-enospace.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-enospace.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-stop.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-stop.xml index 824740d..ef344c9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-stop.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-stop.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml index ba3ee29..e9c8dfa 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fat.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fat.xml index b0d8bdc..a6975d0 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fat.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fat.xml @@ -21,11 +21,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fmt-qcow.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fmt-qcow.xml index d3fdab4..b005aa7 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fmt-qcow.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fmt-qcow.xml @@ -27,8 +27,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-gluster.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-gluster.xml index 0c66e7f..160fd9d 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-gluster.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-gluster.xml @@ -20,6 +20,7 @@ +
@@ -27,8 +28,11 @@ +
- + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml index 5ac4abf..4f0e87f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml @@ -23,6 +23,7 @@ +
@@ -30,8 +31,11 @@ +
- + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml index 31fc9f2..05c7315 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml @@ -20,6 +20,7 @@ +
@@ -27,8 +28,11 @@ +
- + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-export.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-export.xml index 36d8d73..a773db9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-export.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-export.xml @@ -26,9 +26,14 @@ +
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml index 04b7522..fe1d216 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml @@ -26,9 +26,14 @@ +
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml index 48e9e9c..8e3cb9f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml @@ -26,9 +26,14 @@ +
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-unix.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-unix.xml index 7da39e6..c03f217 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-unix.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-unix.xml @@ -26,9 +26,14 @@ +
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd.xml index d7fd1fc..64d9f5d 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd.xml @@ -26,9 +26,14 @@ +
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-auth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-auth.xml index ac2e942..7d58eac 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-auth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-auth.xml @@ -31,9 +31,14 @@ +
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml index 2924969..1637d44 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml @@ -28,9 +28,14 @@ +
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml index ac023ab..1a5f57a 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml @@ -29,9 +29,14 @@ +
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd.xml index b3783db..3a19bde 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-rbd.xml @@ -28,6 +28,7 @@ +
@@ -35,6 +36,7 @@ +
@@ -45,6 +47,7 @@ +
@@ -53,9 +56,14 @@ +
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-sheepdog.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-sheepdog.xml index 001b0cd..ca271d7 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-sheepdog.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-sheepdog.xml @@ -26,9 +26,14 @@ +
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-floppy.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-floppy.xml index 8add406..fbba06c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-floppy.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-floppy.xml @@ -32,9 +32,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-many.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-many.xml index f60aba3..5a378ad 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-many.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-many.xml @@ -38,8 +38,12 @@
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-active.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-active.xml index d0b61cb..3518df8 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-active.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-active.xml @@ -38,6 +38,7 @@ +
@@ -47,12 +48,19 @@ +
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-inactive.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-inactive.xml index 731a4b4..869a134 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-inactive.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-inactive.xml @@ -28,16 +28,24 @@ +
+
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old-inactive.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old-inactive.xml index 731a4b4..869a134 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old-inactive.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old-inactive.xml @@ -28,16 +28,24 @@ +
+
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml index 14732a5..fbed498 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml @@ -38,17 +38,25 @@ +
+
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml index b803f1e..216f25b 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml @@ -24,12 +24,20 @@
- - + +
+ + +
+ - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device.xml index fae9513..2d0a2ef 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device.xml @@ -24,12 +24,20 @@
- - - + +
+ + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml index 13004c1..42c7bcd 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml @@ -30,12 +30,20 @@ ST3567807GD
- - - + +
+ + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml index 676ab97..ab81b60 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml @@ -24,12 +24,20 @@
- - - + +
+ + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-megasas.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-megasas.xml index d8e509f..879ec44 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-megasas.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-megasas.xml @@ -24,12 +24,20 @@
- - - + +
+ + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-virtio-scsi.xml index 0699f51..671e8fe 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-virtio-scsi.xml @@ -24,12 +24,20 @@
- - - + +
+ + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-vscsi.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-vscsi.xml index fa74b62..ccdc578 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-vscsi.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-vscsi.xml @@ -24,12 +24,20 @@
- - - + +
+ + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml index 4f7f3f1..4fe0cc5 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml @@ -39,11 +39,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml index ad6d638..19eea66 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml @@ -35,11 +35,17 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml index 6e132cb..2eef27c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml @@ -23,11 +23,17 @@ - + +
+ - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml index 9a192b7..67d9e73 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml @@ -19,13 +19,18 @@
- + +
+ +
- + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml index a9c2840..9177ba6 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml @@ -19,13 +19,18 @@
- + +
+ +
- + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml index be1454e..9e4b959 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml @@ -19,13 +19,18 @@
- + +
+ +
- + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-num_queues.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-num_queues.xml index 89ea310..c012ab5 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-num_queues.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-num_queues.xml @@ -19,13 +19,18 @@
- + +
+ +
- + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio.xml index b843878..c70fe9b 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio.xml @@ -31,14 +31,20 @@ +
+
- - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml index 088daff..de6ca8b 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml @@ -37,8 +37,12 @@ - - + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml index 6de570a..038a0e7 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml @@ -23,10 +23,14 @@
- + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-disabled.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-disabled.xml index f416737..7e52b46 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-disabled.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-disabled.xml @@ -19,10 +19,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-enabled.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-enabled.xml index 7c9db82..8e86f61 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-enabled.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-enabled.xml @@ -19,10 +19,14 @@ destroy /usr/bin/qemu - + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml index 77c0845..1e9d33c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml @@ -29,16 +29,21 @@
- + +
+
- + +
+ +
@@ -48,6 +53,8 @@ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-floppy-drive-fat.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-floppy-drive-fat.xml index 4e0826f..b472647 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-floppy-drive-fat.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-floppy-drive-fat.xml @@ -21,12 +21,18 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml index bf78ca8..599eda9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml @@ -19,8 +19,12 @@
- - + +
+ + +
+ @@ -29,7 +33,10 @@