cpu_x86.c: remove 'guest' param from x86Compute()

x86Compute() is a static function called only by virCPUx86Compare()
which passes NULL to the 'guest' parameter of x86Compute().

The last caller of x86Compute() that used it with 'guest' != NULL
was an API called 'cpuGuestData'. This API was dropped by commit
03fa904c0c0cb2 a few years ago. Since then all callers of x86Compute()
uses it with 'guest' = NULL.

Removing the 'guest' parameter allow us to remove a good chunk of
logic that isn't being used for awhile.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 54cfed3fe69e59c58a6694d44f8ea203d4c44965..0b2ff82d4078b1f100ad617d6c6a72ad2199651b 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1833,7 +1833,6 @@ virCPUx86DataParse(xmlNodePtr node)
 static virCPUCompareResult
 x86Compute(virCPUDef *host,
            virCPUDef *cpu,
-           virCPUData **guest,
            char **message)
 {
     virCPUx86Map *map = NULL;
@@ -1844,11 +1843,8 @@ x86Compute(virCPUDef *host,
     g_autoptr(virCPUx86Model) cpu_disable = NULL;
     g_autoptr(virCPUx86Model) cpu_forbid = NULL;
     g_autoptr(virCPUx86Model) diff = NULL;
-    g_autoptr(virCPUx86Model) guest_model = NULL;
-    g_autoptr(virCPUData) guestData = NULL;
     virCPUCompareResult ret;
     virCPUx86CompareResult result;
-    virArch arch;
     size_t i;
 
     if (cpu->arch != VIR_ARCH_NONE) {
@@ -1870,9 +1866,6 @@ x86Compute(virCPUDef *host,
             }
             return VIR_CPU_COMPARE_INCOMPATIBLE;
         }
-        arch = cpu->arch;
-    } else {
-        arch = host->arch;
     }
 
     if (cpu->vendor &&
@@ -1939,37 +1932,6 @@ x86Compute(virCPUDef *host,
         return VIR_CPU_COMPARE_INCOMPATIBLE;
     }
 
-    if (guest) {
-        guest_model = x86ModelCopy(host_model);
-
-        if (cpu->vendor && host_model->vendor &&
-            virCPUx86DataAddItem(&guest_model->data,
-                                 &host_model->vendor->data) < 0)
-            return VIR_CPU_COMPARE_ERROR;
-
-        if (host_model->signatures && host_model->signatures->count > 0) {
-            virCPUx86Signature *sig = &host_model->signatures->items[0];
-            if (x86DataAddSignature(&guest_model->data,
-                                    virCPUx86SignatureToCPUID(sig)) < 0)
-                return VIR_CPU_COMPARE_ERROR;
-        }
-
-        if (cpu->type == VIR_CPU_TYPE_GUEST
-            && cpu->match == VIR_CPU_MATCH_EXACT)
-            x86DataSubtract(&guest_model->data, &diff->data);
-
-        if (x86DataAdd(&guest_model->data, &cpu_force->data))
-            return VIR_CPU_COMPARE_ERROR;
-
-        x86DataSubtract(&guest_model->data, &cpu_disable->data);
-
-        if (!(guestData = virCPUDataNew(arch)))
-            return VIR_CPU_COMPARE_ERROR;
-        x86DataCopy(&guestData->data.x86, &guest_model->data);
-
-        *guest = g_steal_pointer(&guestData);
-    }
-
     return ret;
 }
 #undef virX86CpuIncompatible
@@ -1994,7 +1956,7 @@ virCPUx86Compare(virCPUDef *host,
         return VIR_CPU_COMPARE_INCOMPATIBLE;
     }
 
-    ret = x86Compute(host, cpu, NULL, &message);
+    ret = x86Compute(host, cpu, &message);
 
     if (ret == VIR_CPU_COMPARE_INCOMPATIBLE && failIncompatible) {
         if (message)