From: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Date: Sun, 18 Dec 2016 19:22:22 +0000 (-0500)
Subject: s390-cpu: Remove nodeData and decode
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8f778215223f7a376dc3cbf30088b6da55cb42d9;p=libvirt.git

s390-cpu: Remove nodeData and decode

On s390, the host's features are heavily influenced by not only the host
hardware but also by hardware microcode level, host OS version, qemu
version and kvm version. In this environment it does not make sense to
attempt to report exact host details.

Signed-off-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Acked-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index c50cc222cb..0248328db4 100644
--- a/src/cpu/cpu_s390.c
+++ b/src/cpu/cpu_s390.c
@@ -33,38 +33,6 @@
 
 static const virArch archs[] = { VIR_ARCH_S390, VIR_ARCH_S390X };
 
-static virCPUDataPtr
-s390NodeData(virArch arch)
-{
-    virCPUDataPtr data;
-
-    if (VIR_ALLOC(data) < 0)
-        return NULL;
-
-    data->arch = arch;
-
-    return data;
-}
-
-
-static int
-s390Decode(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
 s390DataFree(virCPUDataPtr data)
 {
@@ -145,10 +113,10 @@ struct cpuArchDriver cpuDriverS390 = {
     .arch = archs,
     .narch = ARRAY_CARDINALITY(archs),
     .compare    = virCPUs390Compare,
-    .decode     = s390Decode,
+    .decode     = NULL,
     .encode     = NULL,
     .free       = s390DataFree,
-    .nodeData   = s390NodeData,
+    .nodeData   = NULL,
     .baseline   = NULL,
     .update     = virCPUs390Update,
 };