NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

bhyve: Add various vir*Flags API

Browse Source 
Even though we don't accept any flags, it is unfriendly to callers
that use the modern API to have to fall back to the flag-free API.

Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Eric Blake 2019-07-08 16:56:21 -05:00
parent 13f5b223c9
commit eded8aad10
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/bhyve/bhyve_driver.c
View File

@ -577,17 +577,18 @@ bhyveDomainDefineXML(virConnectPtr conn, const char *xml)
} }
static int static int
bhyveDomainUndefine(virDomainPtr domain) bhyveDomainUndefineFlags(virDomainPtr domain, unsigned int flags)
{ {
bhyveConnPtr privconn = domain->conn->privateData; bhyveConnPtr privconn = domain->conn->privateData;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
virDomainObjPtr vm; virDomainObjPtr vm;
int ret = -1; int ret = -1;
virCheckFlags(0, -1);
if (!(vm = bhyveDomObjFromDomain(domain))) if (!(vm = bhyveDomObjFromDomain(domain)))
goto cleanup; goto cleanup;
if (virDomainUndefineEnsureACL(domain->conn, vm->def) < 0) if (virDomainUndefineFlagsEnsureACL(domain->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (!vm->persistent) { if (!vm->persistent) {
@ -618,6 +619,12 @@ bhyveDomainUndefine(virDomainPtr domain)
return ret; return ret;
} }
static int
bhyveDomainUndefine(virDomainPtr domain)
{
return bhyveDomainUndefineFlags(domain, 0);
}
static int static int
bhyveConnectListDomains(virConnectPtr conn, int *ids, int maxids) bhyveConnectListDomains(virConnectPtr conn, int *ids, int maxids)
{ {
@ -971,17 +978,19 @@ bhyveDomainCreateXML(virConnectPtr conn,
} }
static int static int
bhyveDomainDestroy(virDomainPtr dom) bhyveDomainDestroyFlags(virDomainPtr dom, unsigned int flags)
{ {
bhyveConnPtr privconn = dom->conn->privateData; bhyveConnPtr privconn = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
int ret = -1; int ret = -1;
virCheckFlags(0, -1);
if (!(vm = bhyveDomObjFromDomain(dom))) if (!(vm = bhyveDomObjFromDomain(dom)))
goto cleanup; goto cleanup;
if (virDomainDestroyEnsureACL(dom->conn, vm->def) < 0) if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
@ -1002,15 +1011,23 @@ bhyveDomainDestroy(virDomainPtr dom)
} }
static int static int
bhyveDomainShutdown(virDomainPtr dom) bhyveDomainDestroy(virDomainPtr dom)
{
return bhyveDomainDestroyFlags(dom, 0);
}
static int
bhyveDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
{ {
virDomainObjPtr vm; virDomainObjPtr vm;
int ret = -1; int ret = -1;
virCheckFlags(0, -1);
if (!(vm = bhyveDomObjFromDomain(dom))) if (!(vm = bhyveDomObjFromDomain(dom)))
goto cleanup; goto cleanup;
if (virDomainShutdownEnsureACL(dom->conn, vm->def) < 0) if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
@ -1023,6 +1040,12 @@ bhyveDomainShutdown(virDomainPtr dom)
return ret; return ret;
} }
static int
bhyveDomainShutdown(virDomainPtr dom)
{
return bhyveDomainShutdownFlags(dom, 0);
}
static int static int
bhyveDomainOpenConsole(virDomainPtr dom, bhyveDomainOpenConsole(virDomainPtr dom,
const char *dev_name ATTRIBUTE_UNUSED, const char *dev_name ATTRIBUTE_UNUSED,
@ -1658,13 +1681,16 @@ static virHypervisorDriver bhyveHypervisorDriver = {
.domainCreateWithFlags = bhyveDomainCreateWithFlags, /* 1.2.3 */ .domainCreateWithFlags = bhyveDomainCreateWithFlags, /* 1.2.3 */
.domainCreateXML = bhyveDomainCreateXML, /* 1.2.4 */ .domainCreateXML = bhyveDomainCreateXML, /* 1.2.4 */
.domainDestroy = bhyveDomainDestroy, /* 1.2.2 */ .domainDestroy = bhyveDomainDestroy, /* 1.2.2 */
.domainDestroyFlags = bhyveDomainDestroyFlags, /* 5.6.0 */
.domainShutdown = bhyveDomainShutdown, /* 1.3.3 */ .domainShutdown = bhyveDomainShutdown, /* 1.3.3 */
.domainShutdownFlags = bhyveDomainShutdownFlags, /* 5.6.0 */
.domainLookupByUUID = bhyveDomainLookupByUUID, /* 1.2.2 */ .domainLookupByUUID = bhyveDomainLookupByUUID, /* 1.2.2 */
.domainLookupByName = bhyveDomainLookupByName, /* 1.2.2 */ .domainLookupByName = bhyveDomainLookupByName, /* 1.2.2 */
.domainLookupByID = bhyveDomainLookupByID, /* 1.2.3 */ .domainLookupByID = bhyveDomainLookupByID, /* 1.2.3 */
.domainDefineXML = bhyveDomainDefineXML, /* 1.2.2 */ .domainDefineXML = bhyveDomainDefineXML, /* 1.2.2 */
.domainDefineXMLFlags = bhyveDomainDefineXMLFlags, /* 1.2.12 */ .domainDefineXMLFlags = bhyveDomainDefineXMLFlags, /* 1.2.12 */
.domainUndefine = bhyveDomainUndefine, /* 1.2.2 */ .domainUndefine = bhyveDomainUndefine, /* 1.2.2 */
.domainUndefineFlags = bhyveDomainUndefineFlags, /* 5.6.0 */
.domainGetOSType = bhyveDomainGetOSType, /* 1.2.21 */ .domainGetOSType = bhyveDomainGetOSType, /* 1.2.21 */
.domainGetXMLDesc = bhyveDomainGetXMLDesc, /* 1.2.2 */ .domainGetXMLDesc = bhyveDomainGetXMLDesc, /* 1.2.2 */
.domainIsActive = bhyveDomainIsActive, /* 1.2.2 */ .domainIsActive = bhyveDomainIsActive, /* 1.2.2 */