[RFC PATCH 08/18] hw/i386: Inline TARGET_DEFAULT_CPU_TYPE definition

[Philippe Mathieu-Daudé]

For legacy x86 binaries, legacy_binary_is_64bit() is equivalent
of the compile time TARGET_X86_64 definition. Use it in place in
machine class_init() handlers, removing the need on TARGET_X86_64.

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
 target/i386/cpu.h     | 6 ------
 hw/i386/microvm.c     | 5 ++++-
 hw/i386/pc.c          | 5 ++++-
 hw/i386/xen/xen-pvh.c | 5 ++++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 0ab2e1bdb40..7f3c1ceaca7 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -2555,12 +2555,6 @@ uint64_t cpu_get_tsc(CPUX86State *env);
 
 #define CPU_RESOLVING_TYPE TYPE_X86_CPU
 
-#ifdef TARGET_X86_64
-#define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu64")
-#else
-#define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu32")
-#endif
-
 #define cpu_list x86_cpu_list
 
 /* MMU modes definitions */
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index d0a236c74f3..cc94e1408c6 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -19,6 +19,7 @@
 #include "qemu/error-report.h"
 #include "qemu/cutils.h"
 #include "qemu/units.h"
+#include "qemu/legacy_binary_info.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qapi/qapi-visit-common.h"
@@ -654,7 +655,9 @@ static void microvm_class_init(ObjectClass *oc, void *data)
     mc->has_hotpluggable_cpus = false;
     mc->auto_enable_numa_with_memhp = false;
     mc->auto_enable_numa_with_memdev = false;
-    mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
+    mc->default_cpu_type = legacy_binary_is_64bit()
+                           ? X86_CPU_TYPE_NAME("qemu64")
+                           : X86_CPU_TYPE_NAME("qemu32");
     mc->nvdimm_supported = false;
     mc->default_ram_id = "microvm.ram";
 
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 63a96cd23f8..936a770aad8 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
+#include "qemu/legacy_binary_info.h"
 #include "hw/i386/pc.h"
 #include "hw/char/serial-isa.h"
 #include "hw/char/parallel.h"
@@ -1794,7 +1795,9 @@ static void pc_machine_class_init(ObjectClass *oc, void 
*data)
     hc->plug = pc_machine_device_plug_cb;
     hc->unplug_request = pc_machine_device_unplug_request_cb;
     hc->unplug = pc_machine_device_unplug_cb;
-    mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
+    mc->default_cpu_type = legacy_binary_is_64bit()
+                           ? X86_CPU_TYPE_NAME("qemu64")
+                           : X86_CPU_TYPE_NAME("qemu32");
     mc->nvdimm_supported = true;
     mc->smp_props.dies_supported = true;
     mc->smp_props.modules_supported = true;
diff --git a/hw/i386/xen/xen-pvh.c b/hw/i386/xen/xen-pvh.c
index 33c10279763..f0080c83021 100644
--- a/hw/i386/xen/xen-pvh.c
+++ b/hw/i386/xen/xen-pvh.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/legacy_binary_info.h"
 #include "qemu/error-report.h"
 #include "hw/boards.h"
 #include "system/system.h"
@@ -81,7 +82,9 @@ static void xen_pvh_machine_class_init(ObjectClass *oc, void 
*data)
     MachineClass *mc = MACHINE_CLASS(oc);
 
     mc->desc = "Xen PVH x86 machine";
-    mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
+    mc->default_cpu_type = legacy_binary_is_64bit()
+                           ? X86_CPU_TYPE_NAME("qemu64")
+                           : X86_CPU_TYPE_NAME("qemu32");
 
     /* mc->max_cpus holds the MAX value allowed in the -smp cmd-line opts. */
     mc->max_cpus = HVM_MAX_VCPUS;
-- 
2.47.1