From d6b34d0de8afef266b8d837c2885ed2ffc4b09a8 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 26 Feb 2025 14:38:15 +0100 Subject: [PATCH] qemuDomainGetGuestInfo: Prepare for refactor to virTypedParamList MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko --- src/qemu/qemu_driver.c | 10 ++++++++++ 1 file changed, 10 insertions(+) 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: -- 2.47.3