From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 25 Oct 2019 11:18:55 +0000 (+0200)
Subject: qemu: caps: Rework memory allocation in virQEMUCapsFillDomainFeatureSEVCaps
X-Git-Tag: v5.10.0-rc1~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e60174fb3a6e04d5eae1f72d817eb125d389ff92;p=thirdparty%2Flibvirt.git

qemu: caps: Rework memory allocation in virQEMUCapsFillDomainFeatureSEVCaps

Use g_new0 instead of VIR_ALLOC to avoid error cases.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

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;
 }