snapshot: Add virDomainSnapshotDefNew

In preparation for making virDomainSnapshotDef a descendant of
virObject, it is time to fix all callers that allocate an object to
use virDomainSnapshotDefNew() instead of VIR_ALLOC().  Fortunately,
there aren't very many :)

Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index dd281d57fe92d9c2a956f4c42236c228b5e1bef0..d159fc4a954a38c6c6aa2fc3f99d4c8b6ca026ee 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -81,6 +81,15 @@ virDomainSnapshotDiskDefClear(virDomainSnapshotDiskDefPtr disk)
     disk->src = NULL;
 }
 
+virDomainSnapshotDefPtr
+virDomainSnapshotDefNew(void)
+{
+    virDomainSnapshotDefPtr def;
+
+    ignore_value(VIR_ALLOC(def));
+    return def;
+}
+
 void virDomainSnapshotDefFree(virDomainSnapshotDefPtr def)
 {
     size_t i;
@@ -205,8 +214,8 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt,
     bool offline = !!(flags & VIR_DOMAIN_SNAPSHOT_PARSE_OFFLINE);
     virSaveCookieCallbacksPtr saveCookie = virDomainXMLOptionGetSaveCookie(xmlopt);
 
-    if (VIR_ALLOC(def) < 0)
-        goto cleanup;
+    if (!(def = virDomainSnapshotDefNew()))
+        return NULL;
 
     def->parent.name = virXPathString("string(./name)", ctxt);
     if (def->parent.name == NULL) {

diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h
index f54be116194001f9a6c48c7409aca3ba03166dd9..0ce9dda355e9f5b5f3eb839489a13aabe84acb1d 100644 (file)
--- a/src/conf/snapshot_conf.h
+++ b/src/conf/snapshot_conf.h
@@ -114,6 +114,7 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseNode(xmlDocPtr xml,
                                                       virDomainXMLOptionPtr xmlopt,
                                                       bool *current,
                                                       unsigned int flags);
+virDomainSnapshotDefPtr virDomainSnapshotDefNew(void);
 void virDomainSnapshotDefFree(virDomainSnapshotDefPtr def);
 char *virDomainSnapshotDefFormat(const char *uuidstr,
                                  virDomainSnapshotDefPtr def,

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index a03cf0b6458add68bc1c73cc19ee5361a32b6ee7..0474a4e44cbd7ad7a008f88ae3eb2565ba27a27b 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -894,6 +894,7 @@ virDomainSnapshotAlignDisks;
 virDomainSnapshotDefFormat;
 virDomainSnapshotDefFree;
 virDomainSnapshotDefIsExternal;
+virDomainSnapshotDefNew;
 virDomainSnapshotDefParseString;
 virDomainSnapshotFormatConvertXMLFlags;
 virDomainSnapshotIsExternal;

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index af557690c4429a0a08f23ff2f80af32064b4f428..7e42f6a4fe694367223f9413e209da58ee060da5 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -6220,7 +6220,8 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
     if (!(snap = vboxDomainSnapshotGet(data, dom, machine, snapshot->name)))
         goto cleanup;
 
-    if (VIR_ALLOC(def) < 0 || !(def->parent.dom = virDomainDefNew()))
+    if (!(def = virDomainSnapshotDefNew()) ||
+        !(def->parent.dom = virDomainDefNew()))
         goto cleanup;
     defdom = def->parent.dom;
     if (VIR_STRDUP(def->parent.name, snapshot->name) < 0)