From 10d0e6e9c85ee67284e29369de26c4d6f0a08177 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 21 Jun 2016 16:02:07 +0200
Subject: [PATCH] cpu: Drop false support for ARM cpu-model

The ARM CPU driver wrongly reported host CPU model as "host", which made
host-model to be just an alias for host-passthrough. Let's drop this
insanity.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu/cpu_arm.c | 34 ++--------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index 609025306c..a3aed6bc8c 100644
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -37,36 +37,6 @@ static const virArch archs[] = {
     VIR_ARCH_AARCH64,
 };
 
-static virCPUDataPtr
-armNodeData(virArch arch)
-{
-    virCPUDataPtr data;
-
-    if (VIR_ALLOC(data) < 0)
-        return NULL;
-
-    data->arch = arch;
-
-    return data;
-}
-
-static int
-armDecode(virCPUDefPtr cpu,
-          const virCPUData *data ATTRIBUTE_UNUSED,
-          const char **models ATTRIBUTE_UNUSED,
-          unsigned int nmodels ATTRIBUTE_UNUSED,
-          const char *preferred ATTRIBUTE_UNUSED,
-          unsigned int flags)
-{
-    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, -1);
-
-    if (cpu->model == NULL &&
-        VIR_STRDUP(cpu->model, "host") < 0)
-        return -1;
-
-    return 0;
-}
-
 static void
 armDataFree(virCPUDataPtr data)
 {
@@ -128,10 +98,10 @@ struct cpuArchDriver cpuDriverArm = {
     .arch = archs,
     .narch = ARRAY_CARDINALITY(archs),
     .compare = armCompare,
-    .decode = armDecode,
+    .decode = NULL,
     .encode = NULL,
     .free = armDataFree,
-    .nodeData = armNodeData,
+    .nodeData = NULL,
     .guestData = armGuestData,
     .baseline = armBaseline,
     .update = armUpdate,