[libvirt] [PATCH 2/3] qemu: Remove need for virConnectPtr in hotunplug detach host, net
John Ferlan
jferlan at redhat.com
Wed Sep 24 13:16:58 UTC 2014
On 09/24/2014 09:11 AM, John Ferlan wrote:
> Prior patch removed the need for the virConnectPtr in the unplug
> detach host path which caused ripple effect to remove in multiple
> callers. The previous patch just left things as ATTRIBUTE_UNUSED -
> this patch will remove the variable.
>
> Signed-off-by: John Ferlan <jferlan at redhat.com>
UG.... Looks like I have to squash most parts of 3/3 into here...
For review/build purposes just combine the two - I'll do the right thing
for commit...
Off for another cup o joe to see if that helps :-)
John
> ---
> src/qemu/qemu_driver.c | 4 ++--
> src/qemu/qemu_hotplug.h | 6 ++----
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index e73d4f9..c98e42f 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -6758,10 +6758,10 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
> ret = qemuDomainDetachLease(driver, vm, dev->data.lease);
> break;
> case VIR_DOMAIN_DEVICE_NET:
> - ret = qemuDomainDetachNetDevice(dom->conn, driver, vm, dev);
> + ret = qemuDomainDetachNetDevice(driver, vm, dev);
> break;
> case VIR_DOMAIN_DEVICE_HOSTDEV:
> - ret = qemuDomainDetachHostDevice(dom->conn, driver, vm, dev);
> + ret = qemuDomainDetachHostDevice(driver, vm, dev);
> break;
> case VIR_DOMAIN_DEVICE_CHR:
> ret = qemuDomainDetachChrDevice(driver, vm, dev->data.chr);
> diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
> index 55c9333..1c9ca8f 100644
> --- a/src/qemu/qemu_hotplug.h
> +++ b/src/qemu/qemu_hotplug.h
> @@ -78,12 +78,10 @@ int qemuDomainDetachDeviceDiskLive(virQEMUDriverPtr driver,
> int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
> virDomainObjPtr vm,
> virDomainDeviceDefPtr dev);
> -int qemuDomainDetachNetDevice(virConnectPtr conn,
> - virQEMUDriverPtr driver,
> +int qemuDomainDetachNetDevice(virQEMUDriverPtr driver,
> virDomainObjPtr vm,
> virDomainDeviceDefPtr dev);
> -int qemuDomainDetachHostDevice(virConnectPtr conn,
> - virQEMUDriverPtr driver,
> +int qemuDomainDetachHostDevice(virQEMUDriverPtr driver,
> virDomainObjPtr vm,
> virDomainDeviceDefPtr dev);
> int qemuDomainAttachLease(virQEMUDriverPtr driver,
>
More information about the libvir-list
mailing list