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,