]> git.ipfire.org Git - thirdparty/libvirt.git/commit
qemuBuildControllerPCIDevStr: Format via JSON properties
authorPeter Krempa <pkrempa@redhat.com>
Mon, 4 Oct 2021 21:07:44 +0000 (23:07 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 12 Oct 2021 08:26:05 +0000 (10:26 +0200)
commitd8f04f1575cfa57b319baffdcf1ef8fb6626b5a4
treed8e5b20b2a233f42c83c652ec7299018134ac257
parent626df95907fdae8ba91a99fb3aab7338bcd3991f
qemuBuildControllerPCIDevStr: Format via JSON properties

Internally format the PCI controller properties into JSON, but convert
it back to a string so that we for now change just the SCSI controller.

The change in tests is expected as the 'port' field for various PCI
controllers is expected to be a number and thus can't be represented as
a hexadecimal value in JSON.

QEMU expects the following types:

'pci-bridge'
  chassis_nr=<uint8>     -  (default: 0)

'pxb-pcie':
  bus_nr=<uint8>         -  (default: 0)

'pcie-root-port'
  port=<uint8>           -  (default: 0)
  chassis=<uint8>        -  (default: 0)
  hotplug=<bool>         -  (default: true)

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
71 files changed:
src/qemu/qemu_command.c
tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args
tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args
tests/qemuxml2argvdata/aarch64-pci-serial.args
tests/qemuxml2argvdata/aarch64-traditional-pci.args
tests/qemuxml2argvdata/aarch64-video-default.args
tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
tests/qemuxml2argvdata/autoindex.args
tests/qemuxml2argvdata/bios-nvram-secure.args
tests/qemuxml2argvdata/cpu-host-model.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-2.12.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-3.0.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args
tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args
tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
tests/qemuxml2argvdata/mach-virt-serial-pci.args
tests/qemuxml2argvdata/mach-virt-serial-usb.args
tests/qemuxml2argvdata/machine-smm-opt.args
tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args
tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-latest.args
tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args
tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args
tests/qemuxml2argvdata/pcie-expander-bus.args
tests/qemuxml2argvdata/pcie-root-port-model-generic.args
tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args
tests/qemuxml2argvdata/pcie-root-port.args
tests/qemuxml2argvdata/pcie-switch-downstream-port.args
tests/qemuxml2argvdata/pcie-switch-upstream-port.args
tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.args
tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.args
tests/qemuxml2argvdata/q35-default-devices-only.args
tests/qemuxml2argvdata/q35-multifunction.args
tests/qemuxml2argvdata/q35-pci-force-address.args
tests/qemuxml2argvdata/q35-pcie-autoadd.args
tests/qemuxml2argvdata/q35-pcie.args
tests/qemuxml2argvdata/q35-pm-disable-fallback.args
tests/qemuxml2argvdata/q35-pm-disable.args
tests/qemuxml2argvdata/q35-virt-manager-basic.args
tests/qemuxml2argvdata/q35-virtio-pci.args
tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args
tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args
tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args
tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args