bhyve: support domain undefine

Implement domainUndefine and required helper functions:
 - domainIsActive
 - domainIsPersistent

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index accb37fa4aec859ea344e15bed4d7784c39c1c0a..23fab9013f769cb0e32c80b50e9b5735ab228731 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -256,6 +256,44 @@ cleanup:
     return ret;
 }
 
+static int
+bhyveDomainIsActive(virDomainPtr domain)
+{
+    virDomainObjPtr obj;
+    int ret = -1;
+
+    if (!(obj = bhyveDomObjFromDomain(domain)))
+        goto cleanup;
+
+    if (virDomainIsActiveEnsureACL(domain->conn, obj->def) < 0)
+        goto cleanup;
+
+    ret = virDomainObjIsActive(obj);
+
+cleanup:
+    virObjectUnlock(obj);
+    return ret;
+}
+
+static int
+bhyveDomainIsPersistent(virDomainPtr domain)
+{
+    virDomainObjPtr obj;
+    int ret = -1;
+
+    if (!(obj = bhyveDomObjFromDomain(domain)))
+        goto cleanup;
+
+    if (virDomainIsPersistentEnsureACL(domain->conn, obj->def) < 0)
+        goto cleanup;
+
+    ret = obj->persistent;
+
+cleanup:
+    virObjectUnlock(obj);
+    return ret;
+}
+
 static char *
 bhyveDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
 {
@@ -312,6 +350,44 @@ cleanup:
     return dom;
 }
 
+static int
+bhyveDomainUndefine(virDomainPtr domain)
+{
+    bhyveConnPtr privconn = domain->conn->privateData;
+    virDomainObjPtr vm;
+    int ret = -1;
+
+    if (!(vm = bhyveDomObjFromDomain(domain)))
+        goto cleanup;
+
+    if (virDomainUndefineEnsureACL(domain->conn, vm->def) < 0)
+        goto cleanup;
+
+    if (!vm->persistent) {
+        virReportError(VIR_ERR_OPERATION_INVALID,
+                       "%s", _("Cannot undefine transient domain"));
+        goto cleanup;
+    }
+
+    if (virDomainDeleteConfig(BHYVE_CONFIG_DIR,
+                              BHYVE_AUTOSTART_DIR,
+                              vm) < 0)
+        goto cleanup;
+
+    if (virDomainObjIsActive(vm)) {
+        vm->persistent = 0;
+    } else {
+        virDomainObjListRemove(privconn->domains, vm);
+        vm = NULL;
+    }
+
+    ret = 0;
+
+cleanup:
+    virObjectUnlock(vm);
+    return ret;
+}
+
 static int
 bhyveConnectListDomains(virConnectPtr conn, int *ids, int maxids)
 {
@@ -620,7 +696,10 @@ static virDriver bhyveDriver = {
     .domainLookupByUUID = bhyveDomainLookupByUUID, /* 1.2.2 */
     .domainLookupByName = bhyveDomainLookupByName, /* 1.2.2 */
     .domainDefineXML = bhyveDomainDefineXML, /* 1.2.2 */
+    .domainUndefine = bhyveDomainUndefine, /* 1.2.2 */
     .domainGetXMLDesc = bhyveDomainGetXMLDesc, /* 1.2.2 */
+    .domainIsActive = bhyveDomainIsActive, /* 1.2.2 */
+    .domainIsPersistent = bhyveDomainIsPersistent, /* 1.2.2 */
     .nodeGetCPUStats = bhyveNodeGetCPUStats, /* 1.2.2 */
     .nodeGetMemoryStats = bhyveNodeGetMemoryStats, /* 1.2.2 */
 };

diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h
index 7579f4a38994ee7403bbb8d9ad71725c2757c71c..0810caa70378ef81a1a79445dd9d7ab6f70ca94c 100644 (file)
--- a/src/bhyve/bhyve_utils.h
+++ b/src/bhyve/bhyve_utils.h
@@ -27,6 +27,7 @@
 # include "configmake.h"
 # include "virthread.h"
 
+# define BHYVE_AUTOSTART_DIR    SYSCONFDIR "/libvirt/bhyve/autostart"
 # define BHYVE_CONFIG_DIR       SYSCONFDIR "/libvirt/bhyve"
 # define BHYVE_STATE_DIR        LOCALSTATEDIR "/run/libvirt/bhyve"
 # define BHYVE_LOG_DIR          LOCALSTATEDIR "/log/libvirt/bhyve"