Re: [libvirt] [PATCH] vbox: Handle different IID representation in Version 2.2 on Windows

On Windows IID's are represented as GUID by value, instead of nsID by reference on non-Windows platforms. Patch the vbox_CAPI_v2_2.h header to deal with this difference. Rewrite vboxIID abstraction that deals with the different IID representations. Add support for the GUID representation. Also unify the four context dependent free functions for vboxIIDs vboxIIDUnalloc, vboxIIDFree, vboxIIDUtf8Free, vboxIIDUtf16Free into vboxIIDUnalloc that is now safe to be called (even multiple times) on a vboxIID independent of the source and context of the vboxIID.

The new vboxIID is designed to be used as a stack allocated variable. It has a value member that represents the actual IID value.

+++ b/src/vbox/vbox_CAPI_v2_2.h @@ -57,8 +57,12 @@ # ifdef WIN32 # define PR_COM_METHOD __stdcall +# define PR_IID_IN_TYPE GUID +# define PR_IID_OUT_TYPE GUID * # else # define PR_COM_METHOD +# define PR_IID_IN_TYPE const nsID * +# define PR_IID_OUT_TYPE nsID ** # endif

@@ -7051,7 +6951,7 @@ static virNetworkPtr vboxNetworkDefineCreateXML(virConnectPtr conn, const char * */ #if VBOX_API_VERSION == 2002 - if STREQ(def->name, "vboxnet0") { + if (STREQ(def->name, "vboxnet0")) {

@@ -8032,13 +7914,27 @@ static int vboxStorageVolDelete(virStorageVolPtr vol, vboxArrayGet(&machineIds, hardDisk, hardDisk->vtbl->GetMachineIds); #endif /* VBOX_API_VERSION >= 3001 */ +#if VBOX_API_VERSION == 2002 && defined WIN32 + /* VirtualBox 2.2 on Windows represents IIDs as GUIDs and the + * machineIds array contains direct instances of the GUID struct + * instead of pointers to the actual struct instances. But there + * is no 128bit width simple item type for a SafeArray to fit a + * GUID in. The largest simple type it 64bit width and VirtualBox + * uses two of this 64bit items to represents one GUID. Therefore, + * we devide the size of the SafeArray by two, to compensate for + * this workaround in VirtualBox */ + machineIds.count /= 2; +#endif /* VBOX_API_VERSION >= 2002 */