[libvirt] [PATCH v2 5/7] cpu_x86: Fix placement of *CheckFeature functions

[Jiri Denemark]

On Mon, Jun 03, 2019 at 14:51:41 +0200, Ján Tomko wrote:
> On Mon, Jun 03, 2019 at 02:27:56PM +0200, Jiri Denemark wrote:
> >Commit 0a97486e09 moved them outside #ifdef, but after virCPUx86GetHost,
> >which will start calling them in the following patch.
> >
> >Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> >---
> > src/cpu/cpu_x86.c | 72 +++++++++++++++++++++++------------------------
> > 1 file changed, 35 insertions(+), 37 deletions(-)
> >
> >diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
> >index f05bfa24e0..cb03123787 100644
> >--- a/src/cpu/cpu_x86.c
> >+++ b/src/cpu/cpu_x86.c
> >@@ -2378,6 +2378,41 @@ x86Encode(virArch arch,
> > }
> >
> >
> >+static int
> >+virCPUx86CheckFeature(const virCPUDef *cpu,
> >+                      const char *name)
> >+{
> >+    int ret = -1;
> >+    virCPUx86MapPtr map;
> >+    virCPUx86ModelPtr model = NULL;
> >+
> >+    if (!(map = virCPUx86GetMap()))
> >+        return -1;
> >+
> >+    if (!(model = x86ModelFromCPU(cpu, map, -1)))
> >+        goto cleanup;
> >+
> >+    ret = x86FeatureInData(name, &model->data, map);
> >+
> >+ cleanup:
> >+    x86ModelFree(model);
> >+    return ret;
> >+}
> >+
> >+
> >+static int
> >+virCPUx86DataCheckFeature(const virCPUData *data,
> >+                          const char *name)
> >+{
> >+    virCPUx86MapPtr map;
> >+
> >+    if (!(map = virCPUx86GetMap()))
> >+        return -1;
> >+
> >+    return x86FeatureInData(name, &data->data.x86, map);
> >+}
> >+
> >+
> > #if defined(__i386__) || defined(__x86_64__)
> > static inline void
> > cpuidCall(virCPUx86CPUID *cpuid)
> >@@ -2707,8 +2742,6 @@ cpuidSet(uint32_t base, virCPUDataPtr data)
> > }
> >
> >
> >-
> >-
> > static int
> > virCPUx86GetHost(virCPUDefPtr cpu,
> >                  virDomainCapsCPUModelsPtr models)
> 
> Unrelated whitespace change. Please push it separately.

It's actually related since it was introduced by commit 0a97486e09 :-)
I reverted that commit and moved the function to the right place.

Jirka