[PATCH 5/6] qemuDomainSaveImageOpen: Use 'g_new0' instead of VIR_ALLOC(_N)

Peter Krempa pkrempa at redhat.com
Wed Apr 22 15:04:58 UTC 2020


Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c0ce1583b1..70cdbe235a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6717,8 +6717,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
                                            VIR_FILE_WRAPPER_BYPASS_CACHE)))
         goto error;

-    if (VIR_ALLOC(data) < 0)
-        goto error;
+    data = g_new0(virQEMUSaveData, 1);

     header = &data->header;
     if (saferead(fd, header, sizeof(*header)) != sizeof(*header)) {
@@ -6783,8 +6782,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,

     cookie_len = header->data_len - xml_len;

-    if (VIR_ALLOC_N(data->xml, xml_len) < 0)
-        goto error;
+    data->xml = g_new0(char, xml_len);

     if (saferead(fd, data->xml, xml_len) != xml_len) {
         virReportError(VIR_ERR_OPERATION_FAILED,
@@ -6793,8 +6791,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
     }

     if (cookie_len > 0) {
-        if (VIR_ALLOC_N(data->cookie, cookie_len) < 0)
-            goto error;
+        data->cookie = g_new0(char, cookie_len);

         if (saferead(fd, data->cookie, cookie_len) != cookie_len) {
             virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-- 
2.26.0




More information about the libvir-list mailing list