From 86e2df6e71b2780174a446e4a73de1b06679291f Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 16 Mar 2017 14:03:09 +0100
Subject: [PATCH] cpu: Drop unused flags from cpuArchDecode

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu/cpu.c       | 2 +-
 src/cpu/cpu.h       | 3 +--
 src/cpu/cpu_ppc64.c | 7 ++-----
 src/cpu/cpu_x86.c   | 7 +++----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index ed79650459..86d94178b6 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -251,7 +251,7 @@ cpuDecode(virCPUDefPtr cpu,
         return -1;
     }
 
-    return driver->decode(cpu, data, models, nmodels, preferred, 0);
+    return driver->decode(cpu, data, models, nmodels, preferred);
 }
 
 
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 905c309e6b..31f95b02e7 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -54,8 +54,7 @@ typedef int
                      const virCPUData *data,
                      const char **models,
                      unsigned int nmodels,
-                     const char *preferred,
-                     unsigned int flags);
+                     const char *preferred);
 
 typedef int
 (*cpuArchEncode)    (virArch arch,
diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index 6e16ffd131..0ad8d17d45 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -665,15 +665,12 @@ ppc64DriverDecode(virCPUDefPtr cpu,
                   const virCPUData *data,
                   const char **models,
                   unsigned int nmodels,
-                  const char *preferred ATTRIBUTE_UNUSED,
-                  unsigned int flags)
+                  const char *preferred ATTRIBUTE_UNUSED)
 {
     int ret = -1;
     struct ppc64_map *map;
     const struct ppc64_model *model;
 
-    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, -1);
-
     if (!data || !(map = ppc64LoadMap()))
         return -1;
 
@@ -740,7 +737,7 @@ virCPUppc64GetHost(virCPUDefPtr cpu,
 #endif
     data->pvr[0].mask = 0xfffffffful;
 
-    ret = ppc64DriverDecode(cpu, cpuData, models, nmodels, NULL, 0);
+    ret = ppc64DriverDecode(cpu, cpuData, models, nmodels, NULL);
 
  cleanup:
     virCPUppc64DataFree(cpuData);
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 442f0ce44b..9c480398f0 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1984,10 +1984,9 @@ x86DecodeCPUData(virCPUDefPtr cpu,
                  const virCPUData *data,
                  const char **models,
                  unsigned int nmodels,
-                 const char *preferred,
-                 unsigned int flags)
+                 const char *preferred)
 {
-    return x86Decode(cpu, &data->data.x86, models, nmodels, preferred, flags);
+    return x86Decode(cpu, &data->data.x86, models, nmodels, preferred, 0);
 }
 
 
@@ -2452,7 +2451,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
         cpuidSet(CPUX86_EXTENDED, cpuData) < 0)
         goto cleanup;
 
-    ret = x86DecodeCPUData(cpu, cpuData, models, nmodels, NULL, 0);
+    ret = x86DecodeCPUData(cpu, cpuData, models, nmodels, NULL);
 
  cleanup:
     virCPUx86DataFree(cpuData);
-- 
GitLab