[PATCH 14/21] qemu: capabilities: Replace aliased machine type by copy of the canonical machine
Michal Privoznik
mprivozn at redhat.com
Mon Jan 27 13:16:44 UTC 2020
On 1/23/20 3:03 PM, Peter Krempa wrote:
> The previous approac of just purging the alias combined with the fact
> that we filled in fake machine types in the test data meant that if a
> test case used an alias machine type such as 'pc' or 'q35' it would not
> properly resolve to the actual data returned by qemu.
>
> This started to be a problem since the CPU driver now looks at the
> default CPU reported with the machine type.
>
> This patch replaces the original approach of just removing the alias by
> replacing it with a copy of the machine type data which the type would
> alias to. This means that we are using the real data while we don't
> modify the test output after every qemu upgrade.
>
> Additionally this change will allow us to drop adding the fake machine
> types later.
>
> The test fallout is from actually excercising the CPU driver with
> actual data.
>
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
> src/qemu/qemu_capabilities.c | 10 +++++++++-
> .../aarch64-virt-graphics.aarch64-latest.args | 1 +
> .../aarch64-virt-headless.aarch64-latest.args | 1 +
> .../channel-unix-guestfwd.x86_64-latest.args | 1 +
> .../console-virtio-unix.x86_64-latest.args | 1 +
> .../controller-virtio-scsi.x86_64-latest.args | 1 +
> .../default-video-type-s390x.s390x-latest.args | 3 +++
> tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 1 +
> .../disk-backing-chains-noindex.x86_64-latest.args | 1 +
> .../disk-cdrom-bus-other.x86_64-latest.args | 1 +
> ...disk-cdrom-empty-network-invalid.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 1 +
> .../disk-error-policy.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args | 1 +
> .../disk-network-gluster.x86_64-latest.args | 1 +
> .../disk-network-iscsi.x86_64-latest.args | 1 +
> .../disk-network-nbd.x86_64-latest.args | 1 +
> .../disk-network-rbd.x86_64-latest.args | 1 +
> .../disk-network-sheepdog.x86_64-latest.args | 1 +
> .../disk-network-source-auth.x86_64-latest.args | 1 +
> .../disk-network-tlsx509.x86_64-latest.args | 2 +-
> tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args | 1 +
> .../disk-readonly-disk.x86_64-latest.args | 1 +
> .../disk-scsi-device-auto.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/disk-shared.x86_64-latest.args | 1 +
> .../disk-virtio-scsi-reservations.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args | 2 +-
> tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args | 2 +-
> .../floppy-drive-fat.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args | 1 +
> tests/qemuxml2argvdata/fs9p.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/genid-auto.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/genid.x86_64-latest.args | 1 +
> ...graphics-egl-headless-rendernode.x86_64-latest.args | 1 +
> .../graphics-egl-headless.x86_64-latest.args | 1 +
> ...raphics-spice-gl-auto-rendernode.x86_64-latest.args | 1 +
> .../graphics-vnc-tls-secret.x86_64-latest.args | 1 +
> .../graphics-vnc-tls.x86_64-latest.args | 1 +
> .../hostdev-mdev-display-ramfb.x86_64-latest.args | 1 +
> ...-mdev-display-spice-egl-headless.x86_64-latest.args | 1 +
> ...ostdev-mdev-display-spice-opengl.x86_64-latest.args | 1 +
> ...ev-mdev-display-vnc-egl-headless.x86_64-latest.args | 1 +
> .../hostdev-mdev-display-vnc.x86_64-latest.args | 1 +
> .../hostdev-subsys-mdev-vfio-ap.s390x-latest.args | 1 +
> ...hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args | 1 +
> .../hugepages-nvdimm.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args | 2 +-
> .../hyperv-stimer-direct.x86_64-latest.args | 2 +-
> tests/qemuxml2argvdata/hyperv.x86_64-latest.args | 2 +-
> .../intel-iommu-caching-mode.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/intel-iommu-caching-mode.xml | 3 +++
> .../intel-iommu-device-iotlb.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml | 3 +++
> .../intel-iommu-eim.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/intel-iommu-eim.xml | 3 +++
> tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args | 1 +
> tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/intel-iommu.xml | 3 +++
> .../qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args | 1 +
> .../iothreads-virtio-scsi-ccw.s390x-latest.args | 1 +
> .../iothreads-virtio-scsi-pci.x86_64-latest.args | 1 +
> .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +-
> .../memory-hotplug-nvdimm-access.x86_64-latest.args | 1 +
> .../memory-hotplug-nvdimm-align.x86_64-latest.args | 1 +
> .../memory-hotplug-nvdimm-label.x86_64-latest.args | 1 +
> .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 1 +
> .../memory-hotplug-nvdimm-readonly.x86_64-latest.args | 1 +
> .../memory-hotplug-nvdimm.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/mlock-off.x86_64-latest.args | 1 +
> tests/qemuxml2argvdata/mlock-on.x86_64-latest.args | 1 +
> .../qemuxml2argvdata/net-vhostuser.x86_64-latest.args | 1 +
> .../parallel-unix-chardev.x86_64-latest.args | 1 +
> .../ppc64-pseries-graphics.ppc64-latest.args | 1 +
> .../ppc64-pseries-headless.ppc64-latest.args | 1 +
> .../pv-spinlock-disabled.x86_64-latest.args | 2 +-
> .../pv-spinlock-enabled.x86_64-latest.args | 2 +-
> tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args | 1 +
> .../s390x-ccw-graphics.s390x-latest.args | 1 +
> .../s390x-ccw-headless.s390x-latest.args | 1 +
> .../serial-unix-chardev.x86_64-latest.args | 1 +
> .../smartcard-passthrough-unix.x86_64-latest.args | 1 +
> .../qemuxml2argvdata/usb-redir-unix.x86_64-latest.args | 1 +
> .../vhost-user-gpu-secondary.x86_64-latest.args | 1 +
> .../qemuxml2argvdata/vhost-user-vga.x86_64-latest.args | 1 +
> .../vhost-vsock-ccw-auto.s390x-latest.args | 1 +
> .../qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args | 1 +
> .../video-bochs-display-device.x86_64-latest.args | 1 +
> .../video-qxl-device-vram64.x86_64-latest.args | 1 +
> .../video-qxl-sec-device-vram64.x86_64-latest.args | 1 +
> .../video-ramfb-display-device.x86_64-latest.args | 1 +
> .../virtio-non-transitional.x86_64-latest.args | 1 +
> .../virtio-rng-egd-unix.x86_64-latest.args | 1 +
> .../virtio-transitional.x86_64-latest.args | 1 +
> .../x86_64-pc-graphics.x86_64-latest.args | 1 +
> .../x86_64-pc-headless.x86_64-latest.args | 1 +
> .../x86_64-q35-graphics.x86_64-latest.args | 1 +
> .../x86_64-q35-headless.x86_64-latest.args | 1 +
> .../aarch64-virt-graphics.aarch64-latest.xml | 3 +++
> .../aarch64-virt-headless.aarch64-latest.xml | 3 +++
> .../default-video-type-s390x.s390x-latest.xml | 1 +
> .../disk-cdrom-empty-network-invalid.x86_64-latest.xml | 3 +++
> .../qemuxml2xmloutdata/genid-active.x86_64-latest.xml | 3 +++
> .../genid-auto-active.x86_64-latest.xml | 3 +++
> .../genid-auto-inactive.x86_64-latest.xml | 3 +++
> .../genid-inactive.x86_64-latest.xml | 3 +++
> .../hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.xml | 3 +++
> tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml | 3 +++
> .../qemuxml2xmloutdata/iommu-smmuv3.aarch64-latest.xml | 3 +++
> .../ppc64-pseries-graphics.ppc64-latest.xml | 3 +++
> .../ppc64-pseries-headless.ppc64-latest.xml | 3 +++
> .../s390x-ccw-graphics.s390x-latest.xml | 3 +++
> .../s390x-ccw-headless.s390x-latest.xml | 3 +++
> .../virtio-non-transitional.x86_64-latest.xml | 3 +++
> .../virtio-transitional.x86_64-latest.xml | 3 +++
> .../x86_64-pc-graphics.x86_64-latest.xml | 3 +++
> .../x86_64-pc-headless.x86_64-latest.xml | 3 +++
> .../x86_64-q35-graphics.x86_64-latest.xml | 3 +++
> .../x86_64-q35-headless.x86_64-latest.xml | 3 +++
> 120 files changed, 178 insertions(+), 10 deletions(-)
>
This needs to be rebased.
More information about the libvir-list
mailing list