On 12.01.2016 12:59, Pavel Hrdina wrote: > Some of the patches from v1 series are already pushed, only those 4 left for > review. > > Pavel Hrdina (4): > tests: use virtTestDifferenceFull in tests where we have output file > tests: add some missing tests to qemuxml2xmltest > device: cleanup input device code > tests: update test XML files to follow input changes > > src/Makefile.am | 4 +- > src/conf/domain_conf.c | 82 +++------------------- > src/libxl/libxl_domain.c | 5 ++ > src/qemu/qemu_domain.c | 23 ++++++ > src/xen/xen_driver.c | 5 ++ > src/xenapi/xenapi_driver.c | 5 ++ > src/xenconfig/xen_common.c | 22 ++++++ > src/xenconfig/xen_common.h | 2 + > .../disk_snapshot_redefine.xml | 2 + > .../external_vm_redefine.xml | 2 + > tests/domainsnapshotxml2xmlout/full_domain.xml | 2 + > tests/domainsnapshotxml2xmlout/metadata.xml | 2 + > tests/domainsnapshotxml2xmltest.c | 2 +- > tests/interfacexml2xmltest.c | 2 +- > tests/lxcconf2xmltest.c | 2 +- > tests/nodedevxml2xmltest.c | 2 +- > tests/qemuhotplugtest.c | 11 ++- > .../qemuhotplug-hotplug-base+disk-scsi.xml | 2 + > .../qemuhotplug-hotplug-base+disk-usb.xml | 2 + > .../qemuhotplug-hotplug-base+disk-virtio.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 2 + > .../qemuxml2argv-blkiotune-device.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 2 + > .../qemuxml2argv-boot-menu-disable.xml | 2 + > .../qemuxml2argv-boot-menu-enable-with-timeout.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 2 + > .../qemuxml2argv-channel-guestfwd.xml | 2 + > .../qemuxml2argv-channel-virtio.xml | 2 + > .../qemuxml2argv-chardev-label.xml | 2 + > .../qemuxml2argv-clock-catchup.xml | 2 + > .../qemuxml2argv-clock-localtime.xml | 2 + > .../qemuxml2argv-clock-timer-hyperv-rtc.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 2 + > .../qemuxml2argv-console-compat.xml | 2 + > .../qemuxml2argv-console-virtio-many.xml | 2 + > .../qemuxml2argv-cpu-eoi-disabled.xml | 2 + > .../qemuxml2argv-cpu-eoi-enabled.xml | 2 + > .../qemuxml2argv-cpu-host-kvmclock.xml | 2 + > .../qemuxml2argv-cpu-host-model-features.xml | 2 + > .../qemuxml2argv-cpu-host-passthrough-features.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 2 + > .../qemuxml2argv-cpu-numa-disjoint.xml | 2 + > .../qemuxml2argv-cpu-numa-memshared.xml | 2 + > ...xml2argv-cputune-iothreadsched-zeropriority.xml | 2 + > .../qemuxml2argv-cputune-numatune.xml | 2 + > .../qemuxml2argv-cputune-zero-shares.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + > .../qemuxml2argv-disk-active-commit.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 2 + > .../qemuxml2argv-disk-cdrom-empty.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 2 + > .../qemuxml2argv-disk-copy_on_read.xml | 2 + > .../qemuxml2argv-disk-drive-boot-cdrom.xml | 3 + > .../qemuxml2argv-disk-drive-boot-disk.xml | 3 + > .../qemuxml2argv-disk-drive-cache-directsync.xml | 2 + > .../qemuxml2argv-disk-drive-cache-unsafe.xml | 2 + > .../qemuxml2argv-disk-drive-cache-v2-none.xml | 2 + > .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 2 + > .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 2 + > .../qemuxml2argv-disk-drive-copy-on-read.xml | 2 + > ...muxml2argv-disk-drive-error-policy-enospace.xml | 2 + > .../qemuxml2argv-disk-drive-error-policy-stop.xml | 2 + > ...rgv-disk-drive-error-policy-wreport-rignore.xml | 2 + > .../qemuxml2argv-disk-drive-fat.xml | 2 + > .../qemuxml2argv-disk-drive-fmt-qcow.xml | 2 + > .../qemuxml2argv-disk-drive-network-gluster.xml | 2 + > .../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 2 + > .../qemuxml2argv-disk-drive-network-iscsi.xml | 2 + > .../qemuxml2argv-disk-drive-network-nbd-export.xml | 2 + > ...xml2argv-disk-drive-network-nbd-ipv6-export.xml | 2 + > .../qemuxml2argv-disk-drive-network-nbd-ipv6.xml | 2 + > .../qemuxml2argv-disk-drive-network-nbd-unix.xml | 2 + > .../qemuxml2argv-disk-drive-network-nbd.xml | 2 + > .../qemuxml2argv-disk-drive-network-rbd-auth.xml | 2 + > ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 2 + > .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 2 + > .../qemuxml2argv-disk-drive-network-rbd.xml | 2 + > .../qemuxml2argv-disk-drive-network-sheepdog.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 2 + > .../qemuxml2argv-disk-scsi-device.xml | 2 + > .../qemuxml2argv-disk-scsi-disk-vpd.xml | 2 + > ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 2 + > .../qemuxml2argv-disk-scsi-megasas.xml | 2 + > .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 2 + > .../qemuxml2argv-disk-scsi-vscsi.xml | 2 + > .../qemuxml2argv-disk-source-pool-mode.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 2 + > .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml | 2 + > .../qemuxml2argv-disk-virtio-scsi-ioeventfd.xml | 2 + > .../qemuxml2argv-disk-virtio-scsi-max_sectors.xml | 2 + > .../qemuxml2argv-disk-virtio-scsi-num_queues.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 2 + > .../qemuxml2argv-encrypted-disk.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 2 + > .../qemuxml2argv-floppy-drive-fat.xml | 2 + > .../qemuxml2argv-hostdev-pci-address.xml | 2 + > .../qemuxml2argv-hostdev-scsi-large-unit.xml | 2 + > .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 2 + > .../qemuxml2argv-hostdev-scsi-lsi-iscsi.xml | 2 + > .../qemuxml2argv-hostdev-scsi-lsi.xml | 2 + > .../qemuxml2argv-hostdev-scsi-rawio.xml | 2 + > .../qemuxml2argv-hostdev-scsi-readonly.xml | 2 + > .../qemuxml2argv-hostdev-scsi-sgio.xml | 2 + > .../qemuxml2argv-hostdev-scsi-shareable.xml | 2 + > ...qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 2 + > .../qemuxml2argv-hostdev-scsi-virtio-iscsi.xml | 2 + > .../qemuxml2argv-hostdev-scsi-virtio-scsi.xml | 2 + > .../qemuxml2argv-hostdev-usb-address.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-hotplug-base.xml | 2 + > .../qemuxml2argv-hugepages-pages.xml | 2 + > .../qemuxml2argv-hugepages-pages2.xml | 2 + > .../qemuxml2argv-hugepages-pages3.xml | 2 + > .../qemuxml2argv-hugepages-shared.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 + > .../qemuxml2argv-input-usbmouse.xml | 2 + > .../qemuxml2argv-input-usbtablet.xml | 2 + > .../qemuxml2argv-interface-driver.xml | 2 + > .../qemuxml2argv-iothreads-disk.xml | 2 + > .../qemuxml2argv-iothreads-ids-partial.xml | 2 + > .../qemuxml2argv-iothreads-ids.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-iothreads.xml | 2 + > .../qemuxml2argv-kvm-features-off.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-kvm-features.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 2 + > .../qemuxml2argv-machine-core-off.xml | 2 + > .../qemuxml2argv-machine-core-on.xml | 2 + > .../qemuxml2argv-memory-hotplug-dimm.xml | 2 + > .../qemuxml2argv-memory-hotplug-nonuma.xml | 2 + > .../qemuxml2argv-memory-hotplug.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 2 + > .../qemuxml2argv-misc-disable-s3.xml | 2 + > .../qemuxml2argv-misc-disable-suspends.xml | 2 + > .../qemuxml2argv-misc-enable-s4.xml | 2 + > .../qemuxml2argv-misc-no-reboot.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 + > .../qemuxml2argv-net-eth-ifname.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 2 + > .../qemuxml2argv-net-hostdev-vfio.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-net-midonet.xml | 2 + > .../qemuxml2argv-net-openvswitch.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-net-udp.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 2 + > .../qemuxml2argv-net-vhostuser.xml | 2 + > .../qemuxml2argv-net-virtio-device.xml | 2 + > .../qemuxml2argv-net-virtio-disable-offloads.xml | 2 + > .../qemuxml2argv-net-virtio-network-portgroup.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 2 + > .../qemuxml2argv-nographics-vga.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-nosharepages.xml | 2 + > .../qemuxml2argv-numad-static-vcpu-no-numatune.xml | 2 + > .../qemuxml2argv-numatune-memnode-no-memory.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-panic-double.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml | 2 + > .../qemuxml2argv-panic-no-address.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 2 + > .../qemuxml2argv-pci-serial-dev-chardev.xml | 2 + > .../qemuxml2argv-pcie-root-port-too-many.xml | 2 + > .../qemuxml2argv-pcie-root-port.xml | 2 + > .../qemuxml2argv-pcie-switch-downstream-port.xml | 2 + > .../qemuxml2argv-pcie-switch-upstream-port.xml | 2 + > .../qemuxml2argv-pcihole64-none.xml | 2 + > .../qemuxml2argv-pcihole64-q35.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml | 2 + > .../qemuxml2argv-pmu-feature-off.xml | 2 + > .../qemuxml2argv-pv-spinlock-disabled.xml | 2 + > .../qemuxml2argv-pv-spinlock-enabled.xml | 2 + > .../qemuxml2argv-qemu-ns-no-env.xml | 2 + > .../qemuxml2argv-reboot-timeout-disabled.xml | 2 + > .../qemuxml2argv-reboot-timeout-enabled.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 2 + > .../qemuxml2argv-seclabel-dac-none.xml | 2 + > .../qemuxml2argv-seclabel-device-multiple.xml | 2 + > .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 2 + > .../qemuxml2argv-seclabel-dynamic-none.xml | 2 + > .../qemuxml2argv-seclabel-dynamic-override.xml | 2 + > .../qemuxml2argv-seclabel-static-labelskip.xml | 2 + > .../qemuxml2argv-seclabel-static.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 + > .../qemuxml2argv-serial-spiceport-nospice.xml | 2 + > .../qemuxml2argv-serial-tcp-telnet.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-shmem.xml | 2 + > .../qemuxml2argv-smbios-multiple-type2.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml | 2 + > .../qemuxml2argv-tpm-passthrough.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 2 + > .../qemuxml2argv-vcpu-placement-static.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-vhost_queues.xml | 2 + > .../qemuxml2argv-video-virtio-gpu-device.xml | 2 + > .../qemuxml2argv-video-virtio-gpu-virgl.xml | 2 + > .../qemuxml2argv-virtio-input-passthrough.xml | 2 + > .../qemuxml2argvdata/qemuxml2argv-virtio-input.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 2 + > .../qemuxml2argv-virtio-rng-egd.xml | 2 + > .../qemuxml2argv-virtio-rng-random.xml | 2 + > tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 2 + > tests/qemuxml2argvtest.c | 1 + > .../qemuxml2xmlout-balloon-device-auto.xml | 2 + > .../qemuxml2xmlout-balloon-device-period.xml | 2 + > .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 2 + > ...muxml2xmlout-boot-menu-disable-with-timeout.xml | 2 + > .../qemuxml2xmlout-channel-virtio-auto.xml | 2 + > .../qemuxml2xmlout-channel-virtio-state-active.xml | 2 + > ...emuxml2xmlout-channel-virtio-state-inactive.xml | 2 + > .../qemuxml2xmlout-console-compat-auto.xml | 2 + > .../qemuxml2xmlout-console-compat2.xml | 2 + > .../qemuxml2xmlout-console-virtio.xml | 2 + > .../qemuxml2xmlout-controller-usb-order.xml | 2 + > .../qemuxml2xmlout-cpu-empty.xml | 2 + > .../qemuxml2xmlout-cpu-numa-disordered.xml | 2 + > .../qemuxml2xmlout-cpu-numa-no-memory-element.xml | 2 + > .../qemuxml2xmlout-cpu-numa1.xml | 2 + > .../qemuxml2xmlout-cpu-numa2.xml | 2 + > .../qemuxml2xmlout-cputune-iothreads.xml | 2 + > .../qemuxml2xmlout-cputune-iothreadsched.xml | 2 + > .../qemuxml2xmlout-default-kvm-host-arch.xml | 2 + > .../qemuxml2xmlout-default-qemu-host-arch.xml | 2 + > .../qemuxml2xmlout-disk-backing-chains-active.xml | 2 + > ...qemuxml2xmlout-disk-backing-chains-inactive.xml | 2 + > .../qemuxml2xmlout-disk-drive-discard.xml | 2 + > .../qemuxml2xmlout-disk-mirror-old-inactive.xml | 2 + > .../qemuxml2xmlout-disk-mirror-old.xml | 2 + > .../qemuxml2xmlout-disk-mirror.xml | 2 + > .../qemuxml2xmlout-disk-scsi-device-auto.xml | 2 + > .../qemuxml2xmlout-disk-source-pool.xml | 2 + > ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 2 + > .../qemuxml2xmlout-memtune-unlimited.xml | 2 + > .../qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml | 2 + > .../qemuxml2xmlout-metadata-duplicate.xml | 2 + > .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 2 + > ...emuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml | 2 + > ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 2 + > .../qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml | 2 + > .../qemuxml2xmlout-numatune-auto-prefer.xml | 2 + > .../qemuxml2xmlout-numatune-memnode.xml | 2 + > tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml | 2 + > .../qemuxml2xmlout-pci-autoadd-addr.xml | 2 + > .../qemuxml2xmlout-pci-autoadd-idx.xml | 2 + > .../qemuxml2xmlout-pci-bridge-many-disks.xml | 2 + > .../qemuxml2xmlout-pcie-root.xml | 2 + > .../qemuxml2xmlout-pcihole64-gib.xml | 2 + > .../qemuxml2xmlout-pmu-feature.xml | 2 + > tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 + > .../qemuxml2xmlout-seclabel-dynamic-labelskip.xml | 2 + > .../qemuxml2xmlout-seclabel-dynamic-relabel.xml | 2 + > .../qemuxml2xmlout-seclabel-none.xml | 2 + > .../qemuxml2xmlout-serial-target-port-auto.xml | 2 + > .../qemuxml2xmlout-tap-vhost-incorrect.xml | 2 + > .../qemuxml2xmlout-usb-ich9-ehci-addr.xml | 2 + > .../qemuxml2xmlout-usb-redir-filter-version.xml | 2 + > .../qemuxml2xmlout-usb-redir-filter.xml | 2 + > tests/qemuxml2xmltest.c | 23 ++++++ > tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 + > .../sexpr2xml-disk-block-shareable.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 + > .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 + > .../sexpr2xml-disk-drv-blktap-raw.xml | 2 + > .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 + > .../sexpr2xml-pv-bootloader-cmdline.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 2 + > tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 + > tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 2 - > tests/xlconfigdata/test-paravirt-maxvcpus.xml | 2 + > tests/xmconfigdata/test-paravirt-maxvcpus.xml | 2 + > tests/xmconfigdata/test-paravirt-vcpu.xml | 2 + > 303 files changed, 684 insertions(+), 85 deletions(-) > ACK series, but see my comments before pushing. Michal -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list