bhyve: Store 'driver' in VM private data

Similarly to the qemu driver if we store the immutable driver pointer in
the VM private data struct we don't have to questionably pass it through
opaque pointers to callbacks.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index b526235a4ed46abddb94fd92e82b0c13bfe2798f..69555a3efcf64da27088233dea82abd06992eeb5 100644 (file)
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -34,9 +34,13 @@
 VIR_LOG_INIT("bhyve.bhyve_domain");
 
 static void *
-bhyveDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED)
+bhyveDomainObjPrivateAlloc(void *opaque)
 {
-    return g_new0(bhyveDomainObjPrivate, 1);
+    bhyveDomainObjPrivate *priv = g_new0(bhyveDomainObjPrivate, 1);
+
+    priv->driver = opaque;
+
+    return priv;
 }
 
 static void

diff --git a/src/bhyve/bhyve_domain.h b/src/bhyve/bhyve_domain.h
index 89a4a3c7cb80453a0ae69ae7235c13090a14549c..5a539bc4c02cdcc8907c07d0395dd785b306057b 100644 (file)
--- a/src/bhyve/bhyve_domain.h
+++ b/src/bhyve/bhyve_domain.h
@@ -27,6 +27,8 @@
 
 typedef struct _bhyveDomainObjPrivate bhyveDomainObjPrivate;
 struct _bhyveDomainObjPrivate {
+    struct _bhyveConn *driver;
+
     virDomainPCIAddressSet *pciaddrs;
     bool persistentAddrs;