From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 23 Jul 2021 08:39:54 +0000 (+0200)
Subject: qemuBlockNodeNameGetBackingChain: Shuffle around variable initialization
X-Git-Tag: v7.6.0-rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a661107ab5a47211772f5f016a376b8cf27ba0c;p=thirdparty%2Flibvirt.git

qemuBlockNodeNameGetBackingChain: Shuffle around variable initialization

Allocate the hash tables first so tat the 'data' struct can be directly
initialized removing the need for a memset and two additional
assignments.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
---

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 8150241015..1bcf7fa4f1 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -230,20 +230,16 @@ GHashTable *
 qemuBlockNodeNameGetBackingChain(virJSONValue *namednodes,
                                  virJSONValue *blockstats)
 {
-    struct qemuBlockNodeNameGetBackingChainData data;
     g_autoptr(GHashTable) namednodestable = virHashNew(virJSONValueHashFree);
     g_autoptr(GHashTable) disks = virHashNew(qemuBlockNodeNameBackingChainDataHashEntryFree);
-
-    memset(&data, 0, sizeof(data));
+    struct qemuBlockNodeNameGetBackingChainData data = { .nodenamestable = namednodestable,
+                                                         .disks = disks };
 
     if (virJSONValueArrayForeachSteal(namednodes,
                                       qemuBlockNamedNodesArrayToHash,
                                       namednodestable) < 0)
         return NULL;
 
-    data.nodenamestable = namednodestable;
-    data.disks = disks;
-
     if (virJSONValueArrayForeachSteal(blockstats,
                                       qemuBlockNodeNameGetBackingChainDisk,
                                       &data) < 0)