From 84bc86fdf47729bca77957a04161862ffbedbf2f Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Fri, 2 Oct 2020 10:17:40 -0400

Subject: [PATCH 01/14] qga/commands-posix: Rework

 build_guest_fsinfo_for_real_device() function

MIME-Version: 1.0

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

Content-Transfer-Encoding: 8bit

Message-id: <20201002101742.249169-2-thuth@redhat.com>

Patchwork-id: 98527

O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 1/3] qga/commands-posix: Rework build_guest_fsinfo_for_real_device() function

Bugzilla: 1755075

RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>

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

RH-Acked-by: David Hildenbrand <david@redhat.com>

We are going to support non-PCI devices soon. For this we need to split

the generic GuestDiskAddress and GuestDiskAddressList memory allocation

and list chaining into a separate function first.

Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

(cherry picked from commit d9fe4f0fea31f0560dc40d3576bc6c48ad97109f)

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

---

 qga/commands-posix.c | 65 ++++++++++++++++++++++++++++----------------

 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/qga/commands-posix.c b/qga/commands-posix.c

index 1c1a165dae..99d6b1c8c1 100644

--- a/qga/commands-posix.c

+++ b/qga/commands-posix.c

@@ -865,28 +865,30 @@ static int build_hosts(char const *syspath, char const *host, bool ata,

     return i;

 }

-/* Store disk device info specified by @sysfs into @fs */

-static void build_guest_fsinfo_for_real_device(char const *syspath,

-                                               GuestFilesystemInfo *fs,

-                                               Error **errp)

+/*

+ * Store disk device info for devices on the PCI bus.

+ * Returns true if information has been stored, or false for failure.

+ */

+static bool build_guest_fsinfo_for_pci_dev(char const *syspath,

+                                           GuestDiskAddress *disk,

+                                           Error **errp)

 {

     unsigned int pci[4], host, hosts[8], tgt[3];

     int i, nhosts = 0, pcilen;

-    GuestDiskAddress *disk;

-    GuestPCIAddress *pciaddr;

-    GuestDiskAddressList *list = NULL;

+    GuestPCIAddress *pciaddr = disk->pci_controller;

     bool has_ata = false, has_host = false, has_tgt = false;

     char *p, *q, *driver = NULL;

 #ifdef CONFIG_LIBUDEV

     struct udev *udev = NULL;

     struct udev_device *udevice = NULL;

 #endif

+    bool ret = false;

     p = strstr(syspath, "/devices/pci");

     if (!p || sscanf(p + 12, "%*x:%*x/%x:%x:%x.%x%n",

                      pci, pci + 1, pci + 2, pci + 3, &pcilen) < 4) {

         g_debug("only pci device is supported: sysfs path '%s'", syspath);

-        return;

+        return false;

     }

     p += 12 + pcilen;

@@ -907,7 +909,7 @@ static void build_guest_fsinfo_for_real_device(char const *syspath,

         }

         g_debug("unsupported driver or sysfs path '%s'", syspath);

-        return;

+        return false;

     }

     p = strstr(syspath, "/target");

@@ -933,18 +935,11 @@ static void build_guest_fsinfo_for_real_device(char const *syspath,

         }

     }

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

     pciaddr->domain = pci[0];

     pciaddr->bus = pci[1];

     pciaddr->slot = pci[2];

     pciaddr->function = pci[3];

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

-    disk->pci_controller = pciaddr;

-

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

-    list->value = disk;

-

 #ifdef CONFIG_LIBUDEV

     udev = udev_new();

     udevice = udev_device_new_from_syspath(udev, syspath);

@@ -1022,21 +1017,43 @@ static void build_guest_fsinfo_for_real_device(char const *syspath,

         goto cleanup;

     }

-    list->next = fs->disk;

-    fs->disk = list;

-    goto out;

+    ret = true;

 cleanup:

-    if (list) {

-        qapi_free_GuestDiskAddressList(list);

-    }

-out:

     g_free(driver);

 #ifdef CONFIG_LIBUDEV

     udev_unref(udev);

     udev_device_unref(udevice);

 #endif

-    return;

+    return ret;

+}

+

+/* Store disk device info specified by @sysfs into @fs */

+static void build_guest_fsinfo_for_real_device(char const *syspath,

+                                               GuestFilesystemInfo *fs,

+                                               Error **errp)

+{

+    GuestDiskAddress *disk;

+    GuestPCIAddress *pciaddr;

+    GuestDiskAddressList *list = NULL;

+    bool has_hwinf;

+

+    pciaddr = g_new0(GuestPCIAddress, 1);

+

+    disk = g_new0(GuestDiskAddress, 1);

+    disk->pci_controller = pciaddr;

+

+    list = g_new0(GuestDiskAddressList, 1);

+    list->value = disk;

+

+    has_hwinf = build_guest_fsinfo_for_pci_dev(syspath, disk, errp);

+

+    if (has_hwinf) {

+        list->next = fs->disk;

+        fs->disk = list;

+    } else {

+        qapi_free_GuestDiskAddressList(list);

+    }

 }

 static void build_guest_fsinfo_for_device(char const *devpath,

-- 

2.27.0