Add privateData to virDomainDiskDef

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d150582897e92c93f76b2cc00acb5fc373c13f71..278b2237b1a8af7e304dfd6a5254d734bb3f1614 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1275,7 +1275,7 @@ void virDomainLeaseDefFree(virDomainLeaseDefPtr def)
 
 
 virDomainDiskDefPtr
-virDomainDiskDefNew(void)
+virDomainDiskDefNew(virDomainXMLOptionPtr xmlopt)
 {
     virDomainDiskDefPtr ret;
 
@@ -1285,6 +1285,11 @@ virDomainDiskDefNew(void)
     if (VIR_ALLOC(ret->src) < 0)
         goto error;
 
+    if (xmlopt &&
+        xmlopt->privateData.diskNew &&
+        !(ret->privateData = xmlopt->privateData.diskNew()))
+        goto error;
+
     if (virCondInit(&ret->blockJobSyncCond) < 0) {
         virReportSystemError(errno, "%s", _("Failed to initialize condition"));
         goto error;
@@ -1293,9 +1298,7 @@ virDomainDiskDefNew(void)
     return ret;
 
  error:
-    virStorageSourceFree(ret->src);
-    VIR_FREE(ret);
-
+    virDomainDiskDefFree(ret);
     return NULL;
 }
 
@@ -1315,6 +1318,7 @@ virDomainDiskDefFree(virDomainDiskDefPtr def)
     VIR_FREE(def->product);
     VIR_FREE(def->domain_name);
     virDomainDeviceInfoClear(&def->info);
+    virObjectUnref(def->privateData);
     virCondDestroy(&def->blockJobSyncCond);
 
     VIR_FREE(def);
@@ -6121,7 +6125,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
     int auth_secret_usage = -1;
     int ret = 0;
 
-    if (!(def = virDomainDiskDefNew()))
+    if (!(def = virDomainDiskDefNew(xmlopt)))
         return NULL;
 
     def->geometry.cylinders = 0;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 2cd105a7aad95386aebb5c45a09fe7c237ef483b..f57f3c949771df65ee048472d8ed48d9227f544f 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -683,6 +683,8 @@ typedef enum {
 struct _virDomainDiskDef {
     virStorageSourcePtr src; /* non-NULL.  XXX Allow NULL for empty cdrom? */
 
+    virObjectPtr privateData;
+
     int device; /* enum virDomainDiskDevice */
     int bus; /* enum virDomainDiskBus */
     char *dst;
@@ -2332,6 +2334,7 @@ typedef virDomainXMLOption *virDomainXMLOptionPtr;
 
 typedef void *(*virDomainXMLPrivateDataAllocFunc)(void);
 typedef void (*virDomainXMLPrivateDataFreeFunc)(void *);
+typedef virObjectPtr (*virDomainXMLPrivateDataNewFunc)(void);
 typedef int (*virDomainXMLPrivateDataFormatFunc)(virBufferPtr, void *);
 typedef int (*virDomainXMLPrivateDataParseFunc)(xmlXPathContextPtr, void *);
 
@@ -2368,6 +2371,7 @@ typedef virDomainXMLPrivateDataCallbacks *virDomainXMLPrivateDataCallbacksPtr;
 struct _virDomainXMLPrivateDataCallbacks {
     virDomainXMLPrivateDataAllocFunc  alloc;
     virDomainXMLPrivateDataFreeFunc   free;
+    virDomainXMLPrivateDataNewFunc    diskNew;
     virDomainXMLPrivateDataFormatFunc format;
     virDomainXMLPrivateDataParseFunc  parse;
 };
@@ -2420,7 +2424,7 @@ void virDomainPanicDefFree(virDomainPanicDefPtr panic);
 void virDomainResourceDefFree(virDomainResourceDefPtr resource);
 void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def);
 void virDomainInputDefFree(virDomainInputDefPtr def);
-virDomainDiskDefPtr virDomainDiskDefNew(void);
+virDomainDiskDefPtr virDomainDiskDefNew(virDomainXMLOptionPtr xmlopt);
 void virDomainDiskDefFree(virDomainDiskDefPtr def);
 void virDomainLeaseDefFree(virDomainLeaseDefPtr def);
 int virDomainDiskGetType(virDomainDiskDefPtr def);

diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index 88ad59b0447b251d1577f15cf9b93620da8ef3ff..786e0adace5fe56f038717ccc471654b8e16e1a0 100644 (file)
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -621,7 +621,7 @@ prlsdkAddDomainHardDisksInfo(PRL_HANDLE sdkdom, virDomainDefPtr def)
             PrlHandle_Free(hdd);
             hdd = PRL_INVALID_HANDLE;
         } else {
-            if (!(disk = virDomainDiskDefNew()))
+            if (!(disk = virDomainDiskDefNew(NULL)))
                 goto error;
 
             if (prlsdkGetDiskInfo(hdd, disk, false) < 0)
@@ -661,7 +661,7 @@ prlsdkAddDomainOpticalDisksInfo(PRL_HANDLE sdkdom, virDomainDefPtr def)
         pret = PrlVmCfg_GetOpticalDisk(sdkdom, i, &cdrom);
         prlsdkCheckRetGoto(pret, error);
 
-        if (!(disk = virDomainDiskDefNew()))
+        if (!(disk = virDomainDiskDefNew(NULL)))
             goto error;
 
         if (prlsdkGetDiskInfo(cdrom, disk, true) < 0)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5d0a167d6e978abbf91e69cd2482eef3792da3a1..2939f8d7c6e025558836cd320c6b04d80f75812a 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -12566,7 +12566,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
                    STRPREFIX(arg, "-fd") ||
                    STREQ(arg, "-cdrom")) {
             WANT_VALUE();
-            if (!(disk = virDomainDiskDefNew()))
+            if (!(disk = virDomainDiskDefNew(xmlopt)))
                 goto error;
 
             if (STRPREFIX(val, "/dev/")) {
@@ -12868,7 +12868,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
                     goto error;
                 }
             } else if (STRPREFIX(val, "disk:")) {
-                if (!(disk = virDomainDiskDefNew()))
+                if (!(disk = virDomainDiskDefNew(xmlopt)))
                     goto error;
                 if (VIR_STRDUP(disk->src->path, val + strlen("disk:")) < 0)
                     goto error;

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index e3a1739330fbfdbae5d653022946af2622362edf..ba0b0391e3ff9c7f55357593f3d954efd3d55226 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -3126,7 +3126,7 @@ vboxDumpIDEHDDsNew(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
     /* Allocate mem, if fails return error */
     if (VIR_ALLOC_N(def->disks, def->ndisks) >= 0) {
         for (i = 0; i < def->ndisks; i++) {
-            virDomainDiskDefPtr disk = virDomainDiskDefNew();
+            virDomainDiskDefPtr disk = virDomainDiskDefNew(NULL);
             if (!disk) {
                 error = true;
                 break;
@@ -5850,7 +5850,7 @@ int vboxSnapshotGetReadOnlyDisks(virDomainSnapshotPtr snapshot,
     /* Allocate mem, if fails return error */
     if (VIR_ALLOC_N(def->dom->disks, def->dom->ndisks) >= 0) {
         for (i = 0; i < def->dom->ndisks; i++) {
-            virDomainDiskDefPtr diskDef = virDomainDiskDefNew();
+            virDomainDiskDefPtr diskDef = virDomainDiskDefNew(NULL);
             if (!diskDef)
                 goto cleanup;
             def->dom->disks[i] = diskDef;

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 22eecd4fbaddb7f5271890c3cc59f8433c2ca1e9..409ecef8bf1801d454a4a97e5c8951c1e8053284 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -2187,7 +2187,7 @@ _dumpIDEHDDsOld(virDomainDefPtr def,
     if ((def->ndisks > 0) && (VIR_ALLOC_N(def->disks, def->ndisks) >= 0)) {
         size_t i;
         for (i = 0; i < def->ndisks; i++) {
-            if ((def->disks[i] = virDomainDiskDefNew())) {
+            if ((def->disks[i] = virDomainDiskDefNew(NULL))) {
                 def->disks[i]->device = VIR_DOMAIN_DISK_DEVICE_DISK;
                 def->disks[i]->bus = VIR_DOMAIN_DISK_BUS_IDE;
                 virDomainDiskSetType(def->disks[i],
@@ -2295,7 +2295,7 @@ _dumpDVD(virDomainDefPtr def,
 
     def->ndisks++;
     if (VIR_REALLOC_N(def->disks, def->ndisks) >= 0) {
-        if ((def->disks[def->ndisks - 1] = virDomainDiskDefNew())) {
+        if ((def->disks[def->ndisks - 1] = virDomainDiskDefNew(NULL))) {
             def->disks[def->ndisks - 1]->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
             def->disks[def->ndisks - 1]->bus = VIR_DOMAIN_DISK_BUS_IDE;
             virDomainDiskSetType(def->disks[def->ndisks - 1],
@@ -2437,7 +2437,7 @@ _dumpFloppy(virDomainDefPtr def,
 
     def->ndisks++;
     if (VIR_REALLOC_N(def->disks, def->ndisks) >= 0) {
-        if ((def->disks[def->ndisks - 1] = virDomainDiskDefNew())) {
+        if ((def->disks[def->ndisks - 1] = virDomainDiskDefNew(NULL))) {
             def->disks[def->ndisks - 1]->device = VIR_DOMAIN_DISK_DEVICE_FLOPPY;
             def->disks[def->ndisks - 1]->bus = VIR_DOMAIN_DISK_BUS_FDC;
             virDomainDiskSetType(def->disks[def->ndisks - 1],

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index cacc951fa21e9b1f34e3b5e75dc673385614cdf0..aede2ad295fbf1ec98a56d2f0eea067a1e49a268 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -1980,7 +1980,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
         return -1;
     }
 
-    if (!(*def = virDomainDiskDefNew()))
+    if (!(*def = virDomainDiskDefNew(xmlopt)))
         return -1;
 
     (*def)->device = device;

diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 5f58fd8ac04f881d45f981c14e758f0d902b59a7..8985295af5adf421b2613e2dfbeb844eb3511a7c 100644 (file)
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -372,7 +372,7 @@ xenParseSxprDisks(virDomainDefPtr def,
                 bootable = sexpr_node(node, "device/tap/bootable");
             }
 
-            if (!(disk = virDomainDiskDefNew()))
+            if (!(disk = virDomainDiskDefNew(NULL)))
                 goto error;
 
             if (dst == NULL) {
@@ -1316,7 +1316,7 @@ xenParseSxpr(const struct sexpr *root,
         tmp = sexpr_node(root, "domain/image/hvm/cdrom");
         if ((tmp != NULL) && (tmp[0] != 0)) {
             virDomainDiskDefPtr disk;
-            if (!(disk = virDomainDiskDefNew()))
+            if (!(disk = virDomainDiskDefNew(NULL)))
                 goto error;
             if (virDomainDiskSetSource(disk, tmp) < 0) {
                 virDomainDiskDefFree(disk);
@@ -1351,7 +1351,7 @@ xenParseSxpr(const struct sexpr *root,
             tmp = sexpr_fmt_node(root, "domain/image/hvm/%s", fds[i]);
             if ((tmp != NULL) && (tmp[0] != 0)) {
                 virDomainDiskDefPtr disk;
-                if (!(disk = virDomainDiskDefNew()))
+                if (!(disk = virDomainDiskDefNew(NULL)))
                     goto error;
                 if (virDomainDiskSetSource(disk, tmp) < 0) {
                     virDomainDiskDefFree(disk);

diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c
index db554b2ab373cc7211a82abf398cf127341cc4a7..b12d3060d9d579ff05c327b55c5d0cd3224b1d3c 100644 (file)
--- a/src/xenconfig/xen_xl.c
+++ b/src/xenconfig/xen_xl.c
@@ -286,7 +286,7 @@ xenParseXLDisk(virConfPtr conf, virDomainDefPtr def)
             if (xlu_disk_parse(xluconf, 1, &disk_spec, libxldisk))
                 goto fail;
 
-            if (!(disk = virDomainDiskDefNew()))
+            if (!(disk = virDomainDiskDefNew(NULL)))
                 goto fail;
 
             if (VIR_STRDUP(disk->dst, libxldisk->vdev) < 0)

diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c
index fafe66243191e32256dcef4dbc3c4f50da409ed9..a4d1203fe1d53003b470cb048c82f406e282c8ac 100644 (file)
--- a/src/xenconfig/xen_xm.c
+++ b/src/xenconfig/xen_xm.c
@@ -123,7 +123,7 @@ xenParseXMDisk(virConfPtr conf, virDomainDefPtr def, int xendConfigVersion)
                 goto skipdisk;
 
             head = list->str;
-            if (!(disk = virDomainDiskDefNew()))
+            if (!(disk = virDomainDiskDefNew(NULL)))
                 return -1;
 
             /*
@@ -275,7 +275,7 @@ xenParseXMDisk(virConfPtr conf, virDomainDefPtr def, int xendConfigVersion)
         if (xenConfigGetString(conf, "cdrom", &str, NULL) < 0)
             goto cleanup;
         if (str) {
-            if (!(disk = virDomainDiskDefNew()))
+            if (!(disk = virDomainDiskDefNew(NULL)))
                 goto cleanup;
 
             virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);