On Wed, Sep 28, 2016 at 01:41:33PM -0400, Dawid Zamirski wrote:
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 */
So after this patch the structure vboxGlobalData is changed, but none of the code is adjusted to that. I think that would cause some errors, but I don't have vbox installed to try that out. I'm quite sure, though. We are trying to separate comics in a way that you can compile and use the code after any commit so that bisecting works and we can clearly find out which particular commit causes problems.
-- 2.7.4 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list