[libvirt] [PATCH v3 05/26] qemu: Clean up qemuDomainAttachHostPCIDevice()

Laine Stump laine at laine.org
Fri Jun 23 15:46:53 UTC 2017


On 06/23/2017 11:03 AM, Andrea Bolognani wrote:
> 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 at redhat.com>

Reviewed-by: Laine Stump <laine at laine.org>

> ---
>  src/qemu/qemu_hotplug.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
> index a486fb4..d9259ab 100644
> --- a/src/qemu/qemu_hotplug.c
> +++ b/src/qemu/qemu_hotplug.c
> @@ -1390,6 +1390,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;
> @@ -1462,7 +1463,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;
> @@ -1471,8 +1472,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;
>          }
>      }
> @@ -1517,7 +1517,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);
>  
> 




More information about the libvir-list mailing list