From patchwork Sat May 14 21:39:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 67813 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp874094qge; Sat, 14 May 2016 14:45:42 -0700 (PDT) X-Received: by 10.28.0.87 with SMTP id 84mr10061915wma.68.1463262342113; Sat, 14 May 2016 14:45:42 -0700 (PDT) Return-Path: Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com. [209.132.183.39]) by mx.google.com with ESMTPS id ko8si29609387wjc.212.2016.05.14.14.45.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 May 2016 14:45:42 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) client-ip=209.132.183.39; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 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 mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4ELeF4J058118; Sat, 14 May 2016 17:40:16 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u4ELe7Q4021097 for ; Sat, 14 May 2016 17:40:07 -0400 Received: from colepc.redhat.com (ovpn-116-31.phx2.redhat.com [10.3.116.31]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4ELe5f4004941; Sat, 14 May 2016 17:40:06 -0400 From: Cole Robinson To: libvirt-list@redhat.com Date: Sat, 14 May 2016 17:39:59 -0400 Message-Id: <442bcb50901453a1a78552bcd8476d2cd6f560fa.1463261955.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [PATCH 6/4] qemu: address: Remove QEMU_CAPS_DEVICE usage 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 All qemu versions we support have QEMU_CAPS_DEVICE, so checking for it is redundant. Remove the usage. The code diff isn't clear, but all that code is just inindented with no other change. Test cases that hit qemuDomainAssignAddresses but don't have infrastructure for specifying qemuCaps values see lots of churn, since now PCI addresses are in the XML output. --- src/qemu/qemu_domain_address.c | 252 ++++++++++----------- .../disk_snapshot_redefine.xml | 12 +- .../external_vm_redefine.xml | 12 +- tests/domainsnapshotxml2xmlout/full_domain.xml | 12 +- tests/domainsnapshotxml2xmlout/metadata.xml | 12 +- tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-boot-network.xml | 8 +- .../qemuargv2xml-clock-localtime.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 8 +- .../qemuargv2xml-console-compat.xml | 8 +- .../qemuargv2xml-disk-cdrom-empty.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 8 +- .../qemuargv2xml-disk-drive-boot-cdrom.xml | 8 +- .../qemuargv2xml-disk-drive-boot-disk.xml | 8 +- .../qemuargv2xml-disk-drive-cache-directsync.xml | 8 +- .../qemuargv2xml-disk-drive-cache-unsafe.xml | 8 +- .../qemuargv2xml-disk-drive-cache-v2-none.xml | 8 +- .../qemuargv2xml-disk-drive-cache-v2-wb.xml | 8 +- .../qemuargv2xml-disk-drive-cache-v2-wt.xml | 8 +- ...muargv2xml-disk-drive-error-policy-enospace.xml | 8 +- .../qemuargv2xml-disk-drive-error-policy-stop.xml | 8 +- ...xml-disk-drive-error-policy-wreport-rignore.xml | 8 +- .../qemuargv2xml-disk-drive-fmt-qcow.xml | 8 +- .../qemuargv2xml-disk-drive-network-gluster.xml | 6 +- .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 6 +- .../qemuargv2xml-disk-drive-network-iscsi.xml | 6 +- .../qemuargv2xml-disk-drive-network-nbd-export.xml | 9 +- ...argv2xml-disk-drive-network-nbd-ipv6-export.xml | 9 +- .../qemuargv2xml-disk-drive-network-nbd-ipv6.xml | 9 +- .../qemuargv2xml-disk-drive-network-nbd-unix.xml | 9 +- .../qemuargv2xml-disk-drive-network-nbd.xml | 9 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 9 +- ...emuargv2xml-disk-drive-network-rbd-ceph-env.xml | 9 +- .../qemuargv2xml-disk-drive-network-rbd-ipv6.xml | 9 +- .../qemuargv2xml-disk-drive-network-rbd.xml | 12 +- .../qemuargv2xml-disk-drive-network-sheepdog.xml | 9 +- .../qemuargv2xmldata/qemuargv2xml-disk-floppy.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-disk-virtio.xml | 10 +- .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 8 +- .../qemuargv2xml-graphics-sdl-fullscreen.xml | 9 +- .../qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml | 9 +- .../qemuargv2xml-graphics-vnc-policy.xml | 9 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 9 +- .../qemuargv2xml-graphics-vnc-socket.xml | 9 +- .../qemuargv2xml-graphics-vnc-tls.xml | 9 +- .../qemuargv2xml-graphics-vnc-websocket.xml | 5 +- .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 9 +- .../qemuargv2xml-hostdev-pci-address.xml | 9 +- .../qemuargv2xml-hostdev-usb-address.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml | 4 +- .../qemuargv2xml-input-usbmouse.xml | 8 +- .../qemuargv2xml-input-usbtablet.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-kvm-features.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml | 4 +- .../qemuargv2xml-machine-core-off.xml | 8 +- .../qemuargv2xml-machine-core-on.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-migrate.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml | 8 +- .../qemuargv2xml-misc-disable-s3.xml | 8 +- .../qemuargv2xml-misc-disable-suspends.xml | 8 +- .../qemuargv2xml-misc-enable-s4.xml | 8 +- .../qemuargv2xml-misc-no-reboot.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml | 8 +- .../qemuargv2xml-net-eth-ifname.xml | 9 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 9 +- tests/qemuargv2xmldata/qemuargv2xml-net-user.xml | 9 +- tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml | 9 +- .../qemuargv2xml-nographics-vga.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 5 +- .../qemuargv2xml-pseries-nvram.xml | 4 +- .../qemuargv2xml-qemu-ns-no-env.xml | 8 +- .../qemuargv2xml-reboot-timeout-disabled.xml | 4 +- .../qemuargv2xml-reboot-timeout-enabled.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-serial-file.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-serial-many.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml | 8 +- .../qemuargv2xml-serial-tcp-telnet.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-serial-unix.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-smp.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-sound.xml | 16 +- tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 8 +- tests/qemuxml2argvtest.c | 2 +- 93 files changed, 688 insertions(+), 305 deletions(-) -- 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 9c8c262..9d09b3a 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1463,158 +1463,155 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, int ret = -1; virDomainPCIAddressSetPtr addrs = NULL; qemuDomainObjPrivatePtr priv = NULL; + int max_idx = -1; + int nbuses = 0; + size_t i; + int rv; + bool buses_reserved = true; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - int max_idx = -1; - int nbuses = 0; - size_t i; - int rv; - bool buses_reserved = true; - - virDomainPCIConnectFlags flags = VIR_PCI_CONNECT_TYPE_PCI_DEVICE; + virDomainPCIConnectFlags flags = VIR_PCI_CONNECT_TYPE_PCI_DEVICE; - for (i = 0; i < def->ncontrollers; i++) { - if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { - if ((int) def->controllers[i]->idx > max_idx) - max_idx = def->controllers[i]->idx; - } + for (i = 0; i < def->ncontrollers; i++) { + if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { + if ((int) def->controllers[i]->idx > max_idx) + max_idx = def->controllers[i]->idx; } + } - nbuses = max_idx + 1; - - if (nbuses > 0 && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PCI_BRIDGE)) { - virDomainDeviceInfo info; + nbuses = max_idx + 1; - /* 1st pass to figure out how many PCI bridges we need */ - if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, true))) - goto cleanup; + if (nbuses > 0 && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PCI_BRIDGE)) { + virDomainDeviceInfo info; - if (qemuDomainValidateDevicePCISlotsChipsets(def, qemuCaps, - addrs) < 0) - goto cleanup; + /* 1st pass to figure out how many PCI bridges we need */ + if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, true))) + goto cleanup; - for (i = 0; i < addrs->nbuses; i++) { - if (!qemuDomainPCIBusFullyReserved(&addrs->buses[i])) - buses_reserved = false; - } + if (qemuDomainValidateDevicePCISlotsChipsets(def, qemuCaps, + addrs) < 0) + goto cleanup; - /* Reserve 1 extra slot for a (potential) bridge only if buses - * are not fully reserved yet - */ - if (!buses_reserved && - virDomainPCIAddressReserveNextSlot(addrs, &info, flags) < 0) - goto cleanup; + for (i = 0; i < addrs->nbuses; i++) { + if (!qemuDomainPCIBusFullyReserved(&addrs->buses[i])) + buses_reserved = false; + } - if (qemuDomainAssignDevicePCISlots(def, qemuCaps, addrs) < 0) - goto cleanup; + /* Reserve 1 extra slot for a (potential) bridge only if buses + * are not fully reserved yet + */ + if (!buses_reserved && + virDomainPCIAddressReserveNextSlot(addrs, &info, flags) < 0) + goto cleanup; - for (i = 1; i < addrs->nbuses; i++) { - virDomainPCIAddressBusPtr bus = &addrs->buses[i]; + if (qemuDomainAssignDevicePCISlots(def, qemuCaps, addrs) < 0) + goto cleanup; - if ((rv = virDomainDefMaybeAddController( - def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, - i, bus->model)) < 0) - goto cleanup; - /* If we added a new bridge, we will need one more address */ - if (rv > 0 && - virDomainPCIAddressReserveNextSlot(addrs, &info, flags) < 0) - goto cleanup; - } - nbuses = addrs->nbuses; - virDomainPCIAddressSetFree(addrs); - addrs = NULL; + for (i = 1; i < addrs->nbuses; i++) { + virDomainPCIAddressBusPtr bus = &addrs->buses[i]; - } else if (max_idx > 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("PCI bridges are not supported " - "by this QEMU binary")); - goto cleanup; + if ((rv = virDomainDefMaybeAddController( + def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, + i, bus->model)) < 0) + goto cleanup; + /* If we added a new bridge, we will need one more address */ + if (rv > 0 && + virDomainPCIAddressReserveNextSlot(addrs, &info, flags) < 0) + goto cleanup; } + nbuses = addrs->nbuses; + virDomainPCIAddressSetFree(addrs); + addrs = NULL; - if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, false))) - goto cleanup; + } else if (max_idx > 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("PCI bridges are not supported " + "by this QEMU binary")); + goto cleanup; + } - if (qemuDomainSupportsPCI(def, qemuCaps)) { - if (qemuDomainValidateDevicePCISlotsChipsets(def, qemuCaps, - addrs) < 0) - goto cleanup; + if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, false))) + goto cleanup; - if (qemuDomainAssignDevicePCISlots(def, qemuCaps, addrs) < 0) - goto cleanup; + if (qemuDomainSupportsPCI(def, qemuCaps)) { + if (qemuDomainValidateDevicePCISlotsChipsets(def, qemuCaps, + addrs) < 0) + goto cleanup; - for (i = 0; i < def->ncontrollers; i++) { - virDomainControllerDefPtr cont = def->controllers[i]; - int idx = cont->idx; - virPCIDeviceAddressPtr addr; - virDomainPCIControllerOptsPtr options; + if (qemuDomainAssignDevicePCISlots(def, qemuCaps, addrs) < 0) + goto cleanup; - if (cont->type != VIR_DOMAIN_CONTROLLER_TYPE_PCI) - continue; + for (i = 0; i < def->ncontrollers; i++) { + virDomainControllerDefPtr cont = def->controllers[i]; + int idx = cont->idx; + virPCIDeviceAddressPtr addr; + virDomainPCIControllerOptsPtr options; - addr = &cont->info.addr.pci; - options = &cont->opts.pciopts; + if (cont->type != VIR_DOMAIN_CONTROLLER_TYPE_PCI) + continue; - /* set default model name (the actual name of the - * device in qemu) for any controller that doesn't yet - * have it set. - */ - qemuDomainPCIControllerSetDefaultModelName(cont); + addr = &cont->info.addr.pci; + options = &cont->opts.pciopts; - /* set defaults for any other auto-generated config - * options for this controller that haven't been - * specified in config. - */ - switch ((virDomainControllerModelPCI)cont->model) { - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE: - if (options->chassisNr == -1) - options->chassisNr = cont->idx; - break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: - if (options->chassis == -1) - options->chassis = cont->idx; - if (options->port == -1) - options->port = (addr->slot << 3) + addr->function; - break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: - if (options->chassis == -1) - options->chassis = cont->idx; - if (options->port == -1) - options->port = addr->slot; - break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS: - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: - if (options->busNr == -1) - options->busNr = qemuDomainAddressFindNewBusNr(def); - if (options->busNr == -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("No free busNr lower than current " - "lowest busNr is available to " - "auto-assign to bus %d. Must be " - "manually assigned"), - addr->bus); - goto cleanup; - } - break; - case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: - break; - } + /* set default model name (the actual name of the + * device in qemu) for any controller that doesn't yet + * have it set. + */ + qemuDomainPCIControllerSetDefaultModelName(cont); - /* check if every PCI bridge controller's ID is greater than - * the bus it is placed onto - */ - if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE && - idx <= addr->bus) { + /* set defaults for any other auto-generated config + * options for this controller that haven't been + * specified in config. + */ + switch ((virDomainControllerModelPCI)cont->model) { + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE: + if (options->chassisNr == -1) + options->chassisNr = cont->idx; + break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: + if (options->chassis == -1) + options->chassis = cont->idx; + if (options->port == -1) + options->port = (addr->slot << 3) + addr->function; + break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: + if (options->chassis == -1) + options->chassis = cont->idx; + if (options->port == -1) + options->port = addr->slot; + break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: + if (options->busNr == -1) + options->busNr = qemuDomainAddressFindNewBusNr(def); + if (options->busNr == -1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller at index %d (0x%02x) has " - "bus='0x%02x', but bus must be <= index"), - idx, idx, addr->bus); + _("No free busNr lower than current " + "lowest busNr is available to " + "auto-assign to bus %d. Must be " + "manually assigned"), + addr->bus); goto cleanup; } + break; + case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: + break; + } + + /* check if every PCI bridge controller's ID is greater than + * the bus it is placed onto + */ + if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE && + idx <= addr->bus) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("PCI controller at index %d (0x%02x) has " + "bus='0x%02x', but bus must be <= index"), + idx, idx, addr->bus); + goto cleanup; } } } @@ -1681,7 +1678,6 @@ qemuDomainReleaseDeviceAddress(virDomainObjPtr vm, VIR_WARN("Unable to release CCW address on %s", NULLSTR(devstr)); else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) && virDomainPCIAddressReleaseSlot(priv->pciaddrs, &info->addr.pci) < 0) VIR_WARN("Unable to release PCI address on %s", diff --git a/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml index eb7f567..297ca7f 100644 --- a/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml +++ b/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml @@ -70,12 +70,18 @@
- - + +
+ + +
+ - + +
+ 1 diff --git a/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml b/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml index e8e4640..e2e7a40 100644 --- a/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml +++ b/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml @@ -35,12 +35,18 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/domainsnapshotxml2xmlout/full_domain.xml b/tests/domainsnapshotxml2xmlout/full_domain.xml index 7d70a11..0b0b7e0 100644 --- a/tests/domainsnapshotxml2xmlout/full_domain.xml +++ b/tests/domainsnapshotxml2xmlout/full_domain.xml @@ -28,12 +28,18 @@
- - + +
+ + +
+ - + +
+ 1 diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/domainsnapshotxml2xmlout/metadata.xml index 9a2c24f..f0d8d07 100644 --- a/tests/domainsnapshotxml2xmlout/metadata.xml +++ b/tests/domainsnapshotxml2xmlout/metadata.xml @@ -32,12 +32,18 @@
- - + +
+ + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml b/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml index 5bcc1a7..f4a471a 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml @@ -21,9 +21,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml b/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml index a507558..9bf4414 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml @@ -26,10 +26,14 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml b/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml index d060da6..b7e5dde 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml @@ -20,9 +20,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml b/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml index 7ffdb97..b039541 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml @@ -20,9 +20,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml b/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml index ecefafa..9beaf06 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml @@ -20,9 +20,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml index 3768715..5a17374 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml @@ -20,9 +20,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml index aaa7e32..ea7653b 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml @@ -26,9 +26,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml index 146f453..f8a7c77 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml index 2984763..12d27d6 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml index 40ffdfc..ab7a9ed 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml index 5a12671..08198f5 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml index a6215bc..544524b 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml index 8064075..70c5576 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml index 92d6250..8ee2360 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml index 0ce3530..a18fda7 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml index 59b9262..38f3877 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml index 8be911e..f3afc3f 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml index fade9b6..d8eefcb 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml index a904719..d14710f 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml @@ -27,9 +27,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml index 0c66e7f..160fd9d 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml @@ -20,6 +20,7 @@ +
@@ -27,8 +28,11 @@ +
- + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml index b5f948b..36da19e 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml @@ -23,6 +23,7 @@ +
@@ -30,8 +31,11 @@ +
- + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml index 31fc9f2..05c7315 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml @@ -20,6 +20,7 @@ +
@@ -27,8 +28,11 @@ +
- + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml index 8f50481..74ec758 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml @@ -26,10 +26,15 @@ +
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml index a0557e0..25a4fb8 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml @@ -26,10 +26,15 @@ +
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml index 2828249..979caf5 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml @@ -26,10 +26,15 @@ +
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml index 1a315b7..fc08eb3 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml @@ -26,10 +26,15 @@ +
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml index feae85d..9c2e959 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml @@ -26,10 +26,15 @@ +
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml index bf82750..c3ef946 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml @@ -31,10 +31,15 @@ +
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml index afa11ec..928a30c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml @@ -28,10 +28,15 @@ +
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml index 7f73472..331b6b9 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml @@ -29,10 +29,15 @@ +
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml index d605aac..fd4e505 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml @@ -28,6 +28,7 @@ +
@@ -35,6 +36,7 @@ +
@@ -45,6 +47,7 @@ +
@@ -53,10 +56,15 @@ +
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml index 5868d5b..0f789e2 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml @@ -26,10 +26,15 @@ +
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml index 85f8b41..ff31982 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml @@ -32,10 +32,14 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml index 8ce58e3..834708c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml @@ -38,9 +38,13 @@
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml index 729c3c0..8bf3990 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml @@ -25,9 +25,13 @@ - + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml index 9889132..fb8ab06 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml @@ -31,15 +31,21 @@ +
+
- + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml index 2fe02f9..17c5e2c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml @@ -37,9 +37,13 @@ - + +
+ - + +
+ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml index 0bc0436..5ff9913 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml @@ -20,14 +20,19 @@
- + +
+ - + +
+