lxc: 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/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index fae56b35fb4bfe6741f56eca1e91fd7cf0c00bd3..5064f942b95d4c551852ac13baabe74e79a8a200 100644 (file)
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -143,7 +143,7 @@ virLXCDomainObjEndJob(virLXCDriver *driver G_GNUC_UNUSED,
 
 
 static void *
-virLXCDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED)
+virLXCDomainObjPrivateAlloc(void *opaque)
 {
     virLXCDomainObjPrivate *priv = g_new0(virLXCDomainObjPrivate, 1);
 
@@ -152,6 +152,8 @@ virLXCDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED)
         return NULL;
     }
 
+    priv->driver = opaque;
+
     return priv;
 }
 

diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h
index 1c4cb8c14ad3d1303262a68d10eac3334f362055..d91dcca04b20f83b863bd063c575601a67279ef0 100644 (file)
--- a/src/lxc/lxc_domain.h
+++ b/src/lxc/lxc_domain.h
@@ -63,6 +63,7 @@ struct virLXCDomainJobObj {
 
 typedef struct _virLXCDomainObjPrivate virLXCDomainObjPrivate;
 struct _virLXCDomainObjPrivate {
+    virLXCDriver *driver;
     virLXCMonitor *monitor;
     bool doneStopEvent;
     int stopReason;