]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuBlockNodeNameGetBackingChain: Shuffle around variable initialization
authorPeter Krempa <pkrempa@redhat.com>
Fri, 23 Jul 2021 08:39:54 +0000 (10:39 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 26 Jul 2021 11:27:30 +0000 (13:27 +0200)
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>
src/qemu/qemu_block.c

index 8150241015aa3db43528a4a3ed992a26ebde8965..1bcf7fa4f109cf44dc168ca109c40863d4eb81e2 100644 (file)
@@ -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)