From e8b5f27c84d9a7e1b1b18b2a472a1500711da828 Mon Sep 17 00:00:00 2001

From: David Gibson <dgibson@redhat.com>

Date: Thu, 30 May 2019 04:37:26 +0100

Subject: [PATCH 5/8] vfio/quirks: Add common quirk alloc helper

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: David Gibson <dgibson@redhat.com>

Message-id: <20190530043728.32575-5-dgibson@redhat.com>

Patchwork-id: 88422

O-Subject: [RHEL-8.1 qemu-kvm PATCH 4/6] vfio/quirks: Add common quirk alloc helper

Bugzilla: 1710662

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

RH-Acked-by: Auger Eric <eric.auger@redhat.com>

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

From: Alex Williamson <alex.williamson@redhat.com>

This will later be used to include list initialization.

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Peter Xu <peterx@redhat.com>

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

(cherry picked from commit bcf3c3d029e73d54455e1d7a51177c37d668378c)

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1710662

Signed-off-by: David Gibson <dgibson@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/vfio/pci-quirks.c | 48 +++++++++++++++++++++---------------------------

 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c

index 90859d1..92457ed 100644

--- a/hw/vfio/pci-quirks.c

+++ b/hw/vfio/pci-quirks.c

@@ -275,6 +275,15 @@ static const MemoryRegionOps vfio_ati_3c3_quirk = {

     .endianness = DEVICE_LITTLE_ENDIAN,

 };

+static VFIOQuirk *vfio_quirk_alloc(int nr_mem)

+{

+    VFIOQuirk *quirk = g_new0(VFIOQuirk, 1);

+    quirk->mem = g_new0(MemoryRegion, nr_mem);

+    quirk->nr_mem = nr_mem;

+

+    return quirk;

+}

+

 static void vfio_vga_probe_ati_3c3_quirk(VFIOPCIDevice *vdev)

 {

     VFIOQuirk *quirk;

@@ -288,9 +297,7 @@ static void vfio_vga_probe_ati_3c3_quirk(VFIOPCIDevice *vdev)

         return;

     }

-    quirk = g_malloc0(sizeof(*quirk));

-    quirk->mem = g_new0(MemoryRegion, 1);

-    quirk->nr_mem = 1;

+    quirk = vfio_quirk_alloc(1);

     memory_region_init_io(quirk->mem, OBJECT(vdev), &vfio_ati_3c3_quirk, vdev,

                           "vfio-ati-3c3-quirk", 1);

@@ -323,9 +330,7 @@ static void vfio_probe_ati_bar4_quirk(VFIOPCIDevice *vdev, int nr)

         return;

     }

-    quirk = g_malloc0(sizeof(*quirk));

-    quirk->mem = g_new0(MemoryRegion, 2);

-    quirk->nr_mem = 2;

+    quirk = vfio_quirk_alloc(2);

     window = quirk->data = g_malloc0(sizeof(*window) +

                                      sizeof(VFIOConfigWindowMatch));

     window->vdev = vdev;

@@ -371,10 +376,9 @@ static void vfio_probe_ati_bar2_quirk(VFIOPCIDevice *vdev, int nr)

         return;

     }

-    quirk = g_malloc0(sizeof(*quirk));

+    quirk = vfio_quirk_alloc(1);

     mirror = quirk->data = g_malloc0(sizeof(*mirror));

-    mirror->mem = quirk->mem = g_new0(MemoryRegion, 1);

-    quirk->nr_mem = 1;

+    mirror->mem = quirk->mem;

     mirror->vdev = vdev;

     mirror->offset = 0x4000;

     mirror->bar = nr;

@@ -546,10 +550,8 @@ static void vfio_vga_probe_nvidia_3d0_quirk(VFIOPCIDevice *vdev)

         return;

     }

-    quirk = g_malloc0(sizeof(*quirk));

+    quirk = vfio_quirk_alloc(2);

     quirk->data = data = g_malloc0(sizeof(*data));

-    quirk->mem = g_new0(MemoryRegion, 2);

-    quirk->nr_mem = 2;

     data->vdev = vdev;

     memory_region_init_io(&quirk->mem[0], OBJECT(vdev), &vfio_nvidia_3d4_quirk,

@@ -665,9 +667,7 @@ static void vfio_probe_nvidia_bar5_quirk(VFIOPCIDevice *vdev, int nr)

         return;

     }

-    quirk = g_malloc0(sizeof(*quirk));

-    quirk->mem = g_new0(MemoryRegion, 4);

-    quirk->nr_mem = 4;

+    quirk = vfio_quirk_alloc(4);

     bar5 = quirk->data = g_malloc0(sizeof(*bar5) +

                                    (sizeof(VFIOConfigWindowMatch) * 2));

     window = &bar5->window;

@@ -760,10 +760,9 @@ static void vfio_probe_nvidia_bar0_quirk(VFIOPCIDevice *vdev, int nr)

         return;

     }

-    quirk = g_malloc0(sizeof(*quirk));

+    quirk = vfio_quirk_alloc(1);

     mirror = quirk->data = g_malloc0(sizeof(*mirror));

-    mirror->mem = quirk->mem = g_new0(MemoryRegion, 1);

-    quirk->nr_mem = 1;

+    mirror->mem = quirk->mem;

     mirror->vdev = vdev;

     mirror->offset = 0x88000;

     mirror->bar = nr;

@@ -779,10 +778,9 @@ static void vfio_probe_nvidia_bar0_quirk(VFIOPCIDevice *vdev, int nr)

     /* The 0x1800 offset mirror only seems to get used by legacy VGA */

     if (vdev->vga) {

-        quirk = g_malloc0(sizeof(*quirk));

+        quirk = vfio_quirk_alloc(1);

         mirror = quirk->data = g_malloc0(sizeof(*mirror));

-        mirror->mem = quirk->mem = g_new0(MemoryRegion, 1);

-        quirk->nr_mem = 1;

+        mirror->mem = quirk->mem;

         mirror->vdev = vdev;

         mirror->offset = 0x1800;

         mirror->bar = nr;

@@ -943,9 +941,7 @@ static void vfio_probe_rtl8168_bar2_quirk(VFIOPCIDevice *vdev, int nr)

         return;

     }

-    quirk = g_malloc0(sizeof(*quirk));

-    quirk->mem = g_new0(MemoryRegion, 2);

-    quirk->nr_mem = 2;

+    quirk = vfio_quirk_alloc(2);

     quirk->data = rtl = g_malloc0(sizeof(*rtl));

     rtl->vdev = vdev;

@@ -1510,9 +1506,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)

     }

     /* Setup our quirk to munge GTT addresses to the VM allocated buffer */

-    quirk = g_malloc0(sizeof(*quirk));

-    quirk->mem = g_new0(MemoryRegion, 2);

-    quirk->nr_mem = 2;

+    quirk = vfio_quirk_alloc(2);

     igd = quirk->data = g_malloc0(sizeof(*igd));

     igd->vdev = vdev;

     igd->index = ~0;

-- 

1.8.3.1