izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20200206.0' into staging

Browse Source 
VFIO update 2020-02-06

 - Split IGD to separate file and config option (Thomas Huth)

# gpg: Signature made Thu 06 Feb 2020 23:50:49 GMT
# gpg:                using RSA key 239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>" [full]
# gpg:                 aka "Alex Williamson <alex@shazbot.org>" [full]
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>" [full]
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>" [full]
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22

* remotes/awilliam/tags/vfio-update-20200206.0:
  hw/vfio: Move the IGD quirk code to a separate file

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2020-02-07 11:52:15 +00:00
parent 5b7686f3fa 29d62771c8
commit 346ed3151f
5 changed files with 642 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hw/vfio/Kconfig
+5
View File
@@ -36,3 +36,8 @@ config VFIO_AP
default y
select VFIO
depends on LINUX && S390_CCW_VIRTIO
config VFIO_IGD
bool
default y if PC_PCI
depends on VFIO_PCI
hw/vfio/Makefile.objs
+1
View File
@@ -5,3 +5,4 @@ obj-$(CONFIG_VFIO_PLATFORM) += platform.o
obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
obj-$(CONFIG_VFIO_AP) += ap.o
obj-$(CONFIG_VFIO_IGD) += igd.o
hw/vfio/igd.c
+616
View File
File diff suppressed because it is too large Load Diff
hw/vfio/pci-quirks.c
+3 -611
View File
File diff suppressed because it is too large Load Diff
hw/vfio/pci.h
+17
View File
@@ -172,6 +172,21 @@ typedef struct VFIOPCIDevice {
Notifier irqchip_change_notifier;
} VFIOPCIDevice;
/* Use uin32_t for vendor & device so PCI_ANY_ID expands and cannot match hw */
static inline bool vfio_pci_is(VFIOPCIDevice *vdev, uint32_t vendor, uint32_t device)
{
return (vendor == PCI_ANY_ID || vendor == vdev->vendor_id) &&
(device == PCI_ANY_ID || device == vdev->device_id);
}
static inline bool vfio_is_vga(VFIOPCIDevice *vdev)
{
PCIDevice *pdev = &vdev->pdev;
uint16_t class = pci_get_word(pdev->config + PCI_CLASS_DEVICE);
return class == PCI_CLASS_DISPLAY_VGA;
}
uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);
void vfio_pci_write_config(PCIDevice *pdev,
uint32_t addr, uint32_t val, int len);
@@ -189,6 +204,8 @@ void vfio_bar_quirk_finalize(VFIOPCIDevice *vdev, int nr);
void vfio_setup_resetfn_quirk(VFIOPCIDevice *vdev);
int vfio_add_virt_caps(VFIOPCIDevice *vdev, Error **errp);
void vfio_quirk_reset(VFIOPCIDevice *vdev);
VFIOQuirk *vfio_quirk_alloc(int nr_mem);
void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr);
extern const PropertyInfo qdev_prop_nv_gpudirect_clique;