From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 3 Feb 2025 15:09:29 +0000 (+0000)
Subject: bhyve: add 'driver' to bhyveProcessStart method
X-Git-Tag: v11.1.0-rc1~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2eb1de2a16b73f96112cfe3d7e3d91c75d1f806f;p=thirdparty%2Flibvirt.git

bhyve: add 'driver' to bhyveProcessStart method

This allows for passinga  NULL connection object in cases where
domain autodestroy is not required.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 8f97ac032c..1b3fe075c1 100644
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -79,7 +79,7 @@ bhyveAutostartDomain(virDomainObj *vm, void *opaque)
 
     if (vm->autostart && !virDomainObjIsActive(vm)) {
         virResetLastError();
-        ret = virBhyveProcessStart(data->conn, vm,
+        ret = virBhyveProcessStart(data->driver, data->conn, vm,
                                    VIR_DOMAIN_RUNNING_BOOTED, 0);
         if (ret < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -834,7 +834,7 @@ bhyveDomainCreateWithFlags(virDomainPtr dom,
         goto cleanup;
     }
 
-    ret = virBhyveProcessStart(dom->conn, vm,
+    ret = virBhyveProcessStart(privconn, dom->conn, vm,
                                VIR_DOMAIN_RUNNING_BOOTED,
                                start_flags);
 
@@ -892,7 +892,7 @@ bhyveDomainCreateXML(virConnectPtr conn,
                                    VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, NULL)))
         goto cleanup;
 
-    if (virBhyveProcessStart(conn, vm,
+    if (virBhyveProcessStart(privconn, conn, vm,
                              VIR_DOMAIN_RUNNING_BOOTED,
                              start_flags) < 0) {
         /* If domain is not persistent, remove its data */
diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c
index 41feabcbe7..3e6f678cf5 100644
--- a/src/bhyve/bhyve_process.c
+++ b/src/bhyve/bhyve_process.c
@@ -270,13 +270,12 @@ bhyveProcessPrepareDomain(bhyveConn *driver,
 }
 
 int
-virBhyveProcessStart(virConnectPtr conn,
+virBhyveProcessStart(bhyveConn *driver,
+                     virConnectPtr conn,
                      virDomainObj *vm,
                      virDomainRunningReason reason,
                      unsigned int flags)
 {
-    struct _bhyveConn *driver = conn->privateData;
-
     /* Run an early hook to setup missing devices. */
     if (bhyveProcessStartHook(driver, vm, VIR_HOOK_BHYVE_OP_PREPARE) < 0)
         return -1;
diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h
index 668411db57..e69db41fc2 100644
--- a/src/bhyve/bhyve_process.h
+++ b/src/bhyve/bhyve_process.h
@@ -28,7 +28,8 @@ bhyveProcessPrepareDomain(bhyveConn *driver,
                           virDomainObj *vm,
                           unsigned int flags);
 
-int virBhyveProcessStart(virConnect *conn,
+int virBhyveProcessStart(bhyveConn *driver,
+                         virConnectPtr conn,
                          virDomainObj *vm,
                          virDomainRunningReason reason,
                          unsigned int flags);