[libvirt] [PATCH 1/4] vbox: add vboxPrivate struct.

Dawid Zamirski dzamirski at datto.com
Wed Sep 28 17:41:33 UTC 2016


To be passed as per-connection context info instead of using
vboxGlobalData that it will eventually replace in most cases.
---
 src/vbox/vbox_uniformed_api.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index 74e9ac0..6ec5245 100644
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -110,6 +110,36 @@ typedef struct {
     PCVBOXXPCOM pFuncs;
 
     /* The next is used for domainEvent */
+    /* Async event handling */
+    virObjectEventStatePtr domainEvents;
+    int fdWatch;
+    int volatile vboxCallBackRefCount;
+# if defined(VBOX_API_VERSION) && VBOX_API_VERSION > 2002000 && VBOX_API_VERSION < 4000000
+    IVirtualBoxCallback *vboxCallback;
+    nsIEventQueue *vboxQueue;
+# else /* VBOX_API_VERSION <= 2002000 || VBOX_API_VERSION >= 4000000 || VBOX_API_VERSION undefined */
+    void *vboxCallback;
+    void *vboxQueue;
+# endif /* VBOX_API_VERSION <= 2002000 || VBOX_API_VERSION >= 4000000 || VBOX_API_VERSION undefined */
+
+    /* pointer back to the connection */
+    virConnectPtr conn;
+} vboxPrivate;
+
+typedef struct {
+    virMutex lock;
+    unsigned long version;
+
+    virCapsPtr caps;
+    virDomainXMLOptionPtr xmlopt;
+
+    IVirtualBox *vboxObj;
+    ISession *vboxSession;
+
+    /** Our version specific API table pointer. */
+    PCVBOXXPCOM pFuncs;
+
+    /* The next is used for domainEvent */
 # if defined(VBOX_API_VERSION) && VBOX_API_VERSION > 2002000 && VBOX_API_VERSION < 4000000
 
     /* Async event handling */
-- 
2.7.4




More information about the libvir-list mailing list