|
 |
6d3351 |
From 5886eacea292e39271f42f067132fa9265e093dd Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <5886eacea292e39271f42f067132fa9265e093dd@dist-git>
|
|
|
6d3351 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Date: Mon, 17 Jul 2017 12:09:00 +0200
|
|
|
6d3351 |
Subject: [PATCH] qemu: Clean up qemuDomainAttachHostPCIDevice()
|
|
|
6d3351 |
|
|
|
6d3351 |
We use hostdev->info frequently enough that having
|
|
|
6d3351 |
a shorter name for it makes the code more readable.
|
|
|
6d3351 |
We will also be adding even more uses later on.
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Reviewed-by: Laine Stump <laine@laine.org>
|
|
|
6d3351 |
(cherry picked from commit 765421723237aa93441b404ac8b0e67e6d2f636e)
|
|
|
6d3351 |
|
|
|
6d3351 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1431193
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/qemu/qemu_hotplug.c | 8 ++++----
|
|
|
6d3351 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
|
|
6d3351 |
index a6274273dd..316bc7d41e 100644
|
|
|
6d3351 |
--- a/src/qemu/qemu_hotplug.c
|
|
|
6d3351 |
+++ b/src/qemu/qemu_hotplug.c
|
|
|
6d3351 |
@@ -1390,6 +1390,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
|
|
|
6d3351 |
qemuDomainObjPrivatePtr priv = vm->privateData;
|
|
|
6d3351 |
virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_HOSTDEV,
|
|
|
6d3351 |
{ .hostdev = hostdev } };
|
|
|
6d3351 |
+ virDomainDeviceInfoPtr info = hostdev->info;
|
|
|
6d3351 |
int ret;
|
|
|
6d3351 |
char *devstr = NULL;
|
|
|
6d3351 |
int configfd = -1;
|
|
|
6d3351 |
@@ -1462,7 +1463,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
|
|
|
6d3351 |
if (backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO)
|
|
|
6d3351 |
teardownlabel = true;
|
|
|
6d3351 |
|
|
|
6d3351 |
- if (qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1) < 0)
|
|
|
6d3351 |
+ if (qemuAssignDeviceHostdevAlias(vm->def, &info->alias, -1) < 0)
|
|
|
6d3351 |
goto error;
|
|
|
6d3351 |
if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0)
|
|
|
6d3351 |
goto error;
|
|
|
6d3351 |
@@ -1471,8 +1472,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
|
|
|
6d3351 |
virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PCI_CONFIGFD)) {
|
|
|
6d3351 |
configfd = qemuOpenPCIConfig(hostdev);
|
|
|
6d3351 |
if (configfd >= 0) {
|
|
|
6d3351 |
- if (virAsprintf(&configfd_name, "fd-%s",
|
|
|
6d3351 |
- hostdev->info->alias) < 0)
|
|
|
6d3351 |
+ if (virAsprintf(&configfd_name, "fd-%s", info->alias) < 0)
|
|
|
6d3351 |
goto error;
|
|
|
6d3351 |
}
|
|
|
6d3351 |
}
|
|
|
6d3351 |
@@ -1517,7 +1517,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
|
|
|
6d3351 |
VIR_WARN("Unable to remove host device from /dev");
|
|
|
6d3351 |
|
|
|
6d3351 |
if (releaseaddr)
|
|
|
6d3351 |
- qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL);
|
|
|
6d3351 |
+ qemuDomainReleaseDeviceAddress(vm, info, NULL);
|
|
|
6d3351 |
|
|
|
6d3351 |
qemuHostdevReAttachPCIDevices(driver, vm->def->name, &hostdev, 1);
|
|
|
6d3351 |
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.13.3
|
|
|
6d3351 |
|