External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxlDomainDetachDeviceLive: handle hostdev parent is network device

Browse Source 
When hostdev parent is network device, should call
libxlDomainDetachNetDevice to detach the device from a higher level.

Signed-off-by: Chunyan Liu <cyliu@suse.com>
This commit is contained in:
Chunyan Liu 2016-03-21 16:11:38 +08:00 committed by Jim Fehlig
parent b5534e5391
commit 420eff8f26
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libxl/libxl_driver.c
View File

@ -3438,6 +3438,7 @@ libxlDomainDetachNetDevice(libxlDriverPrivatePtr driver,
goto cleanup;
}
networkReleaseActualDevice(vm->def, detach);
virDomainNetRemove(vm->def, detachidx);
ret = 0;
@ -3452,6 +3453,7 @@ libxlDomainDetachDeviceLive(libxlDriverPrivatePtr driver,
virDomainObjPtr vm,
virDomainDeviceDefPtr dev)
{
virDomainHostdevDefPtr hostdev;
int ret = -1;
switch (dev->type) {
@ -3465,8 +3467,16 @@ libxlDomainDetachDeviceLive(libxlDriverPrivatePtr driver,
break;
case VIR_DOMAIN_DEVICE_HOSTDEV:
ret = libxlDomainDetachHostDevice(driver, vm,
dev->data.hostdev);
hostdev = dev->data.hostdev;
/* If this is a network hostdev, we need to use the higher-level
* detach function so that mac address / virtualport are reset
*/
if (hostdev->parent.type == VIR_DOMAIN_DEVICE_NET)
ret = libxlDomainDetachNetDevice(driver, vm,
hostdev->parent.data.net);
else
ret = libxlDomainDetachHostDevice(driver, vm, hostdev);
break;
default: