From 3a63e2d29bb2fd92577d42aeb8fa956ae18df22e Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

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

Subject: [PATCH 02/14] qga/commands-posix: Move the udev code from the pci to

 the generic function

MIME-Version: 1.0

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

Content-Transfer-Encoding: 8bit

RH-Author: Thomas Huth <thuth@redhat.com>

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

Patchwork-id: 98526

O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 2/3] qga/commands-posix: Move the udev code from the pci to the generic 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>

The libudev-related code is independent from the other pci-related code

and can be re-used for non-pci devices (like ccw devices on s390x). Thus

move this part to the generic function.

Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1755075

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 43dadc431bacbc5a5baee7e256288a98a3e95ce3)

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

---

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

 1 file changed, 33 insertions(+), 29 deletions(-)

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

index 99d6b1c8c1..6db76aadd1 100644

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

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

@@ -878,10 +878,6 @@ static bool build_guest_fsinfo_for_pci_dev(char const *syspath,

     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");

@@ -940,26 +936,6 @@ static bool build_guest_fsinfo_for_pci_dev(char const *syspath,

     pciaddr->slot = pci[2];

     pciaddr->function = pci[3];

-#ifdef CONFIG_LIBUDEV

-    udev = udev_new();

-    udevice = udev_device_new_from_syspath(udev, syspath);

-    if (udev == NULL || udevice == NULL) {

-        g_debug("failed to query udev");

-    } else {

-        const char *devnode, *serial;

-        devnode = udev_device_get_devnode(udevice);

-        if (devnode != NULL) {

-            disk->dev = g_strdup(devnode);

-            disk->has_dev = true;

-        }

-        serial = udev_device_get_property_value(udevice, "ID_SERIAL");

-        if (serial != NULL && *serial != 0) {

-            disk->serial = g_strdup(serial);

-            disk->has_serial = true;

-        }

-    }

-#endif

-

     if (strcmp(driver, "ata_piix") == 0) {

         /* a host per ide bus, target*:0:<unit>:0 */

         if (!has_host || !has_tgt) {

@@ -1021,10 +997,6 @@ static bool build_guest_fsinfo_for_pci_dev(char const *syspath,

 cleanup:

     g_free(driver);

-#ifdef CONFIG_LIBUDEV

-    udev_unref(udev);

-    udev_device_unref(udevice);

-#endif

     return ret;

 }

@@ -1037,18 +1009,50 @@ static void build_guest_fsinfo_for_real_device(char const *syspath,

     GuestPCIAddress *pciaddr;

     GuestDiskAddressList *list = NULL;

     bool has_hwinf;

+#ifdef CONFIG_LIBUDEV

+    struct udev *udev = NULL;

+    struct udev_device *udevice = NULL;

+#endif

     pciaddr = g_new0(GuestPCIAddress, 1);

+    pciaddr->domain = -1;                       /* -1 means field is invalid */

+    pciaddr->bus = -1;

+    pciaddr->slot = -1;

+    pciaddr->function = -1;

     disk = g_new0(GuestDiskAddress, 1);

     disk->pci_controller = pciaddr;

+    disk->bus_type = GUEST_DISK_BUS_TYPE_UNKNOWN;

     list = g_new0(GuestDiskAddressList, 1);

     list->value = disk;

+#ifdef CONFIG_LIBUDEV

+    udev = udev_new();

+    udevice = udev_device_new_from_syspath(udev, syspath);

+    if (udev == NULL || udevice == NULL) {

+        g_debug("failed to query udev");

+    } else {

+        const char *devnode, *serial;

+        devnode = udev_device_get_devnode(udevice);

+        if (devnode != NULL) {

+            disk->dev = g_strdup(devnode);

+            disk->has_dev = true;

+        }

+        serial = udev_device_get_property_value(udevice, "ID_SERIAL");

+        if (serial != NULL && *serial != 0) {

+            disk->serial = g_strdup(serial);

+            disk->has_serial = true;

+        }

+    }

+

+    udev_unref(udev);

+    udev_device_unref(udevice);

+#endif

+

     has_hwinf = build_guest_fsinfo_for_pci_dev(syspath, disk, errp);

-    if (has_hwinf) {

+    if (has_hwinf || disk->has_dev || disk->has_serial) {

         list->next = fs->disk;

         fs->disk = list;

     } else {

-- 

2.27.0