[libvirt] [PATCH v2 17/31] qemu: Split virQEMUCapsFetchCPUModels

[Ján Tomko]

On Tue, Oct 15, 2019 at 05:34:53PM +0200, Jiri Denemark wrote:
>Most of the code moved to a new virQEMUCapsFetchCPUDefinitions function
>and the existing virQEMUCapsFetchCPUModels just becomes a small wrapper
>around virQEMUCapsFetchCPUDefinitions and virQEMUCapsCPUDefsToModels.
>
>Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
>---
>
>Notes:
>    Version 2:
>    - new patch
>
> src/qemu/qemu_capabilities.c | 29 +++++++++++++++++++++++------
> 1 file changed, 23 insertions(+), 6 deletions(-)
>
>diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
>index cdc3a2d4b0..436d65f578 100644
>--- a/src/qemu/qemu_capabilities.c
>+++ b/src/qemu/qemu_capabilities.c
>@@ -2487,15 +2487,15 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps,
> }
>
>
>-int
>-virQEMUCapsFetchCPUModels(qemuMonitorPtr mon,
>-                          virArch arch,
>-                          virDomainCapsCPUModelsPtr *cpuModels)
>+static int
>+virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon,
>+                               virArch arch,
>+                               qemuMonitorCPUDefsPtr *cpuDefs)
> {
>     VIR_AUTOPTR(qemuMonitorCPUDefs) defs = NULL;
>     size_t i;
>
>-    *cpuModels = NULL;
>+    *cpuDefs = NULL;
>
>     if (qemuMonitorGetCPUDefinitions(mon, &defs) < 0)
>         return -1;
>@@ -2524,7 +2524,24 @@ virQEMUCapsFetchCPUModels(qemuMonitorPtr mon,
>         }
>     }
>
>-    if (!(*cpuModels = virQEMUCapsCPUDefsToModels(defs, NULL, NULL)))
>+    VIR_STEAL_PTR(*cpuDefs, defs);

g_steal_pointer

>+    return 0;
>+}
>+
>+
>+int
>+virQEMUCapsFetchCPUModels(qemuMonitorPtr mon,
>+                          virArch arch,
>+                          virDomainCapsCPUModelsPtr *cpuModels)
>+{
>+    VIR_AUTOPTR(qemuMonitorCPUDefs) defs = NULL;

g_autoptr

>+
>+    *cpuModels = NULL;
>+
>+    if (virQEMUCapsFetchCPUDefinitions(mon, arch, &defs) < 0)
>+        return -1;
>+
>+    if (defs && !(*cpuModels = virQEMUCapsCPUDefsToModels(defs, NULL, NULL)))
>         return -1;
>

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20191016/edc2bbb7/attachment-0001.sig>