From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 26 Feb 2025 13:38:15 +0000 (+0100)
Subject: qemuDomainGetGuestInfo: Prepare for refactor to virTypedParamList
X-Git-Tag: v11.2.0-rc1~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6b34d0de8afef266b8d837c2885ed2ffc4b09a8;p=thirdparty%2Flibvirt.git

qemuDomainGetGuestInfo: Prepare for refactor to virTypedParamList

Use of raw typed param APIs is very clunky. Prepare
qemuDomainGetGuestInfo for step-by-step refactor to virTypedParamList.

The two lists will coexist until the refactor is complete.

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

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 86b945d9b9..3d2ebd7719 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19483,6 +19483,8 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
     double load15m = 0;
     bool format_load = false;
     size_t i;
+    g_autoptr(virTypedParamList) list = virTypedParamListNew();
+    g_autoptr(virTypedParamList) tmplist = NULL;
 
     virCheckFlags(0, -1);
 
@@ -19592,6 +19594,14 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
         virTypedParamsAddDouble(params, nparams, &maxparams, "load.15m", load15m);
     }
 
+    /* temporarily allow the old and new construction style to coexist */
+    tmplist = virTypedParamListFromParams(params, *nparams);
+    virTypedParamListConcat(tmplist, &list);
+    list = g_steal_pointer(&tmplist);
+
+    if (virTypedParamListSteal(list, params, nparams) < 0)
+        goto cleanup;
+
     ret = 0;
 
  cleanup: