[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/11] vfio/pci: Fix return of vfio_populate_vga()
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PULL 03/11] vfio/pci: Fix return of vfio_populate_vga() |
Date: |
Thu, 26 May 2016 12:00:50 -0600 |
User-agent: |
StGit/0.17.1-dirty |
This function returns success if either we setup the VGA region or
the host vfio doesn't return enough regions to support the VGA index.
This latter case doesn't make any sense. If we're asked to populate
VGA, fail if it doesn't exist and let the caller decide if that's
important.
Signed-off-by: Alex Williamson <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Tested-by: Gerd Hoffmann <address@hidden>
---
hw/vfio/pci.c | 55 ++++++++++++++++++++++++++-----------------------------
1 file changed, 26 insertions(+), 29 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index d091d8c..dfce313 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2061,42 +2061,39 @@ int vfio_populate_vga(VFIOPCIDevice *vdev)
struct vfio_region_info *reg_info;
int ret;
- if (vbasedev->num_regions > VFIO_PCI_VGA_REGION_INDEX) {
- ret = vfio_get_region_info(vbasedev,
- VFIO_PCI_VGA_REGION_INDEX, ®_info);
- if (ret) {
- return ret;
- }
+ ret = vfio_get_region_info(vbasedev, VFIO_PCI_VGA_REGION_INDEX, ®_info);
+ if (ret) {
+ return ret;
+ }
- if (!(reg_info->flags & VFIO_REGION_INFO_FLAG_READ) ||
- !(reg_info->flags & VFIO_REGION_INFO_FLAG_WRITE) ||
- reg_info->size < 0xbffff + 1) {
- error_report("vfio: Unexpected VGA info, flags 0x%lx, size 0x%lx",
- (unsigned long)reg_info->flags,
- (unsigned long)reg_info->size);
- g_free(reg_info);
- return -EINVAL;
- }
+ if (!(reg_info->flags & VFIO_REGION_INFO_FLAG_READ) ||
+ !(reg_info->flags & VFIO_REGION_INFO_FLAG_WRITE) ||
+ reg_info->size < 0xbffff + 1) {
+ error_report("vfio: Unexpected VGA info, flags 0x%lx, size 0x%lx",
+ (unsigned long)reg_info->flags,
+ (unsigned long)reg_info->size);
+ g_free(reg_info);
+ return -EINVAL;
+ }
- vdev->vga = g_new0(VFIOVGA, 1);
+ vdev->vga = g_new0(VFIOVGA, 1);
- vdev->vga->fd_offset = reg_info->offset;
- vdev->vga->fd = vdev->vbasedev.fd;
+ vdev->vga->fd_offset = reg_info->offset;
+ vdev->vga->fd = vdev->vbasedev.fd;
- g_free(reg_info);
+ g_free(reg_info);
- vdev->vga->region[QEMU_PCI_VGA_MEM].offset = QEMU_PCI_VGA_MEM_BASE;
- vdev->vga->region[QEMU_PCI_VGA_MEM].nr = QEMU_PCI_VGA_MEM;
- QLIST_INIT(&vdev->vga->region[QEMU_PCI_VGA_MEM].quirks);
+ vdev->vga->region[QEMU_PCI_VGA_MEM].offset = QEMU_PCI_VGA_MEM_BASE;
+ vdev->vga->region[QEMU_PCI_VGA_MEM].nr = QEMU_PCI_VGA_MEM;
+ QLIST_INIT(&vdev->vga->region[QEMU_PCI_VGA_MEM].quirks);
- vdev->vga->region[QEMU_PCI_VGA_IO_LO].offset = QEMU_PCI_VGA_IO_LO_BASE;
- vdev->vga->region[QEMU_PCI_VGA_IO_LO].nr = QEMU_PCI_VGA_IO_LO;
- QLIST_INIT(&vdev->vga->region[QEMU_PCI_VGA_IO_LO].quirks);
+ vdev->vga->region[QEMU_PCI_VGA_IO_LO].offset = QEMU_PCI_VGA_IO_LO_BASE;
+ vdev->vga->region[QEMU_PCI_VGA_IO_LO].nr = QEMU_PCI_VGA_IO_LO;
+ QLIST_INIT(&vdev->vga->region[QEMU_PCI_VGA_IO_LO].quirks);
- vdev->vga->region[QEMU_PCI_VGA_IO_HI].offset = QEMU_PCI_VGA_IO_HI_BASE;
- vdev->vga->region[QEMU_PCI_VGA_IO_HI].nr = QEMU_PCI_VGA_IO_HI;
- QLIST_INIT(&vdev->vga->region[QEMU_PCI_VGA_IO_HI].quirks);
- }
+ vdev->vga->region[QEMU_PCI_VGA_IO_HI].offset = QEMU_PCI_VGA_IO_HI_BASE;
+ vdev->vga->region[QEMU_PCI_VGA_IO_HI].nr = QEMU_PCI_VGA_IO_HI;
+ QLIST_INIT(&vdev->vga->region[QEMU_PCI_VGA_IO_HI].quirks);
return 0;
}
- [Qemu-devel] [PULL 00/11] VFIO updates 2016-05-26, Alex Williamson, 2016/05/26
- [Qemu-devel] [PULL 01/11] vfio: Enable sparse mmap capability, Alex Williamson, 2016/05/26
- [Qemu-devel] [PULL 02/11] vfio: Create device specific region info helper, Alex Williamson, 2016/05/26
- [Qemu-devel] [PULL 03/11] vfio/pci: Fix return of vfio_populate_vga(),
Alex Williamson <=
- [Qemu-devel] [PULL 04/11] vfio/pci: Consolidate VGA setup, Alex Williamson, 2016/05/26
- [Qemu-devel] [PULL 05/11] vfio/pci: Setup BAR quirks after capabilities probing, Alex Williamson, 2016/05/26
- [Qemu-devel] [PULL 06/11] vfio/pci: Intel graphics legacy mode assignment, Alex Williamson, 2016/05/26
- [Qemu-devel] [PULL 07/11] vfio/pci: Add a separate option for IGD OpRegion support, Alex Williamson, 2016/05/26
- [Qemu-devel] [PULL 08/11] vfio/pci: Add IGD documentation, Alex Williamson, 2016/05/26
- [Qemu-devel] [PULL 09/11] vfio: Fix 128 bit handling when deleting region, Alex Williamson, 2016/05/26
- [Qemu-devel] [PULL 10/11] memory: Fix IOMMU replay base address, Alex Williamson, 2016/05/26
- [Qemu-devel] [PULL 11/11] vfio: Check that IOMMU MR translates to system address space, Alex Williamson, 2016/05/26
- Re: [Qemu-devel] [PULL 00/11] VFIO updates 2016-05-26, Peter Maydell, 2016/05/26