motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "hw: report invalid disable-legacy|modern usage for virtio-1-only devs"

Browse source 
This reverts commit f2784eed30
since that accidentally removes the PCIe capabilities from virtio
devices because virtio_pci_dc_realize is called before the new 'mode'
flag is set.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190729162903.4489-3-dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2019-07-29 17:29:03 +01:00 • committed by Michael S. Tsirkin
parent 92fd453c67
commit dd56040d29
7 changed files with 23 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

23
hw/core/machine.c
View file

@ -115,26 +115,9 @@ const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7);
GlobalProperty hw_compat_2_6[] = {
{ "virtio-mmio", "format_transport_address", "off" },
/*
* don't include devices which are modern-only
* ie keyboard, mouse, tablet, gpu, vga & crypto
*/
{ "virtio-9p-pci", "disable-modern", "on" },
{ "virtio-9p-pci", "disable-legacy", "off" },
{ "virtio-balloon-pci", "disable-modern", "on" },
{ "virtio-balloon-pci", "disable-legacy", "off" },
{ "virtio-blk-pci", "disable-modern", "on" },
{ "virtio-blk-pci", "disable-legacy", "off" },
{ "virtio-input-host-pci", "disable-modern", "on" },
{ "virtio-input-host-pci", "disable-legacy", "off" },
{ "virtio-net-pci", "disable-modern", "on" },
{ "virtio-net-pci", "disable-legacy", "off" },
{ "virtio-rng-pci", "disable-modern", "on" },
{ "virtio-rng-pci", "disable-legacy", "off" },
{ "virtio-scsi-pci", "disable-modern", "on" },
{ "virtio-scsi-pci", "disable-legacy", "off" },
{ "virtio-serial-pci", "disable-modern", "on" },
{ "virtio-serial-pci", "disable-legacy", "off" },
/* Optional because not all virtio-pci devices support legacy mode */
{ "virtio-pci", "disable-modern", "on", .optional = true },
{ "virtio-pci", "disable-legacy", "off", .optional = true },
};
const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6);