Re: [libvirt] [PATCH] qemu: A typo which causes non-exsiting NIC detachment failed

2012-03-12 Thread Guannan Ren 

On 03/13/2012 03:24 AM, Laine Stump wrote:

On 03/12/2012 11:50 AM, Guannan Ren wrote:

---
  src/qemu/qemu_hotplug.c |   14 +++---
  1 files changed, 7 insertions(+), 7 deletions(-)

ACK (and I'll push it in a couple hours - I want to add some details to
the commit log message) Thanks!


  Yes, my comment is not very clear, sorry about that.

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] qemu: A typo which causes non-exsiting NIC detachment failed

2012-03-12 Thread Laine Stump 
On 03/12/2012 11:50 AM, Guannan Ren wrote:
> ---
>  src/qemu/qemu_hotplug.c |   14 +++---
>  1 files changed, 7 insertions(+), 7 deletions(-)

ACK (and I'll push it in a couple hours - I want to add some details to
the commit log message) Thanks!

>
> diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
> index 1e56354..e088a49 100644
> --- a/src/qemu/qemu_hotplug.c
> +++ b/src/qemu/qemu_hotplug.c
> @@ -2081,13 +2081,6 @@ qemuDomainDetachNetDevice(struct qemud_driver *driver,
>  }
>  }
>  
> -if (virDomainNetGetActualType(detach) == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
> -ret = qemuDomainDetachThisHostDevice(driver, vm,
> - 
> virDomainNetGetActualHostdev(detach),
> - -1);
> -goto cleanup;
> -}
> -
>  if (!detach) {
>  qemuReportError(VIR_ERR_OPERATION_FAILED,
>  _("network device %02x:%02x:%02x:%02x:%02x:%02x not 
> found"),
> @@ -2097,6 +2090,13 @@ qemuDomainDetachNetDevice(struct qemud_driver *driver,
>  goto cleanup;
>  }
>  
> +if (virDomainNetGetActualType(detach) == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
> +ret = qemuDomainDetachThisHostDevice(driver, vm,
> + 
> virDomainNetGetActualHostdev(detach),
> + -1);
> +goto cleanup;
> +}
> +
>  if (!virDomainDeviceAddressIsValid(&detach->info,
> VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) {
>  qemuReportError(VIR_ERR_OPERATION_FAILED,

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] qemu: A typo which causes non-exsiting NIC detachment failed

2012-03-12 Thread Guannan Ren 
---
 src/qemu/qemu_hotplug.c |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 1e56354..e088a49 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2081,13 +2081,6 @@ qemuDomainDetachNetDevice(struct qemud_driver *driver,
 }
 }
 
-if (virDomainNetGetActualType(detach) == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
-ret = qemuDomainDetachThisHostDevice(driver, vm,
- 
virDomainNetGetActualHostdev(detach),
- -1);
-goto cleanup;
-}
-
 if (!detach) {
 qemuReportError(VIR_ERR_OPERATION_FAILED,
 _("network device %02x:%02x:%02x:%02x:%02x:%02x not 
found"),
@@ -2097,6 +2090,13 @@ qemuDomainDetachNetDevice(struct qemud_driver *driver,
 goto cleanup;
 }
 
+if (virDomainNetGetActualType(detach) == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
+ret = qemuDomainDetachThisHostDevice(driver, vm,
+ 
virDomainNetGetActualHostdev(detach),
+ -1);
+goto cleanup;
+}
+
 if (!virDomainDeviceAddressIsValid(&detach->info,
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) {
 qemuReportError(VIR_ERR_OPERATION_FAILED,
-- 
1.7.7.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list