cpu: Drop cpuGuestData

The API is not used anywhere in the code.

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

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 4a5fbb1fde94f93d6135e484765aa5946d8959d3..64419eee3c48311f7b535e9b84edf36ee0e8691c 100644 (file)
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -372,47 +372,6 @@ cpuNodeData(virArch arch)
 }
 
 
-/**
- * cpuGuestData:
- *
- * @host: host CPU definition
- * @guest: guest CPU definition
- * @data: computed guest CPU data
- * @msg: error message describing why the @guest and @host CPUs are considered
- *       incompatible
- *
- * Computes guest CPU data for the @guest CPU definition when run on the @host
- * CPU.
- *
- * Returns VIR_CPU_COMPARE_ERROR on error, VIR_CPU_COMPARE_INCOMPATIBLE when
- * the two CPUs are incompatible (@msg will describe the incompatibility),
- * VIR_CPU_COMPARE_IDENTICAL when the two CPUs are identical,
- * VIR_CPU_COMPARE_SUPERSET when the @guest CPU is a superset of the @host CPU.
- */
-virCPUCompareResult
-cpuGuestData(virCPUDefPtr host,
-             virCPUDefPtr guest,
-             virCPUDataPtr *data,
-             char **msg)
-{
-    struct cpuArchDriver *driver;
-
-    VIR_DEBUG("host=%p, guest=%p, data=%p, msg=%p", host, guest, data, msg);
-
-    if ((driver = cpuGetSubDriver(host->arch)) == NULL)
-        return VIR_CPU_COMPARE_ERROR;
-
-    if (driver->guestData == NULL) {
-        virReportError(VIR_ERR_NO_SUPPORT,
-                       _("cannot compute guest CPU data for %s architecture"),
-                       virArchToString(host->arch));
-        return VIR_CPU_COMPARE_ERROR;
-    }
-
-    return driver->guestData(host, guest, data, msg);
-}
-
-
 /**
  * cpuBaselineXML:
  *

diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index ff48fb5ca2e8cedc55ebb6c393f23903766299cc..69c17e72a3441ecbd8aa237c2f1ec6d27687b48a 100644 (file)
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -73,12 +73,6 @@ typedef void
 typedef virCPUDataPtr
 (*cpuArchNodeData)  (virArch arch);
 
-typedef virCPUCompareResult
-(*cpuArchGuestData) (virCPUDefPtr host,
-                     virCPUDefPtr guest,
-                     virCPUDataPtr *data,
-                     char **message);
-
 typedef virCPUDefPtr
 (*cpuArchBaseline)  (virCPUDefPtr *cpus,
                      unsigned int ncpus,
@@ -124,7 +118,6 @@ struct cpuArchDriver {
     cpuArchEncode       encode;
     cpuArchDataFree     free;
     cpuArchNodeData     nodeData;
-    cpuArchGuestData    guestData;
     cpuArchBaseline     baseline;
     virCPUArchUpdate    update;
     virCPUArchCheckFeature checkFeature;
@@ -175,13 +168,6 @@ cpuDataFree (virCPUDataPtr data);
 virCPUDataPtr
 cpuNodeData (virArch arch);
 
-virCPUCompareResult
-cpuGuestData(virCPUDefPtr host,
-             virCPUDefPtr guest,
-             virCPUDataPtr *data,
-             char **msg)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-
 char *
 cpuBaselineXML(const char **xmlCPUs,
                unsigned int ncpus,

diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index b5002c3720fea75ef5a3387b241aa47a26c1e20c..653b06b2f9f01cc3ce91927cff1eb1f112aa3ad5 100644 (file)
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -78,15 +78,6 @@ virCPUarmUpdate(virCPUDefPtr guest,
 }
 
 
-static virCPUCompareResult
-armGuestData(virCPUDefPtr host ATTRIBUTE_UNUSED,
-             virCPUDefPtr guest ATTRIBUTE_UNUSED,
-             virCPUDataPtr *data ATTRIBUTE_UNUSED,
-             char **message ATTRIBUTE_UNUSED)
-{
-    return VIR_CPU_COMPARE_IDENTICAL;
-}
-
 static virCPUDefPtr
 armBaseline(virCPUDefPtr *cpus,
             unsigned int ncpus ATTRIBUTE_UNUSED,
@@ -128,7 +119,6 @@ struct cpuArchDriver cpuDriverArm = {
     .encode = NULL,
     .free = armDataFree,
     .nodeData = NULL,
-    .guestData = armGuestData,
     .baseline = armBaseline,
     .update = virCPUarmUpdate,
 };

diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index 8b71ef55f2a9a016004ed6146afd058ef6f5d6c4..225fb6d9694b1c9c46e6ab07d6684e1a4ee718fd 100644 (file)
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -745,14 +745,6 @@ ppc64DriverNodeData(virArch arch)
     return NULL;
 }
 
-static virCPUCompareResult
-ppc64DriverGuestData(virCPUDefPtr host,
-                     virCPUDefPtr guest,
-                     virCPUDataPtr *data,
-                     char **message)
-{
-    return ppc64Compute(host, guest, data, message);
-}
 
 static int
 virCPUppc64Update(virCPUDefPtr guest,
@@ -911,7 +903,6 @@ struct cpuArchDriver cpuDriverPPC64 = {
     .encode     = NULL,
     .free       = ppc64DriverFree,
     .nodeData   = ppc64DriverNodeData,
-    .guestData  = ppc64DriverGuestData,
     .baseline   = ppc64DriverBaseline,
     .update     = virCPUppc64Update,
     .getModels  = virCPUppc64DriverGetModels,

diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index fb352a0f1d4f10ea42c600988276745c6d7cd1c7..04a6bea151b2ad400988e89d8fcb28a541433376 100644 (file)
--- a/src/cpu/cpu_s390.c
+++ b/src/cpu/cpu_s390.c
@@ -80,7 +80,6 @@ struct cpuArchDriver cpuDriverS390 = {
     .encode     = NULL,
     .free       = s390DataFree,
     .nodeData   = s390NodeData,
-    .guestData  = NULL,
     .baseline   = NULL,
     .update     = NULL,
 };

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 851ec5dfe9b07c2da76e7b77e9e2ebb43624e8da..e91850f3ff2ebde8b51aae0a351665eb0c548be4 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1725,22 +1725,6 @@ virCPUx86Compare(virCPUDefPtr host,
 }
 
 
-static virCPUCompareResult
-x86GuestData(virCPUDefPtr host,
-             virCPUDefPtr guest,
-             virCPUDataPtr *data,
-             char **message)
-{
-    if (!guest->model) {
-        virReportError(VIR_ERR_INVALID_ARG, "%s",
-                       _("no guest CPU model specified"));
-        return VIR_CPU_COMPARE_ERROR;
-    }
-
-    return x86Compute(host, guest, data, message);
-}
-
-
 /*
  * Checks whether a candidate model is a better fit for the CPU data than the
  * current model.
@@ -2761,7 +2745,6 @@ struct cpuArchDriver cpuDriverX86 = {
 #else
     .nodeData   = NULL,
 #endif
-    .guestData  = x86GuestData,
     .baseline   = x86Baseline,
     .update     = virCPUx86Update,
     .checkFeature = virCPUx86CheckFeature,

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 38f8ecb631db13b6b6e3aa820429d852ce668305..baff82bcbad40a0443abf8b19323ac389fe0465d 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -978,7 +978,6 @@ cpuBaselineXML;
 cpuDataFree;
 cpuDecode;
 cpuEncode;
-cpuGuestData;
 cpuNodeData;
 virCPUCheckFeature;
 virCPUCompare;