[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 0/6] qemu: Fix handling of floppy controller setup



Cleanup always present capability QEMU_CAPS_BOOTINDEX and unused
capability QEMU_CAPS_DRIVE_BOOT as a preparation/cleanup step and
fix two bugs in setup of the floppy controller for the q35 machine type.

Peter Krempa (6):
  qemu: capabilities: Always assume QEMU_CAPS_BOOTINDEX
  qemu: capabilities: Remove unused QEMU_CAPS_DRIVE_BOOT
  qemu: Remove unused argument 'bootable' from qemuBuildDriveStr
  tests: qemuxml2argv: Add 2 floppy drive tests for q35 with 2.9 and
    2.11 machine
  qemu: command: Don't format -device isa-fdc,... twice with two floppy
    drives
  qemu: domain: Fix machine type version check for 'isa-fdc' usage

 src/qemu/qemu_capabilities.c                       |   4 +-
 src/qemu/qemu_capabilities.h                       |   4 +-
 src/qemu/qemu_command.c                            | 233 ++++++++-------------
 src/qemu/qemu_command.h                            |   3 +-
 src/qemu/qemu_domain.c                             |  12 +-
 src/qemu/qemu_hotplug.c                            |   2 +-
 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml |   1 -
 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml  |   1 -
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml  |   1 -
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml |   1 -
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |   1 -
 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml  |   1 -
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml    |   1 -
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml    |   1 -
 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml    |   1 -
 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml    |   1 -
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml    |   1 -
 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml   |   1 -
 tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml    |   1 -
 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml   |   1 -
 .../aarch64-aavmf-virtio-mmio.args                 |   3 +-
 tests/qemuxml2argvdata/aarch64-acpi-uefi.args      |   3 +-
 .../qemuxml2argvdata/aarch64-cpu-passthrough.args  |   3 +-
 tests/qemuxml2argvdata/aarch64-gic-host.args       |   3 +-
 tests/qemuxml2argvdata/aarch64-gic-none-tcg.args   |   3 +-
 tests/qemuxml2argvdata/aarch64-gic-v2.args         |   3 +-
 tests/qemuxml2argvdata/aarch64-gic-v3.args         |   3 +-
 tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args   |   3 +-
 tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args  |   1 -
 tests/qemuxml2argvdata/aarch64-noacpi-uefi.args    |   3 +-
 tests/qemuxml2argvdata/aarch64-pci-serial.args     |   1 -
 .../qemuxml2argvdata/aarch64-traditional-pci.args  |   1 -
 .../aarch64-usb-controller-nec-xhci.args           |   1 -
 .../aarch64-usb-controller-qemu-xhci.args          |   1 -
 tests/qemuxml2argvdata/aarch64-video-default.args  |   1 -
 .../aarch64-virt-2.6-virtio-pci-default.args       |   3 +-
 .../qemuxml2argvdata/aarch64-virt-default-nic.args |   1 -
 tests/qemuxml2argvdata/aarch64-virt-virtio.args    |   3 +-
 .../aarch64-virtio-pci-default.args                |   3 +-
 .../aarch64-virtio-pci-manual-addresses.args       |   3 +-
 tests/qemuxml2argvdata/acpi-table.args             |   1 -
 tests/qemuxml2argvdata/arm-vexpressa9-basic.args   |   1 -
 tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args  |   1 -
 tests/qemuxml2argvdata/arm-vexpressa9-virtio.args  |   3 +-
 tests/qemuxml2argvdata/arm-virt-virtio.args        |   3 +-
 tests/qemuxml2argvdata/autoindex.args              |   3 +-
 tests/qemuxml2argvdata/balloon-ccw-deflate.args    |   1 -
 tests/qemuxml2argvdata/balloon-device-auto.args    |   4 +-
 .../balloon-device-deflate-off.args                |   4 +-
 tests/qemuxml2argvdata/balloon-device-deflate.args |   4 +-
 tests/qemuxml2argvdata/balloon-device-period.args  |   4 +-
 tests/qemuxml2argvdata/balloon-device.args         |   4 +-
 tests/qemuxml2argvdata/balloon-mmio-deflate.args   |   1 -
 tests/qemuxml2argvdata/bios-nvram-secure.args      |   4 +-
 tests/qemuxml2argvdata/bios-nvram.args             |   5 +-
 tests/qemuxml2argvdata/bios.args                   |   5 +-
 tests/qemuxml2argvdata/blkdeviotune-group-num.args |   4 +-
 .../qemuxml2argvdata/blkdeviotune-max-length.args  |   4 +-
 tests/qemuxml2argvdata/blkdeviotune-max.args       |   4 +-
 tests/qemuxml2argvdata/blkiotune-device.args       |   4 +-
 tests/qemuxml2argvdata/blkiotune.args              |   4 +-
 tests/qemuxml2argvdata/boot-cdrom.args             |   4 +-
 tests/qemuxml2argvdata/boot-complex-bootindex.args |   2 +-
 tests/qemuxml2argvdata/boot-complex.args           |  13 +-
 tests/qemuxml2argvdata/boot-floppy-q35.args        |   3 +-
 tests/qemuxml2argvdata/boot-floppy.args            |   4 +-
 .../qemuxml2argvdata/boot-menu-disable-drive.args  |   5 +-
 tests/qemuxml2argvdata/boot-menu-disable.args      |   5 +-
 .../boot-menu-enable-with-timeout.args             |   5 +-
 tests/qemuxml2argvdata/boot-menu-enable.args       |   5 +-
 tests/qemuxml2argvdata/boot-multi.args             |   5 +-
 tests/qemuxml2argvdata/boot-network.args           |   1 -
 tests/qemuxml2argvdata/boot-strict.args            |   2 +-
 tests/qemuxml2argvdata/channel-guestfwd.args       |   4 +-
 tests/qemuxml2argvdata/channel-spicevmc.args       |   4 +-
 tests/qemuxml2argvdata/channel-virtio-auto.args    |   4 +-
 tests/qemuxml2argvdata/channel-virtio-autoadd.args |   4 +-
 .../channel-virtio-autoassign.args                 |   4 +-
 tests/qemuxml2argvdata/channel-virtio-default.args |   4 +-
 tests/qemuxml2argvdata/channel-virtio-state.args   |   4 +-
 tests/qemuxml2argvdata/channel-virtio-unix.args    |   4 +-
 tests/qemuxml2argvdata/channel-virtio.args         |   4 +-
 tests/qemuxml2argvdata/chardev-reconnect.args      |   1 -
 tests/qemuxml2argvdata/clock-catchup.args          |   4 +-
 tests/qemuxml2argvdata/clock-france.args           |   4 +-
 tests/qemuxml2argvdata/clock-hpet-off.args         |   4 +-
 .../clock-localtime-basis-localtime.args           |   4 +-
 tests/qemuxml2argvdata/clock-localtime.args        |   4 +-
 tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args |   1 -
 tests/qemuxml2argvdata/clock-utc.args              |   4 +-
 tests/qemuxml2argvdata/clock-variable.args         |   4 +-
 tests/qemuxml2argvdata/console-compat-auto.args    |   4 +-
 tests/qemuxml2argvdata/console-compat-chardev.args |   4 +-
 tests/qemuxml2argvdata/console-compat.args         |   4 +-
 tests/qemuxml2argvdata/console-sclp.args           |   3 +-
 tests/qemuxml2argvdata/console-virtio-many.args    |   4 +-
 tests/qemuxml2argvdata/console-virtio.args         |   4 +-
 tests/qemuxml2argvdata/controller-order.args       |   6 +-
 tests/qemuxml2argvdata/cpu-Haswell-noTSX.args      |   1 -
 tests/qemuxml2argvdata/cpu-Haswell.args            |   1 -
 tests/qemuxml2argvdata/cpu-Haswell2.args           |   1 -
 tests/qemuxml2argvdata/cpu-Haswell3.args           |   1 -
 tests/qemuxml2argvdata/cpu-cache-disable.args      |   1 -
 tests/qemuxml2argvdata/cpu-cache-disable2.args     |   1 -
 tests/qemuxml2argvdata/cpu-cache-disable3.args     |   1 -
 tests/qemuxml2argvdata/cpu-cache-emulate-l3.args   |   1 -
 tests/qemuxml2argvdata/cpu-cache-passthrough.args  |   1 -
 tests/qemuxml2argvdata/cpu-cache-passthrough2.args |   1 -
 tests/qemuxml2argvdata/cpu-check-default-none.args |   1 -
 .../qemuxml2argvdata/cpu-check-default-none2.args  |   1 -
 .../cpu-check-default-partial.args                 |   1 -
 .../cpu-check-default-partial2.args                |   1 -
 tests/qemuxml2argvdata/cpu-check-none.args         |   1 -
 tests/qemuxml2argvdata/cpu-eoi-disabled.args       |   1 -
 tests/qemuxml2argvdata/cpu-eoi-enabled.args        |   1 -
 tests/qemuxml2argvdata/cpu-exact1.args             |   1 -
 tests/qemuxml2argvdata/cpu-exact2-nofallback.args  |   1 -
 tests/qemuxml2argvdata/cpu-exact2.args             |   1 -
 tests/qemuxml2argvdata/cpu-fallback.args           |   1 -
 tests/qemuxml2argvdata/cpu-host-kvmclock.args      |   1 -
 tests/qemuxml2argvdata/cpu-host-model-cmt.args     |   1 -
 .../qemuxml2argvdata/cpu-host-model-fallback.args  |   1 -
 tests/qemuxml2argvdata/cpu-host-model-vendor.args  |   1 -
 tests/qemuxml2argvdata/cpu-host-model.args         |   1 -
 .../cpu-host-passthrough-features.args             |   4 +-
 tests/qemuxml2argvdata/cpu-host-passthrough.args   |   1 -
 tests/qemuxml2argvdata/cpu-hotplug-startup.args    |   1 -
 tests/qemuxml2argvdata/cpu-kvmclock.args           |   1 -
 tests/qemuxml2argvdata/cpu-minimum1.args           |   1 -
 tests/qemuxml2argvdata/cpu-minimum2.args           |   1 -
 tests/qemuxml2argvdata/cpu-numa-disjoint.args      |   1 -
 tests/qemuxml2argvdata/cpu-numa-memshared.args     |   1 -
 .../cpu-numa-no-memory-element.args                |   1 -
 tests/qemuxml2argvdata/cpu-numa1.args              |   1 -
 tests/qemuxml2argvdata/cpu-numa2.args              |   1 -
 tests/qemuxml2argvdata/cpu-s390-features.args      |   3 +-
 tests/qemuxml2argvdata/cpu-s390-zEC12.args         |   3 +-
 tests/qemuxml2argvdata/cpu-strict1.args            |   1 -
 tests/qemuxml2argvdata/cpu-topology1.args          |   1 -
 tests/qemuxml2argvdata/cpu-topology2.args          |   1 -
 tests/qemuxml2argvdata/cpu-topology3.args          |   1 -
 tests/qemuxml2argvdata/cpu-tsc-frequency.args      |   1 -
 tests/qemuxml2argvdata/cputune-numatune.args       |   1 -
 tests/qemuxml2argvdata/cputune-zero-shares.args    |   4 +-
 tests/qemuxml2argvdata/cputune.args                |   4 +-
 tests/qemuxml2argvdata/debug-threads.args          |   4 +-
 tests/qemuxml2argvdata/default-kvm-host-arch.args  |   1 -
 tests/qemuxml2argvdata/default-qemu-host-arch.args |   1 -
 tests/qemuxml2argvdata/disk-aio.args               |   4 +-
 tests/qemuxml2argvdata/disk-blockio.args           |   3 +-
 tests/qemuxml2argvdata/disk-boot-cdrom.args        |   4 +-
 tests/qemuxml2argvdata/disk-boot-disk.args         |   4 +-
 tests/qemuxml2argvdata/disk-cache.args             |   4 +-
 tests/qemuxml2argvdata/disk-cdrom-network.args     |   4 +-
 tests/qemuxml2argvdata/disk-cdrom-tray.args        |   7 +-
 tests/qemuxml2argvdata/disk-cdrom.args             |   4 +-
 tests/qemuxml2argvdata/disk-copy_on_read.args      |   7 +-
 tests/qemuxml2argvdata/disk-detect-zeroes.args     |   7 +-
 tests/qemuxml2argvdata/disk-discard.args           |   7 +-
 tests/qemuxml2argvdata/disk-error-policy.args      |   4 +-
 .../disk-floppy-q35-2_11.x86_64-latest.args        |  35 ++++
 tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml    |  38 ++++
 .../disk-floppy-q35-2_9.x86_64-latest.args         |  35 ++++
 tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml     |  38 ++++
 tests/qemuxml2argvdata/disk-floppy-tray.args       |   6 +-
 tests/qemuxml2argvdata/disk-floppy.args            |   6 +-
 .../disk-floppy.x86_64-latest.args                 |   2 +-
 tests/qemuxml2argvdata/disk-fmt-qcow.args          |   4 +-
 tests/qemuxml2argvdata/disk-geometry.args          |   5 +-
 .../disk-hostdev-scsi-virtio-iscsi-auth-AES.args   |   3 +-
 tests/qemuxml2argvdata/disk-ide-split.args         |   3 +-
 tests/qemuxml2argvdata/disk-ide-wwn.args           |   3 +-
 tests/qemuxml2argvdata/disk-ioeventfd.args         |   7 +-
 tests/qemuxml2argvdata/disk-iscsi.args             |   4 +-
 tests/qemuxml2argvdata/disk-network-gluster.args   |   3 +-
 .../disk-network-iscsi-modern.args                 |   3 +-
 tests/qemuxml2argvdata/disk-network-iscsi.args     |   3 +-
 tests/qemuxml2argvdata/disk-network-nbd.args       |   3 +-
 tests/qemuxml2argvdata/disk-network-sheepdog.args  |   4 +-
 .../qemuxml2argvdata/disk-network-source-auth.args |   3 +-
 tests/qemuxml2argvdata/disk-network-tlsx509.args   |   3 +-
 tests/qemuxml2argvdata/disk-network-vxhs.args      |   3 +-
 tests/qemuxml2argvdata/disk-order.args             |   4 +-
 tests/qemuxml2argvdata/disk-readonly-disk.args     |   4 +-
 tests/qemuxml2argvdata/disk-sata-device.args       |   3 +-
 tests/qemuxml2argvdata/disk-scsi-device-auto.args  |   4 +-
 tests/qemuxml2argvdata/disk-scsi-device.args       |   4 +-
 tests/qemuxml2argvdata/disk-scsi-disk-split.args   |   3 +-
 tests/qemuxml2argvdata/disk-scsi-disk-vpd.args     |   3 +-
 tests/qemuxml2argvdata/disk-scsi-disk-wwn.args     |   3 +-
 .../disk-scsi-lun-passthrough.args                 |   3 +-
 tests/qemuxml2argvdata/disk-scsi-megasas.args      |   4 +-
 tests/qemuxml2argvdata/disk-scsi-mptsas1068.args   |   4 +-
 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args  |   4 +-
 tests/qemuxml2argvdata/disk-scsi-vscsi.args        |   4 +-
 tests/qemuxml2argvdata/disk-serial.args            |   3 +-
 tests/qemuxml2argvdata/disk-shared-locking.args    |   3 +-
 tests/qemuxml2argvdata/disk-shared.args            |   3 +-
 tests/qemuxml2argvdata/disk-snapshot.args          |   4 +-
 tests/qemuxml2argvdata/disk-source-pool-mode.args  |   4 +-
 tests/qemuxml2argvdata/disk-source-pool.args       |   4 +-
 .../disk-usb-device-removable.args                 |   4 +-
 tests/qemuxml2argvdata/disk-usb-device.args        |   4 +-
 tests/qemuxml2argvdata/disk-virtio-ccw-many.args   |   4 +-
 tests/qemuxml2argvdata/disk-virtio-ccw.args        |   3 +-
 tests/qemuxml2argvdata/disk-virtio-queues.args     |   3 +-
 tests/qemuxml2argvdata/disk-virtio-s390.args       |   3 +-
 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args   |   3 +-
 .../disk-virtio-scsi-cmd_per_lun.args              |   3 +-
 .../disk-virtio-scsi-ioeventfd.args                |   3 +-
 .../disk-virtio-scsi-max_sectors.args              |   3 +-
 .../disk-virtio-scsi-num_queues.args               |   3 +-
 tests/qemuxml2argvdata/disk-virtio.args            |   4 +-
 tests/qemuxml2argvdata/encrypted-disk-usage.args   |   3 +-
 tests/qemuxml2argvdata/encrypted-disk.args         |   3 +-
 tests/qemuxml2argvdata/eoi-disabled.args           |   1 -
 tests/qemuxml2argvdata/eoi-enabled.args            |   1 -
 tests/qemuxml2argvdata/event_idx.args              |   7 +-
 .../fd-memory-no-numa-topology.args                |   1 -
 .../qemuxml2argvdata/fd-memory-numa-topology.args  |   1 -
 .../qemuxml2argvdata/fd-memory-numa-topology2.args |   1 -
 .../qemuxml2argvdata/fd-memory-numa-topology3.args |   1 -
 tests/qemuxml2argvdata/fips-enabled.args           |   4 +-
 tests/qemuxml2argvdata/floppy-drive-fat.args       |   2 +-
 tests/qemuxml2argvdata/fs9p-ccw.args               |   3 +-
 tests/qemuxml2argvdata/fs9p.args                   |   4 +-
 tests/qemuxml2argvdata/graphics-egl-headless.args  |   4 +-
 .../qemuxml2argvdata/graphics-sdl-fullscreen.args  |   4 +-
 tests/qemuxml2argvdata/graphics-sdl.args           |   4 +-
 .../graphics-spice-agent-file-xfer.args            |   4 +-
 .../graphics-spice-agentmouse.args                 |   4 +-
 .../graphics-spice-auto-socket-cfg.args            |   1 -
 .../graphics-spice-auto-socket.args                |   1 -
 .../graphics-spice-compression.args                |   4 +-
 .../graphics-spice-egl-headless.args               |   4 +-
 tests/qemuxml2argvdata/graphics-spice-no-args.args |   1 -
 tests/qemuxml2argvdata/graphics-spice-qxl-vga.args |   4 +-
 tests/qemuxml2argvdata/graphics-spice-sasl.args    |   4 +-
 tests/qemuxml2argvdata/graphics-spice-socket.args  |   1 -
 tests/qemuxml2argvdata/graphics-spice-timeout.args |   7 +-
 .../qemuxml2argvdata/graphics-spice-usb-redir.args |   1 -
 tests/qemuxml2argvdata/graphics-spice.args         |   4 +-
 .../graphics-vnc-auto-socket-cfg.args              |   4 +-
 .../qemuxml2argvdata/graphics-vnc-auto-socket.args |   1 -
 .../graphics-vnc-egl-headless.args                 |   4 +-
 .../graphics-vnc-no-listen-attr.args               |   4 +-
 tests/qemuxml2argvdata/graphics-vnc-none.args      |   1 -
 tests/qemuxml2argvdata/graphics-vnc-policy.args    |   4 +-
 .../graphics-vnc-remove-generated-socket.args      |   4 +-
 tests/qemuxml2argvdata/graphics-vnc-sasl.args      |   4 +-
 .../graphics-vnc-socket-new-cmdline.args           |   1 -
 tests/qemuxml2argvdata/graphics-vnc-socket.args    |   1 -
 tests/qemuxml2argvdata/graphics-vnc-tls.args       |   1 -
 tests/qemuxml2argvdata/graphics-vnc-websocket.args |   1 -
 tests/qemuxml2argvdata/graphics-vnc.args           |   4 +-
 .../qemuxml2argvdata/hostdev-mdev-precreated.args  |   4 +-
 .../hostdev-pci-address-device.args                |   4 +-
 tests/qemuxml2argvdata/hostdev-pci-address.args    |   4 +-
 .../hostdev-scsi-lsi-iscsi-auth.args               |   4 +-
 tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args |   4 +-
 tests/qemuxml2argvdata/hostdev-scsi-lsi.args       |   4 +-
 tests/qemuxml2argvdata/hostdev-scsi-readonly.args  |   4 +-
 .../hostdev-scsi-vhost-scsi-ccw.args               |   3 +-
 .../hostdev-scsi-vhost-scsi-pci.args               |   4 +-
 .../hostdev-scsi-vhost-scsi-pcie.args              |   1 -
 .../hostdev-scsi-virtio-iscsi-auth.args            |   4 +-
 .../hostdev-scsi-virtio-iscsi.args                 |   4 +-
 .../qemuxml2argvdata/hostdev-scsi-virtio-scsi.args |   4 +-
 .../hostdev-subsys-mdev-vfio-ccw.args              |   1 -
 .../hostdev-usb-address-device.args                |   4 +-
 tests/qemuxml2argvdata/hostdev-usb-address.args    |   4 +-
 .../qemuxml2argvdata/hostdev-vfio-multidomain.args |   4 +-
 tests/qemuxml2argvdata/hostdev-vfio.args           |   4 +-
 tests/qemuxml2argvdata/hotplug-base.args           |   1 -
 tests/qemuxml2argvdata/hugepages-memaccess.args    |   4 +-
 tests/qemuxml2argvdata/hugepages-memaccess2.args   |   4 +-
 tests/qemuxml2argvdata/hugepages-numa.args         |   3 +-
 tests/qemuxml2argvdata/hugepages-pages.args        |   4 +-
 tests/qemuxml2argvdata/hugepages-pages2.args       |   4 +-
 tests/qemuxml2argvdata/hugepages-pages3.args       |   4 +-
 tests/qemuxml2argvdata/hugepages-pages5.args       |   4 +-
 tests/qemuxml2argvdata/hugepages-pages6.args       |   4 +-
 tests/qemuxml2argvdata/hugepages-pages7.args       |   3 +-
 tests/qemuxml2argvdata/hugepages-shared.args       |   4 +-
 tests/qemuxml2argvdata/hugepages.args              |   4 +-
 tests/qemuxml2argvdata/hyperv-off.args             |   1 -
 tests/qemuxml2argvdata/hyperv-panic.args           |   1 -
 tests/qemuxml2argvdata/hyperv.args                 |   1 -
 tests/qemuxml2argvdata/input-usbmouse-addr.args    |   4 +-
 tests/qemuxml2argvdata/input-usbmouse.args         |   4 +-
 tests/qemuxml2argvdata/input-usbtablet.args        |   4 +-
 tests/qemuxml2argvdata/input-virtio-ccw.args       |   3 +-
 .../qemuxml2argvdata/intel-iommu-caching-mode.args |   1 -
 .../qemuxml2argvdata/intel-iommu-device-iotlb.args |   1 -
 tests/qemuxml2argvdata/intel-iommu-eim.args        |   1 -
 tests/qemuxml2argvdata/intel-iommu-machine.args    |   3 +-
 tests/qemuxml2argvdata/intel-iommu.args            |   1 -
 .../iothreads-disk-virtio-ccw.args                 |   3 +-
 tests/qemuxml2argvdata/iothreads-disk.args         |   4 +-
 tests/qemuxml2argvdata/iothreads-ids-partial.args  |   4 +-
 tests/qemuxml2argvdata/iothreads-ids.args          |   4 +-
 .../iothreads-virtio-scsi-ccw.args                 |   3 +-
 .../iothreads-virtio-scsi-pci.args                 |   4 +-
 tests/qemuxml2argvdata/iothreads.args              |   4 +-
 tests/qemuxml2argvdata/kvm-features-off.args       |   1 -
 tests/qemuxml2argvdata/kvm-features.args           |   1 -
 tests/qemuxml2argvdata/kvm-pit-delay.args          |   4 +-
 tests/qemuxml2argvdata/kvm-pit-discard.args        |   4 +-
 tests/qemuxml2argvdata/kvmclock+eoi-disabled.args  |   1 -
 tests/qemuxml2argvdata/kvmclock.args               |   1 -
 tests/qemuxml2argvdata/launch-security-sev.args    |   4 +-
 .../qemuxml2argvdata/luks-disks-source-qcow2.args  |   3 +-
 tests/qemuxml2argvdata/luks-disks-source.args      |   3 +-
 tests/qemuxml2argvdata/luks-disks.args             |   3 +-
 .../qemuxml2argvdata/mach-virt-console-virtio.args |   1 -
 .../qemuxml2argvdata/mach-virt-serial-native.args  |   1 -
 tests/qemuxml2argvdata/mach-virt-serial-pci.args   |   1 -
 tests/qemuxml2argvdata/mach-virt-serial-usb.args   |   1 -
 .../machine-aeskeywrap-off-cap.args                |   3 +-
 .../machine-aeskeywrap-off-caps.args               |   3 +-
 .../machine-aeskeywrap-on-cap.args                 |   3 +-
 .../machine-aeskeywrap-on-caps.args                |   3 +-
 tests/qemuxml2argvdata/machine-aliases1.args       |   4 +-
 tests/qemuxml2argvdata/machine-aliases2.args       |   4 +-
 tests/qemuxml2argvdata/machine-core-off.args       |   4 +-
 tests/qemuxml2argvdata/machine-core-on.args        |   4 +-
 .../machine-deakeywrap-off-cap.args                |   3 +-
 .../machine-deakeywrap-off-caps.args               |   3 +-
 .../machine-deakeywrap-on-cap.args                 |   3 +-
 .../machine-deakeywrap-on-caps.args                |   3 +-
 .../machine-keywrap-none-caps.args                 |   3 +-
 tests/qemuxml2argvdata/machine-keywrap-none.args   |   3 +-
 tests/qemuxml2argvdata/machine-smm-opt.args        |   3 +-
 tests/qemuxml2argvdata/machine-vmport-opt.args     |   4 +-
 tests/qemuxml2argvdata/master-key.args             |   4 +-
 .../qemuxml2argvdata/memory-hotplug-dimm-addr.args |   4 +-
 tests/qemuxml2argvdata/memory-hotplug-dimm.args    |   4 +-
 .../memory-hotplug-nvdimm-access.args              |   4 +-
 .../memory-hotplug-nvdimm-label.args               |   4 +-
 tests/qemuxml2argvdata/memory-hotplug-nvdimm.args  |   4 +-
 .../memory-hotplug-ppc64-nonuma.args               |   1 -
 tests/qemuxml2argvdata/memory-hotplug.args         |   4 +-
 tests/qemuxml2argvdata/memtune-unlimited.args      |   4 +-
 tests/qemuxml2argvdata/memtune.args                |   4 +-
 tests/qemuxml2argvdata/migrate-numa-unaligned.args |   1 -
 tests/qemuxml2argvdata/migrate.args                |   4 +-
 tests/qemuxml2argvdata/minimal-msg-timestamp.args  |   4 +-
 tests/qemuxml2argvdata/minimal-sandbox.args        |   4 +-
 tests/qemuxml2argvdata/minimal.args                |   4 +-
 tests/qemuxml2argvdata/misc-acpi.args              |   4 +-
 tests/qemuxml2argvdata/misc-disable-s3.args        |   4 +-
 tests/qemuxml2argvdata/misc-disable-suspends.args  |   4 +-
 tests/qemuxml2argvdata/misc-enable-s4.args         |   4 +-
 tests/qemuxml2argvdata/misc-no-reboot.args         |   4 +-
 tests/qemuxml2argvdata/misc-uuid.args              |   4 +-
 tests/qemuxml2argvdata/mlock-off.args              |   1 -
 tests/qemuxml2argvdata/mlock-on.args               |   1 -
 tests/qemuxml2argvdata/mlock-unsupported.args      |   1 -
 tests/qemuxml2argvdata/monitor-json.args           |   4 +-
 .../qemuxml2argvdata/multifunction-pci-device.args |   4 +-
 tests/qemuxml2argvdata/name-escape.args            |   4 +-
 tests/qemuxml2argvdata/net-client.args             |   4 +-
 tests/qemuxml2argvdata/net-eth-hostip.args         |   4 +-
 tests/qemuxml2argvdata/net-eth-ifname.args         |   4 +-
 tests/qemuxml2argvdata/net-eth-names.args          |   4 +-
 tests/qemuxml2argvdata/net-eth.args                |   4 +-
 .../qemuxml2argvdata/net-hostdev-multidomain.args  |   4 +-
 .../net-hostdev-vfio-multidomain.args              |   4 +-
 tests/qemuxml2argvdata/net-hostdev-vfio.args       |   4 +-
 tests/qemuxml2argvdata/net-hostdev.args            |   4 +-
 tests/qemuxml2argvdata/net-mcast.args              |   4 +-
 tests/qemuxml2argvdata/net-server.args             |   4 +-
 tests/qemuxml2argvdata/net-udp.args                |   4 +-
 tests/qemuxml2argvdata/net-user-addr.args          |   4 +-
 tests/qemuxml2argvdata/net-user.args               |   4 +-
 tests/qemuxml2argvdata/net-vhostuser-multiq.args   |   4 +-
 tests/qemuxml2argvdata/net-vhostuser.args          |   4 +-
 tests/qemuxml2argvdata/net-virtio-ccw.args         |   1 -
 tests/qemuxml2argvdata/net-virtio-device.args      |   4 +-
 .../net-virtio-disable-offloads.args               |   4 +-
 tests/qemuxml2argvdata/net-virtio-netdev.args      |   4 +-
 .../qemuxml2argvdata/net-virtio-rxtxqueuesize.args |   4 +-
 tests/qemuxml2argvdata/net-virtio-s390.args        |   1 -
 tests/qemuxml2argvdata/net-virtio.args             |   4 +-
 tests/qemuxml2argvdata/nosharepages.args           |   4 +-
 .../numad-auto-memory-vcpu-cpuset.args             |   4 +-
 ...d-auto-memory-vcpu-no-cpuset-and-placement.args |   4 +-
 .../numad-auto-vcpu-static-numatune.args           |   4 +-
 .../numad-static-memory-auto-vcpu.args             |   4 +-
 tests/qemuxml2argvdata/numad.args                  |   4 +-
 .../numatune-auto-nodeset-invalid.args             |   4 +-
 tests/qemuxml2argvdata/numatune-auto-prefer.args   |   1 -
 tests/qemuxml2argvdata/numatune-distances.args     |   1 -
 .../numatune-memnode-no-memory.args                |   1 -
 tests/qemuxml2argvdata/numatune-memnode.args       |   1 -
 tests/qemuxml2argvdata/numatune-memory.args        |   4 +-
 tests/qemuxml2argvdata/panic-double.args           |   1 -
 tests/qemuxml2argvdata/panic-no-address.args       |   4 +-
 tests/qemuxml2argvdata/panic.args                  |   4 +-
 .../qemuxml2argvdata/parallel-parport-chardev.args |   4 +-
 tests/qemuxml2argvdata/parallel-tcp-chardev.args   |   4 +-
 tests/qemuxml2argvdata/pci-autoadd-addr.args       |   1 -
 tests/qemuxml2argvdata/pci-autoadd-idx.args        |   1 -
 tests/qemuxml2argvdata/pci-autofill-addr.args      |   1 -
 tests/qemuxml2argvdata/pci-bridge-many-disks.args  |   3 +-
 tests/qemuxml2argvdata/pci-bridge.args             |   1 -
 tests/qemuxml2argvdata/pci-expander-bus.args       |   1 -
 tests/qemuxml2argvdata/pci-many.args               |   3 +-
 tests/qemuxml2argvdata/pci-rom-disabled.args       |   1 -
 tests/qemuxml2argvdata/pci-rom.args                |   4 +-
 tests/qemuxml2argvdata/pci-serial-dev-chardev.args |   4 +-
 tests/qemuxml2argvdata/pcie-expander-bus.args      |   3 +-
 .../pcie-root-port-model-generic.args              |   1 -
 .../pcie-root-port-model-ioh3420.args              |   1 -
 tests/qemuxml2argvdata/pcie-root-port.args         |   3 +-
 tests/qemuxml2argvdata/pcie-root.args              |   3 +-
 .../pcie-switch-downstream-port.args               |   3 +-
 .../pcie-switch-upstream-port.args                 |   3 +-
 tests/qemuxml2argvdata/pcihole64-q35.args          |   3 +-
 tests/qemuxml2argvdata/pcihole64.args              |   1 -
 tests/qemuxml2argvdata/pmu-feature-off.args        |   1 -
 tests/qemuxml2argvdata/pmu-feature.args            |   1 -
 tests/qemuxml2argvdata/ppc-dtb.args                |   1 -
 .../ppc64-usb-controller-legacy.args               |   1 -
 .../ppc64-usb-controller-qemu-xhci.args            |   1 -
 tests/qemuxml2argvdata/ppc64-usb-controller.args   |   1 -
 tests/qemuxml2argvdata/ppce500-serial.args         |   1 -
 tests/qemuxml2argvdata/pseries-basic.args          |   1 -
 tests/qemuxml2argvdata/pseries-console-virtio.args |   1 -
 .../pseries-cpu-compat-power9.args                 |   1 -
 tests/qemuxml2argvdata/pseries-cpu-compat.args     |   1 -
 tests/qemuxml2argvdata/pseries-cpu-exact.args      |   1 -
 tests/qemuxml2argvdata/pseries-cpu-le.args         |   1 -
 tests/qemuxml2argvdata/pseries-features.args       |   3 +-
 tests/qemuxml2argvdata/pseries-hostdevs-1.args     |   1 -
 tests/qemuxml2argvdata/pseries-hostdevs-2.args     |   1 -
 tests/qemuxml2argvdata/pseries-hostdevs-3.args     |   1 -
 .../pseries-machine-max-cpu-compat.args            |   3 +-
 tests/qemuxml2argvdata/pseries-many-buses-1.args   |   1 -
 tests/qemuxml2argvdata/pseries-many-buses-2.args   |   1 -
 tests/qemuxml2argvdata/pseries-many-devices.args   |   1 -
 tests/qemuxml2argvdata/pseries-nvram.args          |   1 -
 tests/qemuxml2argvdata/pseries-panic-missing.args  |   1 -
 .../qemuxml2argvdata/pseries-panic-no-address.args |   1 -
 .../pseries-phb-default-missing.args               |   1 -
 tests/qemuxml2argvdata/pseries-phb-numa-node.args  |   1 -
 tests/qemuxml2argvdata/pseries-phb-simple.args     |   1 -
 tests/qemuxml2argvdata/pseries-serial-native.args  |   1 -
 tests/qemuxml2argvdata/pseries-serial-pci.args     |   1 -
 tests/qemuxml2argvdata/pseries-serial-usb.args     |   1 -
 tests/qemuxml2argvdata/pseries-usb-default.args    |   1 -
 tests/qemuxml2argvdata/pseries-usb-kbd.args        |   1 -
 tests/qemuxml2argvdata/pseries-usb-multi.args      |   1 -
 .../pseries-vio-user-assigned.args                 |   3 +-
 tests/qemuxml2argvdata/pseries-vio.args            |   3 +-
 tests/qemuxml2argvdata/pv-spinlock-disabled.args   |   1 -
 tests/qemuxml2argvdata/pv-spinlock-enabled.args    |   1 -
 tests/qemuxml2argvdata/q35-acpi-nouefi.args        |   1 -
 tests/qemuxml2argvdata/q35-acpi-uefi.args          |   3 +-
 .../qemuxml2argvdata/q35-default-devices-only.args |   1 -
 tests/qemuxml2argvdata/q35-multifunction.args      |   1 -
 tests/qemuxml2argvdata/q35-noacpi-nouefi.args      |   1 -
 tests/qemuxml2argvdata/q35-pci-force-address.args  |   1 -
 tests/qemuxml2argvdata/q35-pcie-autoadd.args       |   3 +-
 tests/qemuxml2argvdata/q35-pcie.args               |   3 +-
 .../qemuxml2argvdata/q35-pm-disable-fallback.args  |   1 -
 tests/qemuxml2argvdata/q35-pm-disable.args         |   1 -
 tests/qemuxml2argvdata/q35-usb2-multi.args         |   3 +-
 tests/qemuxml2argvdata/q35-usb2-reorder.args       |   3 +-
 tests/qemuxml2argvdata/q35-usb2.args               |   3 +-
 tests/qemuxml2argvdata/q35-virt-manager-basic.args |   3 +-
 tests/qemuxml2argvdata/q35-virtio-pci.args         |   3 +-
 tests/qemuxml2argvdata/q35.args                    |   3 +-
 tests/qemuxml2argvdata/qemu-ns-alt.args            |   4 +-
 .../qemuxml2argvdata/qemu-ns-commandline-ns0.args  |   4 +-
 .../qemuxml2argvdata/qemu-ns-commandline-ns1.args  |   4 +-
 tests/qemuxml2argvdata/qemu-ns-commandline.args    |   4 +-
 .../qemu-ns-domain-commandline-ns0.args            |   4 +-
 .../qemu-ns-domain-commandline.args                |   4 +-
 tests/qemuxml2argvdata/qemu-ns-domain-ns0.args     |   4 +-
 tests/qemuxml2argvdata/qemu-ns-no-env.args         |   4 +-
 tests/qemuxml2argvdata/qemu-ns.args                |   4 +-
 .../qemuxml2argvdata/reboot-timeout-disabled.args  |   2 +-
 tests/qemuxml2argvdata/reboot-timeout-enabled.args |   2 +-
 tests/qemuxml2argvdata/restore-v2-fd.args          |   4 +-
 tests/qemuxml2argvdata/restore-v2.args             |   4 +-
 tests/qemuxml2argvdata/s390-panic-missing.args     |   1 -
 tests/qemuxml2argvdata/s390-panic-no-address.args  |   1 -
 tests/qemuxml2argvdata/s390-serial-2.args          |   1 -
 tests/qemuxml2argvdata/s390-serial-console.args    |   1 -
 tests/qemuxml2argvdata/s390-serial.args            |   1 -
 tests/qemuxml2argvdata/seclabel-dac-none.args      |   4 +-
 .../seclabel-dynamic-baselabel.args                |   4 +-
 .../seclabel-dynamic-labelskip.args                |   4 +-
 .../seclabel-dynamic-override.args                 |   4 +-
 .../qemuxml2argvdata/seclabel-dynamic-relabel.args |   4 +-
 tests/qemuxml2argvdata/seclabel-dynamic.args       |   4 +-
 tests/qemuxml2argvdata/seclabel-none.args          |   4 +-
 .../seclabel-static-labelskip.args                 |   4 +-
 .../qemuxml2argvdata/seclabel-static-relabel.args  |   4 +-
 tests/qemuxml2argvdata/seclabel-static.args        |   4 +-
 .../serial-dev-chardev-iobase.args                 |   4 +-
 tests/qemuxml2argvdata/serial-dev-chardev.args     |   4 +-
 tests/qemuxml2argvdata/serial-file-chardev.args    |   4 +-
 tests/qemuxml2argvdata/serial-file-log.args        |   4 +-
 tests/qemuxml2argvdata/serial-many-chardev.args    |   4 +-
 tests/qemuxml2argvdata/serial-pty-chardev.args     |   4 +-
 .../qemuxml2argvdata/serial-spiceport-nospice.args |   4 +-
 tests/qemuxml2argvdata/serial-spiceport.args       |   4 +-
 tests/qemuxml2argvdata/serial-tcp-chardev.args     |   4 +-
 .../serial-tcp-telnet-chardev.args                 |   4 +-
 .../serial-tcp-tlsx509-chardev-notls.args          |   4 +-
 .../serial-tcp-tlsx509-chardev-verify.args         |   4 +-
 .../serial-tcp-tlsx509-chardev.args                |   4 +-
 .../serial-tcp-tlsx509-secret-chardev.args         |   4 +-
 tests/qemuxml2argvdata/serial-udp-chardev.args     |   4 +-
 tests/qemuxml2argvdata/serial-unix-chardev.args    |   1 -
 tests/qemuxml2argvdata/serial-vc-chardev.args      |   4 +-
 tests/qemuxml2argvdata/shmem-plain-doorbell.args   |   1 -
 tests/qemuxml2argvdata/shmem.args                  |   1 -
 tests/qemuxml2argvdata/smartcard-controller.args   |   1 -
 .../smartcard-host-certificates-database.args      |   1 -
 .../smartcard-host-certificates.args               |   1 -
 tests/qemuxml2argvdata/smartcard-host.args         |   1 -
 .../smartcard-passthrough-spicevmc.args            |   1 -
 .../smartcard-passthrough-tcp.args                 |   1 -
 tests/qemuxml2argvdata/smbios.args                 |   4 +-
 tests/qemuxml2argvdata/smp.args                    |   4 +-
 tests/qemuxml2argvdata/sound-device.args           |   4 +-
 tests/qemuxml2argvdata/sound.args                  |   4 +-
 tests/qemuxml2argvdata/tpm-passthrough-crb.args    |   2 +-
 tests/qemuxml2argvdata/tpm-passthrough.args        |   2 +-
 .../usb-controller-default-q35.args                |   1 -
 .../usb-controller-explicit-q35.args               |   1 -
 .../qemuxml2argvdata/usb-controller-qemu-xhci.args |   1 -
 tests/qemuxml2argvdata/usb-controller-xhci.args    |   1 -
 tests/qemuxml2argvdata/usb-controller.args         |   1 -
 tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args |   1 -
 tests/qemuxml2argvdata/usb-hub-autoadd.args        |   1 -
 tests/qemuxml2argvdata/usb-hub.args                |   1 -
 tests/qemuxml2argvdata/usb-ich9-autoassign.args    |   1 -
 tests/qemuxml2argvdata/usb-ich9-companion.args     |   1 -
 tests/qemuxml2argvdata/usb-ich9-ehci-addr.args     |   1 -
 tests/qemuxml2argvdata/usb-long-port-path.args     |   1 -
 tests/qemuxml2argvdata/usb-none.args               |   1 -
 tests/qemuxml2argvdata/usb-piix3-controller.args   |   1 -
 tests/qemuxml2argvdata/usb-port-autoassign.args    |   1 -
 tests/qemuxml2argvdata/usb-port-missing.args       |   1 -
 tests/qemuxml2argvdata/usb-ports.args              |   1 -
 .../qemuxml2argvdata/usb-redir-filter-version.args |   1 -
 tests/qemuxml2argvdata/usb-redir-filter.args       |   1 -
 tests/qemuxml2argvdata/usb-redir.args              |   1 -
 tests/qemuxml2argvdata/usb-xhci-autoassign.args    |   1 -
 tests/qemuxml2argvdata/usb1-usb2.args              |   1 -
 tests/qemuxml2argvdata/user-aliases-usb.args       |   1 -
 tests/qemuxml2argvdata/user-aliases.args           |   8 +-
 tests/qemuxml2argvdata/vcpu-placement-static.args  |   3 +-
 .../video-device-pciaddr-default.args              |   4 +-
 tests/qemuxml2argvdata/video-none-device.args      |   4 +-
 .../qemuxml2argvdata/video-qxl-device-vgamem.args  |   4 +-
 tests/qemuxml2argvdata/video-qxl-device.args       |   4 +-
 tests/qemuxml2argvdata/video-qxl-heads.args        |   4 +-
 tests/qemuxml2argvdata/video-qxl-nodevice.args     |   4 +-
 tests/qemuxml2argvdata/video-qxl-noheads.args      |   4 +-
 .../video-qxl-sec-device-vgamem.args               |   4 +-
 tests/qemuxml2argvdata/video-qxl-sec-device.args   |   4 +-
 .../qemuxml2argvdata/video-vga-device-vgamem.args  |   4 +-
 tests/qemuxml2argvdata/video-vga-device.args       |   4 +-
 tests/qemuxml2argvdata/video-vga-nodevice.args     |   4 +-
 tests/qemuxml2argvdata/video-vga-qxl-heads.args    |   4 +-
 tests/qemuxml2argvdata/video-virtio-gpu-ccw.args   |   3 +-
 .../qemuxml2argvdata/video-virtio-gpu-device.args  |   4 +-
 .../qemuxml2argvdata/video-virtio-gpu-sdl-gl.args  |   4 +-
 .../video-virtio-gpu-secondary.args                |   1 -
 .../video-virtio-gpu-spice-gl.args                 |   4 +-
 tests/qemuxml2argvdata/video-virtio-gpu-virgl.args |   4 +-
 tests/qemuxml2argvdata/video-virtio-vga.args       |   4 +-
 .../qemuxml2argvdata/virtio-input-passthrough.args |   1 -
 tests/qemuxml2argvdata/virtio-input.args           |   1 -
 tests/qemuxml2argvdata/virtio-lun.args             |   4 +-
 tests/qemuxml2argvdata/virtio-options.args         |   3 +-
 tests/qemuxml2argvdata/virtio-rng-default.args     |   1 -
 tests/qemuxml2argvdata/virtio-rng-egd.args         |   1 -
 tests/qemuxml2argvdata/virtio-rng-multiple.args    |   1 -
 tests/qemuxml2argvdata/virtio-rng-random.args      |   1 -
 tests/qemuxml2argvdata/vmcoreinfo.args             |   4 +-
 tests/qemuxml2argvdata/watchdog-device.args        |   4 +-
 tests/qemuxml2argvdata/watchdog-dump.args          |   4 +-
 tests/qemuxml2argvdata/watchdog-injectnmi.args     |   4 +-
 tests/qemuxml2argvdata/watchdog.args               |   4 +-
 tests/qemuxml2argvdata/x86-kvm-32-on-64.args       |   3 +-
 tests/qemuxml2argvtest.c                           |  67 ++----
 tests/qemuxml2xmltest.c                            |   5 +-
 607 files changed, 935 insertions(+), 1176 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml
 create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml

-- 
2.16.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]