cpu: Drop generic driver

Pretending (partial) support for something we don't understand is risky.
Reporting a failure is much better.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f44a50199b3b885a0310692e0d6e26868a90775a..053936697270b3b3ab963de759f8559bef8117da 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,7 +41,6 @@ src/conf/virchrdev.c
 src/conf/virdomainobjlist.c
 src/conf/virsecretobj.c
 src/cpu/cpu.c
-src/cpu/cpu_generic.c
 src/cpu/cpu_map.c
 src/cpu/cpu_ppc64.c
 src/cpu/cpu_x86.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 275bfc750c021aeaa929b85e5c991a8434fee929..0214995e5c7716f9e703b7acc6ed1cb374852d8e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1077,7 +1077,6 @@ NODE_DEVICE_DRIVER_UDEV_SOURCES =                         \
 
 CPU_SOURCES =                                                  \
                cpu/cpu.h cpu/cpu.c                             \
-               cpu/cpu_generic.h cpu/cpu_generic.c             \
                cpu/cpu_x86.h cpu/cpu_x86.c cpu/cpu_x86_data.h  \
                cpu/cpu_s390.h cpu/cpu_s390.c                   \
                cpu/cpu_arm.h cpu/cpu_arm.c                     \

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 62a420f4f68b99abfe2e22b5bdb550bea93b3c65..c8d50e74d82a71cf8ffdc04fd04d5435b992b80d 100644 (file)
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -32,7 +32,6 @@
 #include "cpu_ppc64.h"
 #include "cpu_s390.h"
 #include "cpu_arm.h"
-#include "cpu_generic.h"
 #include "util/virstring.h"
 
 
@@ -46,8 +45,6 @@ static struct cpuArchDriver *drivers[] = {
     &cpuDriverPPC64,
     &cpuDriverS390,
     &cpuDriverArm,
-    /* generic driver must always be the last one */
-    &cpuDriverGeneric
 };
 
 
@@ -63,15 +60,17 @@ cpuGetSubDriver(virArch arch)
         return NULL;
     }
 
-    for (i = 0; i < NR_DRIVERS - 1; i++) {
+    for (i = 0; i < NR_DRIVERS; i++) {
         for (j = 0; j < drivers[i]->narch; j++) {
             if (arch == drivers[i]->arch[j])
                 return drivers[i];
         }
     }
 
-    /* use generic driver by default */
-    return drivers[NR_DRIVERS - 1];
+    virReportError(VIR_ERR_NO_SUPPORT,
+                   _("'%s' architecture is not supported by CPU driver"),
+                   virArchToString(arch));
+    return NULL;
 }
 
 
@@ -80,7 +79,7 @@ cpuGetSubDriverByName(const char *name)
 {
     size_t i;
 
-    for (i = 0; i < NR_DRIVERS - 1; i++) {
+    for (i = 0; i < NR_DRIVERS; i++) {
         if (STREQ_NULLABLE(name, drivers[i]->name))
             return drivers[i];
     }

diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c
deleted file mode 100644 (file)
index f26a62d..0000000
--- a/src/cpu/cpu_generic.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * cpu_generic.c: CPU manipulation driver for architectures which are not
- * handled by their own driver
- *
- * Copyright (C) 2009-2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
- */
-
-#include <config.h>
-
-#include "viralloc.h"
-#include "virhash.h"
-#include "cpu.h"
-#include "cpu_generic.h"
-#include "virstring.h"
-
-#define VIR_FROM_THIS VIR_FROM_CPU
-
-
-static virHashTablePtr
-genericHashFeatures(virCPUDefPtr cpu)
-{
-    virHashTablePtr hash;
-    size_t i;
-
-    if ((hash = virHashCreate(cpu->nfeatures, NULL)) == NULL)
-        return NULL;
-
-    for (i = 0; i < cpu->nfeatures; i++) {
-        if (virHashAddEntry(hash,
-                            cpu->features[i].name,
-                            cpu->features + i)) {
-            virHashFree(hash);
-            return NULL;
-        }
-    }
-
-    return hash;
-}
-
-
-static virCPUCompareResult
-genericCompare(virCPUDefPtr host,
-               virCPUDefPtr cpu,
-               bool failIncompatible)
-{
-    virHashTablePtr hash = NULL;
-    virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR;
-    size_t i;
-    unsigned int reqfeatures;
-
-    if (!cpu->model) {
-        virReportError(VIR_ERR_INVALID_ARG, "%s",
-                       _("no guest CPU model specified"));
-        goto cleanup;
-    }
-
-    if ((cpu->arch != VIR_ARCH_NONE &&
-         host->arch != cpu->arch) ||
-        STRNEQ(host->model, cpu->model)) {
-        ret = VIR_CPU_COMPARE_INCOMPATIBLE;
-        goto cleanup;
-    }
-
-    if ((hash = genericHashFeatures(host)) == NULL)
-        goto cleanup;
-
-    reqfeatures = 0;
-    for (i = 0; i < cpu->nfeatures; i++) {
-        void *hval = virHashLookup(hash, cpu->features[i].name);
-
-        if (hval) {
-            if (cpu->type == VIR_CPU_TYPE_GUEST &&
-                cpu->features[i].policy == VIR_CPU_FEATURE_FORBID) {
-                ret = VIR_CPU_COMPARE_INCOMPATIBLE;
-                goto cleanup;
-            }
-            reqfeatures++;
-        } else if (cpu->type == VIR_CPU_TYPE_HOST ||
-                   cpu->features[i].policy == VIR_CPU_FEATURE_REQUIRE) {
-            ret = VIR_CPU_COMPARE_INCOMPATIBLE;
-            goto cleanup;
-        }
-    }
-
-    if (host->nfeatures > reqfeatures) {
-        if (cpu->type == VIR_CPU_TYPE_GUEST &&
-            cpu->match == VIR_CPU_MATCH_STRICT)
-            ret = VIR_CPU_COMPARE_INCOMPATIBLE;
-        else
-            ret = VIR_CPU_COMPARE_SUPERSET;
-    } else {
-        ret = VIR_CPU_COMPARE_IDENTICAL;
-    }
-
- cleanup:
-    virHashFree(hash);
-    if (failIncompatible && ret == VIR_CPU_COMPARE_INCOMPATIBLE) {
-        ret = VIR_CPU_COMPARE_ERROR;
-        virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
-    }
-    return ret;
-}
-
-
-static virCPUDefPtr
-genericBaseline(virCPUDefPtr *cpus,
-                unsigned int ncpus,
-                const char **models,
-                unsigned int nmodels,
-                unsigned int flags)
-{
-    virCPUDefPtr cpu = NULL;
-    virCPUFeatureDefPtr features = NULL;
-    unsigned int nfeatures;
-    unsigned int count;
-    size_t i, j;
-
-    virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES |
-                  VIR_CONNECT_BASELINE_CPU_MIGRATABLE, NULL);
-
-    if (!cpuModelIsAllowed(cpus[0]->model, models, nmodels)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("CPU model %s is not supported by hypervisor"),
-                       cpus[0]->model);
-        goto error;
-    }
-
-    if (VIR_ALLOC(cpu) < 0 ||
-        VIR_STRDUP(cpu->model, cpus[0]->model) < 0 ||
-        VIR_ALLOC_N(features, cpus[0]->nfeatures) < 0)
-        goto error;
-
-    cpu->arch = cpus[0]->arch;
-    cpu->type = VIR_CPU_TYPE_HOST;
-
-    count = nfeatures = cpus[0]->nfeatures;
-    for (i = 0; i < nfeatures; i++)
-        features[i].name = cpus[0]->features[i].name;
-
-    for (i = 1; i < ncpus; i++) {
-        virHashTablePtr hash;
-
-        if (cpu->arch != cpus[i]->arch) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("CPUs have incompatible architectures: '%s' != '%s'"),
-                           virArchToString(cpu->arch),
-                           virArchToString(cpus[i]->arch));
-            goto error;
-        }
-
-        if (STRNEQ(cpu->model, cpus[i]->model)) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("CPU models don't match: '%s' != '%s'"),
-                           cpu->model, cpus[i]->model);
-            goto error;
-        }
-
-        if (!(hash = genericHashFeatures(cpus[i])))
-            goto error;
-
-        for (j = 0; j < nfeatures; j++) {
-            if (features[j].name &&
-                !virHashLookup(hash, features[j].name)) {
-                features[j].name = NULL;
-                count--;
-            }
-        }
-
-        virHashFree(hash);
-    }
-
-    if (VIR_ALLOC_N(cpu->features, count) < 0)
-        goto error;
-    cpu->nfeatures = count;
-
-    j = 0;
-    for (i = 0; i < nfeatures; i++) {
-        if (!features[i].name)
-            continue;
-
-        if (VIR_STRDUP(cpu->features[j++].name, features[i].name) < 0)
-            goto error;
-    }
-
- cleanup:
-    VIR_FREE(features);
-
-    return cpu;
-
- error:
-    virCPUDefFree(cpu);
-    cpu = NULL;
-    goto cleanup;
-}
-
-
-struct cpuArchDriver cpuDriverGeneric = {
-    .name = "generic",
-    .arch = NULL,
-    .narch = 0,
-    .compare    = genericCompare,
-    .decode     = NULL,
-    .encode     = NULL,
-    .free       = NULL,
-    .nodeData   = NULL,
-    .guestData  = NULL,
-    .baseline   = genericBaseline,
-    .update     = NULL,
-};

diff --git a/src/cpu/cpu_generic.h b/src/cpu/cpu_generic.h
deleted file mode 100644 (file)
index c7c66cc..0000000
--- a/src/cpu/cpu_generic.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * cpu_generic.h: CPU manipulation driver for architectures which are not
- * handled by their own driver
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
- */
-
-#ifndef __VIR_CPU_GENERIC_H__
-# define __VIR_CPU_GENERIC_H__
-
-# include "cpu.h"
-
-extern struct cpuArchDriver cpuDriverGeneric;
-
-#endif /* __VIR_CPU_GENERIC_H__ */