[libvirt] [PATCH v2 20/31] conf: Drop virDomainCapsCPUModelsAddSteal

[Ján Tomko]

On Tue, Oct 15, 2019 at 05:34:56PM +0200, Jiri Denemark wrote:
>Both virDomainCapsCPUModelsAdd and virDomainCapsCPUModelsAddSteal are so
>simple we can just squash the code in a single function.
>
>Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
>---
>
>Notes:
>    Version 2:
>    - no change
>
> src/conf/domain_capabilities.c | 33 ++++++++++-----------------------
> src/conf/domain_capabilities.h |  4 ----
> src/libvirt_private.syms       |  1 -
> 3 files changed, 10 insertions(+), 28 deletions(-)
>
>diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
>index a13463a6e7..dadb2a1183 100644
>--- a/src/conf/domain_capabilities.c
>+++ b/src/conf/domain_capabilities.c
>@@ -185,27 +185,6 @@ virDomainCapsCPUModelsCopy(virDomainCapsCPUModelsPtr old)
> }
>
>
>-int
>-virDomainCapsCPUModelsAddSteal(virDomainCapsCPUModelsPtr cpuModels,
>-                               char **name,
>-                               virDomainCapsCPUUsable usable,
>-                               char ***blockers)
>-{
>-    if (VIR_RESIZE_N(cpuModels->models, cpuModels->nmodels_max,
>-                     cpuModels->nmodels, 1) < 0)
>-        return -1;
>-
>-    cpuModels->models[cpuModels->nmodels].usable = usable;
>-    VIR_STEAL_PTR(cpuModels->models[cpuModels->nmodels].name, *name);
>-
>-    if (blockers)
>-        VIR_STEAL_PTR(cpuModels->models[cpuModels->nmodels].blockers, *blockers);
>-
>-    cpuModels->nmodels++;
>-    return 0;
>-}
>-
>-
> int
> virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
>                           const char *name,
>@@ -214,6 +193,7 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
> {
>     VIR_AUTOFREE(char *) nameCopy = NULL;
>     VIR_AUTOSTRINGLIST blockersCopy = NULL;
>+    virDomainCapsCPUModelPtr cpu;
>
>     if (VIR_STRDUP(nameCopy, name) < 0)
>         return -1;
>@@ -221,10 +201,17 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
>     if (virStringListCopy(&blockersCopy, (const char **)blockers) < 0)
>         return -1;
>
>-    if (virDomainCapsCPUModelsAddSteal(cpuModels, &nameCopy,
>-                                       usable, &blockersCopy) < 0)
>+    if (VIR_RESIZE_N(cpuModels->models, cpuModels->nmodels_max,
>+                     cpuModels->nmodels, 1) < 0)
>         return -1;
>
>+    cpu = cpuModels->models + cpuModels->nmodels;
>+    cpuModels->nmodels++;
>+
>+    cpu->usable = usable;
>+    VIR_STEAL_PTR(cpu->name, nameCopy);
>+    VIR_STEAL_PTR(cpu->blockers, blockersCopy);

g_steal_pointer

>+
>     return 0;
> }
>

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/e12ec8e3/attachment-0001.sig>