[PATCH 14/19] qemu: Always assume QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE

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

 



All qemu versions now support FD passing either directly or via FDset.
Assume that we always have this capability so that we can simplify
chardev handling in many cases.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_process.c                       | 26 ++------------
 .../aarch64-aavmf-virtio-mmio.args            |  2 +-
 tests/qemuxml2argvdata/aarch64-acpi-uefi.args |  2 +-
 .../aarch64-cpu-passthrough.args              |  2 +-
 tests/qemuxml2argvdata/aarch64-gic-host.args  |  2 +-
 .../aarch64-gic-none-tcg.args                 |  2 +-
 tests/qemuxml2argvdata/aarch64-gic-v2.args    |  2 +-
 tests/qemuxml2argvdata/aarch64-gic-v3.args    |  2 +-
 .../aarch64-kvm-32-on-64.args                 |  2 +-
 .../aarch64-noacpi-nouefi.args                |  2 +-
 .../qemuxml2argvdata/aarch64-noacpi-uefi.args |  2 +-
 .../qemuxml2argvdata/aarch64-pci-serial.args  |  5 +--
 .../aarch64-traditional-pci.args              |  2 +-
 .../aarch64-usb-controller-nec-xhci.args      |  2 +-
 .../aarch64-usb-controller-qemu-xhci.args     |  2 +-
 .../aarch64-video-default.args                |  2 +-
 .../aarch64-video-virtio-gpu-pci.args         |  2 +-
 .../aarch64-virt-2.6-virtio-pci-default.args  |  2 +-
 .../aarch64-virt-default-nic.args             |  2 +-
 .../qemuxml2argvdata/aarch64-virt-virtio.args |  2 +-
 .../aarch64-virtio-pci-default.args           |  2 +-
 .../aarch64-virtio-pci-manual-addresses.args  |  2 +-
 tests/qemuxml2argvdata/acpi-table.args        |  2 +-
 .../arm-vexpressa9-basic.args                 |  2 +-
 .../arm-vexpressa9-nodevs.args                |  2 +-
 .../arm-vexpressa9-virtio.args                |  2 +-
 tests/qemuxml2argvdata/arm-virt-virtio.args   |  2 +-
 tests/qemuxml2argvdata/audio-default-sdl.args |  2 +-
 .../qemuxml2argvdata/audio-default-spice.args |  2 +-
 tests/qemuxml2argvdata/audio-default-vnc.args |  2 +-
 tests/qemuxml2argvdata/autoindex.args         |  2 +-
 .../qemuxml2argvdata/balloon-ccw-deflate.args |  2 +-
 .../qemuxml2argvdata/balloon-device-auto.args |  2 +-
 .../balloon-device-deflate-off.args           |  2 +-
 .../balloon-device-deflate.args               |  2 +-
 .../balloon-device-period.args                |  2 +-
 tests/qemuxml2argvdata/balloon-device.args    |  2 +-
 .../balloon-mmio-deflate.args                 |  2 +-
 tests/qemuxml2argvdata/bios-nvram-secure.args |  2 +-
 tests/qemuxml2argvdata/bios-nvram.args        |  2 +-
 tests/qemuxml2argvdata/bios.args              |  2 +-
 tests/qemuxml2argvdata/blkiotune-device.args  |  2 +-
 tests/qemuxml2argvdata/blkiotune.args         |  2 +-
 tests/qemuxml2argvdata/boot-cdrom.args        |  2 +-
 tests/qemuxml2argvdata/boot-complex.args      |  2 +-
 tests/qemuxml2argvdata/boot-floppy-q35.args   |  2 +-
 tests/qemuxml2argvdata/boot-floppy.args       |  2 +-
 .../boot-menu-disable-drive.args              |  2 +-
 tests/qemuxml2argvdata/boot-menu-disable.args |  2 +-
 .../boot-menu-enable-with-timeout.args        |  2 +-
 tests/qemuxml2argvdata/boot-menu-enable.args  |  2 +-
 tests/qemuxml2argvdata/boot-multi.args        |  2 +-
 tests/qemuxml2argvdata/boot-network.args      |  2 +-
 tests/qemuxml2argvdata/boot-order.args        |  2 +-
 tests/qemuxml2argvdata/channel-guestfwd.args  |  2 +-
 tests/qemuxml2argvdata/channel-spicevmc.args  |  2 +-
 .../qemuxml2argvdata/channel-virtio-auto.args |  2 +-
 .../channel-virtio-autoadd.args               |  2 +-
 .../channel-virtio-autoassign.args            |  2 +-
 .../channel-virtio-default.args               |  2 +-
 .../channel-virtio-state.args                 |  2 +-
 .../qemuxml2argvdata/channel-virtio-unix.args | 10 +++---
 tests/qemuxml2argvdata/channel-virtio.args    |  2 +-
 tests/qemuxml2argvdata/chardev-reconnect.args |  2 +-
 tests/qemuxml2argvdata/clock-catchup.args     |  2 +-
 tests/qemuxml2argvdata/clock-france.args      |  2 +-
 tests/qemuxml2argvdata/clock-hpet-off.args    |  2 +-
 .../clock-localtime-basis-localtime.args      |  2 +-
 tests/qemuxml2argvdata/clock-localtime.args   |  2 +-
 tests/qemuxml2argvdata/clock-realtime.args    |  2 +-
 .../clock-timer-hyperv-rtc.args               |  2 +-
 tests/qemuxml2argvdata/clock-utc.args         |  2 +-
 tests/qemuxml2argvdata/clock-variable.args    |  2 +-
 .../qemuxml2argvdata/console-compat-auto.args |  2 +-
 .../console-compat-chardev.args               |  2 +-
 tests/qemuxml2argvdata/console-compat.args    |  2 +-
 .../qemuxml2argvdata/console-virtio-ccw.args  |  2 +-
 .../qemuxml2argvdata/console-virtio-many.args |  2 +-
 tests/qemuxml2argvdata/console-virtio.args    |  2 +-
 tests/qemuxml2argvdata/controller-order.args  |  2 +-
 tests/qemuxml2argvdata/cpu-Haswell-noTSX.args |  2 +-
 tests/qemuxml2argvdata/cpu-Haswell.args       |  2 +-
 tests/qemuxml2argvdata/cpu-Haswell2.args      |  2 +-
 tests/qemuxml2argvdata/cpu-Haswell3.args      |  2 +-
 tests/qemuxml2argvdata/cpu-cache-disable.args |  2 +-
 .../qemuxml2argvdata/cpu-cache-disable2.args  |  2 +-
 .../qemuxml2argvdata/cpu-cache-disable3.args  |  2 +-
 .../cpu-cache-emulate-l3.args                 |  2 +-
 .../cpu-cache-passthrough.args                |  2 +-
 .../cpu-cache-passthrough2.args               |  2 +-
 .../cpu-check-default-none.args               |  2 +-
 .../cpu-check-default-none2.args              |  2 +-
 .../cpu-check-default-partial.args            |  2 +-
 .../cpu-check-default-partial2.args           |  2 +-
 tests/qemuxml2argvdata/cpu-check-none.args    |  2 +-
 tests/qemuxml2argvdata/cpu-eoi-disabled.args  |  2 +-
 tests/qemuxml2argvdata/cpu-eoi-enabled.args   |  2 +-
 tests/qemuxml2argvdata/cpu-exact1.args        |  2 +-
 .../cpu-exact2-nofallback.args                |  2 +-
 tests/qemuxml2argvdata/cpu-exact2.args        |  2 +-
 tests/qemuxml2argvdata/cpu-fallback.args      |  2 +-
 tests/qemuxml2argvdata/cpu-host-kvmclock.args |  2 +-
 .../qemuxml2argvdata/cpu-host-model-cmt.args  |  2 +-
 .../cpu-host-model-fallback.args              |  2 +-
 .../cpu-host-model-vendor.args                |  2 +-
 tests/qemuxml2argvdata/cpu-host-model.args    |  2 +-
 .../cpu-host-passthrough-features.args        |  2 +-
 .../cpu-host-passthrough.args                 |  2 +-
 .../qemuxml2argvdata/cpu-hotplug-startup.args |  2 +-
 tests/qemuxml2argvdata/cpu-kvmclock.args      |  2 +-
 tests/qemuxml2argvdata/cpu-minimum1.args      |  2 +-
 tests/qemuxml2argvdata/cpu-minimum2.args      |  2 +-
 .../cpu-no-removed-features.args              |  2 +-
 tests/qemuxml2argvdata/cpu-numa-disjoint.args |  2 +-
 .../qemuxml2argvdata/cpu-numa-memshared.args  |  2 +-
 .../cpu-numa-no-memory-element.args           |  2 +-
 tests/qemuxml2argvdata/cpu-numa1.args         |  2 +-
 tests/qemuxml2argvdata/cpu-numa2.args         |  2 +-
 tests/qemuxml2argvdata/cpu-s390-features.args |  2 +-
 tests/qemuxml2argvdata/cpu-s390-zEC12.args    |  2 +-
 tests/qemuxml2argvdata/cpu-strict1.args       |  2 +-
 tests/qemuxml2argvdata/cpu-topology1.args     |  2 +-
 tests/qemuxml2argvdata/cpu-topology2.args     |  2 +-
 tests/qemuxml2argvdata/cpu-topology3.args     |  2 +-
 tests/qemuxml2argvdata/cpu-tsc-frequency.args |  2 +-
 tests/qemuxml2argvdata/cputune-numatune.args  |  2 +-
 .../qemuxml2argvdata/cputune-zero-shares.args |  2 +-
 tests/qemuxml2argvdata/cputune.args           |  2 +-
 .../default-kvm-host-arch.args                |  2 +-
 .../default-qemu-host-arch.args               |  2 +-
 .../fd-memory-no-numa-topology.args           |  2 +-
 .../fd-memory-numa-topology.args              |  2 +-
 .../fd-memory-numa-topology2.args             |  2 +-
 .../fd-memory-numa-topology3.args             |  2 +-
 .../graphics-egl-headless.args                |  2 +-
 .../graphics-sdl-fullscreen.args              |  2 +-
 tests/qemuxml2argvdata/graphics-sdl.args      |  2 +-
 .../hostdev-mdev-precreated.args              |  2 +-
 .../hostdev-pci-address-device.args           |  2 +-
 .../hostdev-pci-address-unassigned.args       |  2 +-
 .../qemuxml2argvdata/hostdev-pci-address.args |  2 +-
 .../hostdev-pci-multifunction.args            |  2 +-
 .../hostdev-scsi-vhost-scsi-ccw.args          |  2 +-
 .../hostdev-scsi-vhost-scsi-pci.args          |  2 +-
 .../hostdev-scsi-vhost-scsi-pcie.args         |  2 +-
 .../hostdev-subsys-mdev-vfio-ccw.args         |  2 +-
 .../hostdev-usb-address-device-boot.args      |  2 +-
 .../hostdev-usb-address-device.args           |  2 +-
 .../qemuxml2argvdata/hostdev-usb-address.args |  2 +-
 .../hostdev-vfio-multidomain.args             |  2 +-
 .../hostdev-vfio-zpci-autogenerate-fids.args  |  2 +-
 .../hostdev-vfio-zpci-autogenerate-uids.args  |  2 +-
 .../hostdev-vfio-zpci-autogenerate.args       |  2 +-
 .../hostdev-vfio-zpci-boundaries.args         |  2 +-
 .../hostdev-vfio-zpci-ccw-memballoon.args     |  2 +-
 .../hostdev-vfio-zpci-multidomain-many.args   |  2 +-
 tests/qemuxml2argvdata/hostdev-vfio-zpci.args |  2 +-
 tests/qemuxml2argvdata/hostdev-vfio.args      |  2 +-
 tests/qemuxml2argvdata/hotplug-base.args      |  2 +-
 .../hugepages-default-2M.args                 |  2 +-
 .../hugepages-default-system-size.args        |  2 +-
 tests/qemuxml2argvdata/hugepages-default.args |  2 +-
 .../qemuxml2argvdata/hugepages-memaccess.args |  2 +-
 .../hugepages-memaccess2.args                 |  2 +-
 tests/qemuxml2argvdata/hugepages-nodeset.args |  2 +-
 .../hugepages-numa-default-2M.args            |  2 +-
 .../hugepages-numa-default-dimm.args          |  2 +-
 .../hugepages-numa-default.args               |  2 +-
 .../hugepages-numa-nodeset-part.args          |  2 +-
 .../hugepages-numa-nodeset.args               |  2 +-
 tests/qemuxml2argvdata/hugepages-shared.args  |  2 +-
 .../hvf-aarch64-virt-headless.args            |  4 +--
 .../hvf-x86_64-q35-headless.args              |  4 +--
 .../qemuxml2argvdata/input-usbmouse-addr.args |  2 +-
 tests/qemuxml2argvdata/input-usbmouse.args    |  2 +-
 tests/qemuxml2argvdata/input-usbtablet.args   |  2 +-
 tests/qemuxml2argvdata/input-virtio-ccw.args  |  2 +-
 .../iothreads-disk-virtio-ccw.args            |  2 +-
 tests/qemuxml2argvdata/iothreads-disk.args    |  2 +-
 .../iothreads-ids-partial.args                |  2 +-
 tests/qemuxml2argvdata/iothreads-ids.args     |  2 +-
 tests/qemuxml2argvdata/iothreads.args         |  2 +-
 tests/qemuxml2argvdata/kvm-features-off.args  |  2 +-
 tests/qemuxml2argvdata/kvm-features.args      |  2 +-
 tests/qemuxml2argvdata/kvm-pit-delay.args     |  2 +-
 tests/qemuxml2argvdata/kvm-pit-discard.args   |  2 +-
 tests/qemuxml2argvdata/kvmclock.args          |  2 +-
 .../mach-virt-console-virtio.args             |  2 +-
 .../mach-virt-serial-native.args              |  2 +-
 .../mach-virt-serial-pci.args                 |  2 +-
 .../mach-virt-serial-usb.args                 |  2 +-
 .../machine-aeskeywrap-off-cap.args           |  2 +-
 .../machine-aeskeywrap-off-caps.args          |  2 +-
 .../machine-aeskeywrap-on-cap.args            |  2 +-
 .../machine-aeskeywrap-on-caps.args           |  2 +-
 tests/qemuxml2argvdata/machine-aliases1.args  |  2 +-
 tests/qemuxml2argvdata/machine-aliases2.args  |  2 +-
 tests/qemuxml2argvdata/machine-core-off.args  |  2 +-
 tests/qemuxml2argvdata/machine-core-on.args   |  2 +-
 .../machine-deakeywrap-off-cap.args           |  2 +-
 .../machine-deakeywrap-off-caps.args          |  2 +-
 .../machine-deakeywrap-on-cap.args            |  2 +-
 .../machine-deakeywrap-on-caps.args           |  2 +-
 .../machine-keywrap-none-caps.args            |  2 +-
 .../machine-keywrap-none.args                 |  2 +-
 ...ine-loadparm-multiple-disks-nets-s390.args |  2 +-
 .../machine-loadparm-net-s390.args            |  2 +-
 .../machine-loadparm-s390.args                |  2 +-
 tests/qemuxml2argvdata/machine-smm-opt.args   |  2 +-
 .../qemuxml2argvdata/machine-vmport-opt.args  |  2 +-
 tests/qemuxml2argvdata/master-key.args        |  2 +-
 .../memory-hotplug-dimm-addr.args             |  2 +-
 .../qemuxml2argvdata/memory-hotplug-dimm.args |  2 +-
 ...emory-hotplug-nvdimm-ppc64-abi-update.args |  2 +-
 .../memory-hotplug-nvdimm-ppc64.args          |  2 +-
 ...emory-hotplug-ppc64-nonuma-abi-update.args |  2 +-
 .../memory-hotplug-ppc64-nonuma.args          |  2 +-
 tests/qemuxml2argvdata/memory-hotplug.args    |  2 +-
 tests/qemuxml2argvdata/memtune-unlimited.args |  2 +-
 tests/qemuxml2argvdata/memtune.args           |  2 +-
 .../migrate-numa-unaligned.args               |  2 +-
 tests/qemuxml2argvdata/migrate.args           |  2 +-
 tests/qemuxml2argvdata/minimal.args           |  2 +-
 tests/qemuxml2argvdata/misc-acpi.args         |  2 +-
 tests/qemuxml2argvdata/misc-disable-s3.args   |  2 +-
 .../misc-disable-suspends.args                |  2 +-
 tests/qemuxml2argvdata/misc-enable-s4.args    |  2 +-
 tests/qemuxml2argvdata/misc-uuid.args         |  2 +-
 tests/qemuxml2argvdata/monitor-json.args      |  2 +-
 .../multifunction-pci-device.args             |  2 +-
 tests/qemuxml2argvdata/net-client.args        |  2 +-
 tests/qemuxml2argvdata/net-eth-hostip.args    |  2 +-
 tests/qemuxml2argvdata/net-eth-ifname.args    |  2 +-
 tests/qemuxml2argvdata/net-eth-names.args     |  2 +-
 .../net-eth-unmanaged-tap.args                |  2 +-
 tests/qemuxml2argvdata/net-eth.args           |  2 +-
 .../net-hostdev-bootorder.args                |  2 +-
 .../net-hostdev-multidomain.args              |  2 +-
 .../net-hostdev-vfio-multidomain.args         |  2 +-
 tests/qemuxml2argvdata/net-hostdev-vfio.args  |  2 +-
 tests/qemuxml2argvdata/net-hostdev.args       |  2 +-
 tests/qemuxml2argvdata/net-many-models.args   |  2 +-
 tests/qemuxml2argvdata/net-mcast.args         |  2 +-
 tests/qemuxml2argvdata/net-server.args        |  2 +-
 tests/qemuxml2argvdata/net-udp.args           |  2 +-
 tests/qemuxml2argvdata/net-user-addr.args     |  2 +-
 tests/qemuxml2argvdata/net-user.args          |  2 +-
 .../net-vhostuser-multiq.args                 |  2 +-
 tests/qemuxml2argvdata/net-virtio-ccw.args    |  2 +-
 tests/qemuxml2argvdata/net-virtio-device.args |  2 +-
 .../net-virtio-disable-offloads.args          |  2 +-
 tests/qemuxml2argvdata/net-virtio-netdev.args |  2 +-
 .../net-virtio-rxtxqueuesize.args             |  2 +-
 .../net-virtio-teaming-hostdev.args           |  2 +-
 .../qemuxml2argvdata/net-virtio-teaming.args  |  2 +-
 tests/qemuxml2argvdata/net-virtio.args        |  2 +-
 tests/qemuxml2argvdata/nosharepages.args      |  2 +-
 .../numad-auto-memory-vcpu-cpuset.args        |  2 +-
 ...o-memory-vcpu-no-cpuset-and-placement.args |  2 +-
 .../numad-auto-vcpu-static-numatune.args      |  2 +-
 .../numad-static-memory-auto-vcpu.args        |  2 +-
 tests/qemuxml2argvdata/numad.args             |  2 +-
 .../numatune-auto-nodeset-invalid.args        |  2 +-
 .../numatune-auto-prefer.args                 |  2 +-
 .../qemuxml2argvdata/numatune-distances.args  |  2 +-
 .../numatune-memnode-no-memory.args           |  2 +-
 tests/qemuxml2argvdata/numatune-memnode.args  |  2 +-
 tests/qemuxml2argvdata/numatune-memory.args   |  2 +-
 tests/qemuxml2argvdata/numatune-no-vcpu.args  |  2 +-
 .../qemuxml2argvdata/pages-dimm-discard.args  |  2 +-
 .../pages-discard-hugepages.args              |  2 +-
 tests/qemuxml2argvdata/pages-discard.args     |  2 +-
 .../parallel-parport-chardev.args             |  2 +-
 .../parallel-tcp-chardev.args                 |  2 +-
 tests/qemuxml2argvdata/pci-autoadd-addr.args  |  2 +-
 tests/qemuxml2argvdata/pci-autoadd-idx.args   |  2 +-
 tests/qemuxml2argvdata/pci-autofill-addr.args |  2 +-
 .../pci-bridge-many-disks.args                |  2 +-
 tests/qemuxml2argvdata/pci-bridge.args        |  2 +-
 tests/qemuxml2argvdata/pci-expander-bus.args  |  2 +-
 tests/qemuxml2argvdata/pci-many.args          |  2 +-
 tests/qemuxml2argvdata/pci-rom-disabled.args  |  2 +-
 tests/qemuxml2argvdata/pci-rom.args           |  2 +-
 .../pci-serial-dev-chardev.args               |  2 +-
 tests/qemuxml2argvdata/pcie-expander-bus.args |  2 +-
 .../pcie-root-port-model-generic.args         |  2 +-
 .../pcie-root-port-model-ioh3420.args         |  2 +-
 tests/qemuxml2argvdata/pcie-root-port.args    |  2 +-
 tests/qemuxml2argvdata/pcie-root.args         |  2 +-
 .../pcie-switch-downstream-port.args          |  2 +-
 .../pcie-switch-upstream-port.args            |  2 +-
 tests/qemuxml2argvdata/pcihole64-q35.args     |  2 +-
 tests/qemuxml2argvdata/pcihole64.args         |  2 +-
 tests/qemuxml2argvdata/pmu-feature-off.args   |  2 +-
 tests/qemuxml2argvdata/pmu-feature.args       |  2 +-
 tests/qemuxml2argvdata/ppc-dtb.args           |  2 +-
 .../ppc64-usb-controller-legacy.args          |  2 +-
 .../ppc64-usb-controller-qemu-xhci.args       |  2 +-
 .../ppc64-usb-controller.args                 |  2 +-
 tests/qemuxml2argvdata/ppce500-serial.args    |  2 +-
 tests/qemuxml2argvdata/pseries-basic.args     |  2 +-
 .../pseries-console-virtio.args               |  2 +-
 .../pseries-cpu-compat-power9.args            |  2 +-
 .../qemuxml2argvdata/pseries-cpu-compat.args  |  2 +-
 tests/qemuxml2argvdata/pseries-cpu-exact.args |  2 +-
 tests/qemuxml2argvdata/pseries-cpu-le.args    |  2 +-
 tests/qemuxml2argvdata/pseries-features.args  |  2 +-
 .../qemuxml2argvdata/pseries-hostdevs-1.args  |  2 +-
 .../qemuxml2argvdata/pseries-hostdevs-2.args  |  2 +-
 .../qemuxml2argvdata/pseries-hostdevs-3.args  |  2 +-
 .../pseries-machine-max-cpu-compat.args       |  2 +-
 .../pseries-many-buses-1.args                 |  2 +-
 .../pseries-many-buses-2.args                 |  2 +-
 .../pseries-many-devices.args                 |  2 +-
 tests/qemuxml2argvdata/pseries-nvram.args     |  2 +-
 .../pseries-panic-missing.args                |  2 +-
 .../pseries-panic-no-address.args             |  2 +-
 .../pseries-phb-default-missing.args          |  2 +-
 .../pseries-phb-numa-node.args                |  2 +-
 .../qemuxml2argvdata/pseries-phb-simple.args  |  2 +-
 .../pseries-serial-native.args                |  2 +-
 .../qemuxml2argvdata/pseries-serial-pci.args  |  2 +-
 .../qemuxml2argvdata/pseries-serial-usb.args  |  2 +-
 .../qemuxml2argvdata/pseries-usb-default.args |  2 +-
 tests/qemuxml2argvdata/pseries-usb-kbd.args   |  2 +-
 tests/qemuxml2argvdata/pseries-usb-multi.args |  2 +-
 .../pseries-vio-user-assigned.args            |  2 +-
 tests/qemuxml2argvdata/pseries-vio.args       |  2 +-
 tests/qemuxml2argvdata/q35-acpi-nouefi.args   |  2 +-
 tests/qemuxml2argvdata/q35-acpi-uefi.args     |  2 +-
 .../q35-default-devices-only.args             |  2 +-
 tests/qemuxml2argvdata/q35-multifunction.args |  2 +-
 tests/qemuxml2argvdata/q35-noacpi-nouefi.args |  2 +-
 .../q35-pci-force-address.args                |  2 +-
 tests/qemuxml2argvdata/q35-pcie-autoadd.args  |  2 +-
 tests/qemuxml2argvdata/q35-pcie.args          |  2 +-
 .../q35-pm-disable-fallback.args              |  2 +-
 tests/qemuxml2argvdata/q35-pm-disable.args    |  2 +-
 tests/qemuxml2argvdata/q35-usb2-multi.args    |  2 +-
 tests/qemuxml2argvdata/q35-usb2-reorder.args  |  2 +-
 tests/qemuxml2argvdata/q35-usb2.args          |  2 +-
 .../q35-virt-manager-basic.args               |  4 +--
 tests/qemuxml2argvdata/q35-virtio-pci.args    |  2 +-
 tests/qemuxml2argvdata/q35.args               |  2 +-
 tests/qemuxml2argvdata/qemu-ns-alt.args       |  2 +-
 .../qemu-ns-commandline-ns0.args              |  2 +-
 .../qemu-ns-commandline-ns1.args              |  2 +-
 .../qemuxml2argvdata/qemu-ns-commandline.args |  2 +-
 .../qemu-ns-domain-commandline-ns0.args       |  2 +-
 .../qemu-ns-domain-commandline.args           |  2 +-
 .../qemuxml2argvdata/qemu-ns-domain-ns0.args  |  2 +-
 tests/qemuxml2argvdata/qemu-ns-no-env.args    |  2 +-
 .../reboot-timeout-disabled.args              |  2 +-
 .../reboot-timeout-enabled.args               |  2 +-
 tests/qemuxml2argvdata/restore-v2-fd.args     |  2 +-
 tests/qemuxml2argvdata/restore-v2.args        |  2 +-
 tests/qemuxml2argvdata/riscv64-virt-pci.args  |  2 +-
 tests/qemuxml2argvdata/riscv64-virt.args      |  2 +-
 .../qemuxml2argvdata/s390-panic-missing.args  |  2 +-
 .../s390-panic-no-address.args                |  2 +-
 tests/qemuxml2argvdata/s390-serial-2.args     |  2 +-
 .../qemuxml2argvdata/s390-serial-console.args |  2 +-
 tests/qemuxml2argvdata/s390-serial.args       |  2 +-
 tests/qemuxml2argvdata/seclabel-dac-none.args |  2 +-
 .../seclabel-dynamic-baselabel.args           |  2 +-
 .../seclabel-dynamic-labelskip.args           |  2 +-
 .../seclabel-dynamic-override.args            |  2 +-
 .../seclabel-dynamic-relabel.args             |  2 +-
 tests/qemuxml2argvdata/seclabel-dynamic.args  |  2 +-
 tests/qemuxml2argvdata/seclabel-none.args     |  2 +-
 .../seclabel-static-labelskip.args            |  2 +-
 .../seclabel-static-relabel.args              |  2 +-
 tests/qemuxml2argvdata/seclabel-static.args   |  2 +-
 .../serial-dev-chardev-iobase.args            |  2 +-
 .../qemuxml2argvdata/serial-dev-chardev.args  |  2 +-
 .../qemuxml2argvdata/serial-file-chardev.args |  5 +--
 tests/qemuxml2argvdata/serial-file-log.args   |  6 ++--
 .../qemuxml2argvdata/serial-many-chardev.args |  5 +--
 .../qemuxml2argvdata/serial-pty-chardev.args  |  2 +-
 .../serial-spiceport-nospice.args             |  2 +-
 tests/qemuxml2argvdata/serial-spiceport.args  |  2 +-
 .../qemuxml2argvdata/serial-tcp-chardev.args  |  2 +-
 .../serial-tcp-telnet-chardev.args            |  2 +-
 .../serial-tcp-tlsx509-chardev-notls.args     |  2 +-
 .../serial-tcp-tlsx509-chardev-verify.args    |  2 +-
 .../serial-tcp-tlsx509-chardev.args           |  2 +-
 .../serial-tcp-tlsx509-secret-chardev.args    |  2 +-
 .../qemuxml2argvdata/serial-udp-chardev.args  |  2 +-
 .../qemuxml2argvdata/serial-unix-chardev.args |  4 +--
 tests/qemuxml2argvdata/serial-vc-chardev.args |  2 +-
 .../shmem-plain-doorbell.args                 |  2 +-
 tests/qemuxml2argvdata/shmem.args             |  2 +-
 .../smartcard-controller.args                 |  2 +-
 .../smartcard-host-certificates-database.args |  2 +-
 .../smartcard-host-certificates.args          |  2 +-
 tests/qemuxml2argvdata/smartcard-host.args    |  2 +-
 .../smartcard-passthrough-spicevmc.args       |  2 +-
 .../smartcard-passthrough-tcp.args            |  2 +-
 tests/qemuxml2argvdata/smbios-type-fwcfg.args |  2 +-
 tests/qemuxml2argvdata/smbios.args            |  2 +-
 tests/qemuxml2argvdata/smp-dies.args          |  2 +-
 tests/qemuxml2argvdata/smp.args               |  2 +-
 tests/qemuxml2argvdata/sound-device.args      |  2 +-
 tests/qemuxml2argvdata/sound.args             |  2 +-
 tests/qemuxml2argvdata/sparc-minimal.args     |  2 +-
 .../usb-controller-default-q35.args           |  2 +-
 .../usb-controller-explicit-q35.args          |  2 +-
 .../usb-controller-qemu-xhci.args             |  2 +-
 .../qemuxml2argvdata/usb-controller-xhci.args |  2 +-
 tests/qemuxml2argvdata/usb-controller.args    |  2 +-
 .../usb-hub-autoadd-deluxe.args               |  2 +-
 tests/qemuxml2argvdata/usb-hub-autoadd.args   |  2 +-
 tests/qemuxml2argvdata/usb-hub.args           |  2 +-
 .../qemuxml2argvdata/usb-ich9-autoassign.args |  2 +-
 .../qemuxml2argvdata/usb-ich9-companion.args  |  2 +-
 .../qemuxml2argvdata/usb-ich9-ehci-addr.args  |  2 +-
 .../qemuxml2argvdata/usb-long-port-path.args  |  2 +-
 tests/qemuxml2argvdata/usb-none.args          |  2 +-
 .../usb-piix3-controller.args                 |  2 +-
 .../qemuxml2argvdata/usb-port-autoassign.args |  2 +-
 tests/qemuxml2argvdata/usb-port-missing.args  |  2 +-
 tests/qemuxml2argvdata/usb-ports.args         |  2 +-
 tests/qemuxml2argvdata/usb-redir-boot.args    |  2 +-
 .../usb-redir-filter-version.args             |  2 +-
 tests/qemuxml2argvdata/usb-redir-filter.args  |  2 +-
 tests/qemuxml2argvdata/usb-redir.args         |  2 +-
 .../qemuxml2argvdata/usb-xhci-autoassign.args |  2 +-
 tests/qemuxml2argvdata/usb1-usb2.args         |  2 +-
 tests/qemuxml2argvdata/user-aliases-usb.args  |  2 +-
 tests/qemuxml2argvdata/user-aliases.args      |  4 +--
 .../vcpu-placement-static.args                |  2 +-
 .../video-device-pciaddr-default.args         |  2 +-
 tests/qemuxml2argvdata/video-none-device.args |  2 +-
 .../video-qxl-device-vgamem.args              |  2 +-
 tests/qemuxml2argvdata/video-qxl-device.args  |  2 +-
 tests/qemuxml2argvdata/video-qxl-heads.args   |  2 +-
 tests/qemuxml2argvdata/video-qxl-noheads.args |  2 +-
 .../video-qxl-resolution.args                 |  2 +-
 .../video-qxl-sec-device-vgamem.args          |  2 +-
 .../video-qxl-sec-device.args                 |  2 +-
 .../video-vga-device-vgamem.args              |  2 +-
 tests/qemuxml2argvdata/video-vga-device.args  |  2 +-
 .../qemuxml2argvdata/video-vga-qxl-heads.args |  2 +-
 .../video-virtio-gpu-ccw.args                 |  2 +-
 .../video-virtio-gpu-device.args              |  2 +-
 .../video-virtio-gpu-sdl-gl.args              |  2 +-
 .../video-virtio-gpu-secondary.args           |  2 +-
 .../video-virtio-gpu-spice-gl.args            |  2 +-
 .../video-virtio-gpu-virgl.args               |  2 +-
 tests/qemuxml2argvdata/video-virtio-vga.args  |  2 +-
 .../virtio-input-passthrough.args             |  2 +-
 tests/qemuxml2argvdata/virtio-input.args      |  2 +-
 tests/qemuxml2argvdata/virtio-rng-ccw.args    |  2 +-
 .../qemuxml2argvdata/virtio-rng-default.args  |  2 +-
 tests/qemuxml2argvdata/virtio-rng-egd.args    |  2 +-
 .../qemuxml2argvdata/virtio-rng-multiple.args |  2 +-
 tests/qemuxml2argvdata/virtio-rng-random.args |  2 +-
 tests/qemuxml2argvdata/vmcoreinfo.args        |  2 +-
 tests/qemuxml2argvtest.c                      | 36 +++++++------------
 459 files changed, 491 insertions(+), 516 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 24873f6fb7..0b2ebaf123 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2342,11 +2342,7 @@ qemuProcessWaitForMonitor(virQEMUDriver *driver,
     int ret = -1;
     g_autoptr(GHashTable) info = NULL;
     qemuDomainObjPrivate *priv = vm->privateData;
-    bool retry = true;
-
-    if (priv->qemuCaps &&
-        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE))
-        retry = false;
+    bool retry = false;

     VIR_DEBUG("Connect monitor to vm=%p name='%s' retry=%d",
               vm, vm->def->name, retry);
@@ -6758,18 +6754,9 @@ qemuProcessPrepareHostBackendChardevFileHelper(const char *path,
                                                int *fd,
                                                virLogManager *logManager,
                                                virSecurityManager *secManager,
-                                               virQEMUCaps *qemuCaps,
                                                virQEMUDriverConfig *cfg,
                                                const virDomainDef *def)
 {
-    /* Technically, to pass an FD via /dev/fdset we don't need
-     * any capability check because X_QEMU_CAPS_ADD_FD is already
-     * assumed. But keeping the old style is still handy when
-     * building a standalone command line (e.g. for tests). */
-    if (!logManager &&
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE))
-        return 0;
-
     if (logManager) {
         int flags = 0;

@@ -6867,7 +6854,6 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
                                                            &charpriv->fd,
                                                            data->logManager,
                                                            data->secManager,
-                                                           data->qemuCaps,
                                                            data->cfg,
                                                            data->def) < 0)
             return -1;
@@ -6875,9 +6861,7 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
         break;

     case VIR_DOMAIN_CHR_TYPE_UNIX:
-        if (chardev->data.nix.listen &&
-            virQEMUCapsGet(data->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE)) {
-
+        if (chardev->data.nix.listen) {
             if (qemuSecuritySetSocketLabel(data->secManager, data->def) < 0)
                 return -1;

@@ -6908,7 +6892,6 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
                                                            &charpriv->logfd,
                                                            data->logManager,
                                                            data->secManager,
-                                                           data->qemuCaps,
                                                            data->cfg,
                                                            data->def) < 0)
             return -1;
@@ -8729,7 +8712,7 @@ qemuProcessReconnect(void *opaque)
     size_t i;
     unsigned int stopFlags = 0;
     bool jobStarted = false;
-    bool retry = true;
+    bool retry = false;
     bool tryMonReconn = false;

     virIdentitySetCurrent(data->identity);
@@ -8765,9 +8748,6 @@ qemuProcessReconnect(void *opaque)
     if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0)
         goto error;

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE))
-        retry = false;
-
     if (qemuDomainObjStartWorker(obj) < 0)
         goto error;

diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 4be6cc308b..b8af6b7f3b 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

[ snipped ]




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux