From: Andrea Bolognani <abologna@redhat.com>
Date: Mon, 5 Jun 2017 13:29:40 +0000 (+0200)
Subject: qemu: Clean up qemuDomainAttachHostPCIDevice()
X-Git-Tag: v3.6.0-rc1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=765421723237aa93441b404ac8b0e67e6d2f636e;p=thirdparty%2Flibvirt.git

qemu: Clean up qemuDomainAttachHostPCIDevice()

We use hostdev->info frequently enough that having
a shorter name for it makes the code more readable.
We will also be adding even more uses later on.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index b5b62dfd79..090142db9b 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1398,6 +1398,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
     qemuDomainObjPrivatePtr priv = vm->privateData;
     virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_HOSTDEV,
                                { .hostdev = hostdev } };
+    virDomainDeviceInfoPtr info = hostdev->info;
     int ret;
     char *devstr = NULL;
     int configfd = -1;
@@ -1470,7 +1471,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
     if (backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO)
         teardownlabel = true;
 
-    if (qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1) < 0)
+    if (qemuAssignDeviceHostdevAlias(vm->def, &info->alias, -1) < 0)
         goto error;
     if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0)
         goto error;
@@ -1479,8 +1480,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
         virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PCI_CONFIGFD)) {
         configfd = qemuOpenPCIConfig(hostdev);
         if (configfd >= 0) {
-            if (virAsprintf(&configfd_name, "fd-%s",
-                            hostdev->info->alias) < 0)
+            if (virAsprintf(&configfd_name, "fd-%s", info->alias) < 0)
                 goto error;
         }
     }
@@ -1525,7 +1525,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
         VIR_WARN("Unable to remove host device from /dev");
 
     if (releaseaddr)
-        qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL);
+        qemuDomainReleaseDeviceAddress(vm, info, NULL);
 
     qemuHostdevReAttachPCIDevices(driver, vm->def->name, &hostdev, 1);