[PATCH 01/10] qemu: caps: Rework memory allocation in virQEMUCapsFillDomainFeatureSEVCaps

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Use g_new0 instead of VIR_ALLOC to avoid error cases.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_capabilities.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index fc6473651c..02ac421067 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5572,21 +5572,16 @@ virQEMUCapsFillDomainFeatureSEVCaps(virQEMUCapsPtr qemuCaps,
                                     virDomainCapsPtr domCaps)
 {
     virSEVCapability *cap = qemuCaps->sevCapabilities;
-    g_autoptr(virSEVCapability) sev = NULL;

     if (!cap)
         return 0;

-    if (VIR_ALLOC(sev) < 0)
-        return -1;
-
-    sev->pdh = g_strdup(cap->pdh);
-
-    sev->cert_chain = g_strdup(cap->cert_chain);
+    domCaps->sev = g_new0(virSEVCapability, 1);

-    sev->cbitpos = cap->cbitpos;
-    sev->reduced_phys_bits = cap->reduced_phys_bits;
-    domCaps->sev = g_steal_pointer(&sev);
+    domCaps->sev->pdh = g_strdup(cap->pdh);
+    domCaps->sev->cert_chain = g_strdup(cap->cert_chain);
+    domCaps->sev->cbitpos = cap->cbitpos;
+    domCaps->sev->reduced_phys_bits = cap->reduced_phys_bits;

     return 0;
 }
-- 
2.23.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list