External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

vbox: Rewrite vboxDomainDetachDeviceFlags

Browse Source
This commit is contained in:
Taowei 2014-08-11 18:06:51 +08:00 committed by Michal Privoznik
parent fa12d7c300
commit 2ad7b494a9
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vbox/vbox_common.c
View File

@ -4280,3 +4280,11 @@ int vboxDomainDetachDevice(virDomainPtr dom, const char *xml)
virDomainDeviceDefFree(dev); virDomainDeviceDefFree(dev);
return ret; return ret;
} }
int vboxDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
unsigned int flags)
{
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE, -1);
return vboxDomainDetachDevice(dom, xml);
}

15
src/vbox/vbox_tmpl.c
View File

@ -1451,21 +1451,6 @@ _vboxAttachDrivesOld(virDomainDefPtr def ATTRIBUTE_UNUSED,
#endif /* VBOX_API_VERSION >= 4000000 */ #endif /* VBOX_API_VERSION >= 4000000 */
static int
vboxDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
unsigned int flags)
{
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1);
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("cannot modify the persistent configuration of a domain"));
return -1;
}
return vboxDomainDetachDevice(dom, xml);
}
static int static int
vboxDomainSnapshotGetAll(virDomainPtr dom, vboxDomainSnapshotGetAll(virDomainPtr dom,
IMachine *machine, IMachine *machine,

2
src/vbox/vbox_uniformed_api.h
View File

@ -533,6 +533,8 @@ int vboxDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
int vboxDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml, int vboxDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml,
unsigned int flags); unsigned int flags);
int vboxDomainDetachDevice(virDomainPtr dom, const char *xml); int vboxDomainDetachDevice(virDomainPtr dom, const char *xml);
int vboxDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
unsigned int flags);
/* Version specified functions for installing uniformed API */ /* Version specified functions for installing uniformed API */
void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);