Vbox call OpenHardDisk with "" instead of NULL

* src/vbox/vbox_tmpl.c: UTF-16 fixed version of Florian Vichot initial
  patch

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index c02b18c98325f039b9294cb76282ace714ebce7c..bab3ce40d91c2675622d54eb6e1c85e194977fff 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -3184,7 +3184,8 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) {
                         if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_FILE) {
                             IHardDisk *hardDisk     = NULL;
                             PRUnichar *hddfileUtf16 = NULL;
-                            vboxIID *hdduuid        = NULL;
+                            vboxIID   *hdduuid      = NULL;
+                            PRUnichar *hddEmpty     = NULL;
                             /* Current Limitation: Harddisk can't be connected to
                              * Secondary Master as Secondary Master is always used
                              * for CD/DVD Drive, so don't connect the harddisk if it
@@ -3192,6 +3193,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) {
                              */
 
                             data->pFuncs->pfnUtf8ToUtf16(def->disks[i]->src, &hddfileUtf16);
+                            data->pFuncs->pfnUtf8ToUtf16("", &hddEmpty);
 
                             data->vboxObj->vtbl->FindHardDisk(data->vboxObj, hddfileUtf16, &hardDisk);
 
@@ -3206,9 +3208,9 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) {
                                                                   hddfileUtf16,
                                                                   AccessMode_ReadWrite,
                                                                   0,
-                                                                  NULL,
+                                                                  hddEmpty,
                                                                   0,
-                                                                  NULL,
+                                                                  hddEmpty,
                                                                   &hardDisk);
 #endif
                             }
@@ -3271,6 +3273,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) {
                                 hardDisk->vtbl->imedium.nsisupports.Release((nsISupports *)hardDisk);
                             }
                             vboxIIDUnalloc(hdduuid);
+                            data->pFuncs->pfnUtf16Free(hddEmpty);
                             data->pFuncs->pfnUtf16Free(hddfileUtf16);
                         } else if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_BLOCK) {
                         }