qemu-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH 5/6] pc: use generic cpu_model parsing

From: Philippe Mathieu-Daudé
Subject: Re: [Qemu-devel] [PATCH 5/6] pc: use generic cpu_model parsing
Date: Mon, 4 Sep 2017 12:33:15 -0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 
On 09/04/2017 11:01 AM, Igor Mammedov wrote:

define default CPU type in generic way in pc_machine_class_init()
and let common machine code to handle cpu_model parsing

Patch also introduces TARGET_DEFAULT_CPU_TYPE define for 2 purposes:
   * make foo_machine_class_init() look uniform on every target
   * use define in [bsd|linux]-user targets to pick default
     cpu type

Signed-off-by: Igor Mammedov <address@hidden>


Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


---
  target/i386/cpu.h |  9 +++++++++
  hw/i386/pc.c      | 41 +++++------------------------------------
  hw/i386/pc_piix.c |  4 +---
  target/i386/cpu.c |  3 ---
  4 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 525d35d..4035a11 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1508,6 +1508,15 @@ uint64_t cpu_get_tsc(CPUX86State *env);
#define cpu_init(cpu_model) cpu_generic_init(TYPE_X86_CPU, cpu_model) +#define X86_CPU_TYPE_SUFFIX "-" TYPE_X86_CPU 
+#define X86_CPU_TYPE_NAME(name) (name X86_CPU_TYPE_SUFFIX)
+
+#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_signal_handler cpu_x86_signal_handler
  #define cpu_list x86_cpu_list
diff --git a/hw/i386/pc.c b/hw/i386/pc.c 
index 2108104..2247ac0 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1107,7 +1107,6 @@ static void pc_new_cpu(const char *typename, int64_t 
apic_id, Error **errp)
void pc_hot_add_cpu(const int64_t id, Error **errp) 
  {
-    ObjectClass *oc;
      MachineState *ms = MACHINE(qdev_get_machine());
      int64_t apic_id = x86_cpu_apic_id_from_index(id);
      Error *local_err = NULL;
@@ -1124,9 +1123,7 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)
          return;
      }
- assert(ms->possible_cpus->cpus[0].cpu); /* BSP is always present */ 
-    oc = OBJECT_CLASS(CPU_GET_CLASS(ms->possible_cpus->cpus[0].cpu));
-    pc_new_cpu(object_class_get_name(oc), apic_id, &local_err);
+    pc_new_cpu(ms->cpu_type, apic_id, &local_err);
      if (local_err) {
          error_propagate(errp, local_err);
          return;
@@ -1136,39 +1133,10 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)
  void pc_cpus_init(PCMachineState *pcms)
  {
      int i;
-    CPUClass *cc;
-    ObjectClass *oc;
-    const char *typename;
-    gchar **model_pieces;
      const CPUArchIdList *possible_cpus;
-    MachineState *machine = MACHINE(pcms);
+    MachineState *ms = MACHINE(pcms);
      MachineClass *mc = MACHINE_GET_CLASS(pcms);
- /* init CPUs */ 
-    if (machine->cpu_model == NULL) {
-#ifdef TARGET_X86_64
-        machine->cpu_model = "qemu64";
-#else
-        machine->cpu_model = "qemu32";
-#endif
-    }
-
-    model_pieces = g_strsplit(machine->cpu_model, ",", 2);
-    if (!model_pieces[0]) {
-        error_report("Invalid/empty CPU model name");
-        exit(1);
-    }
-
-    oc = cpu_class_by_name(TYPE_X86_CPU, model_pieces[0]);
-    if (oc == NULL) {
-        error_report("Unable to find CPU definition: %s", model_pieces[0]);
-        exit(1);
-    }
-    typename = object_class_get_name(oc);
-    cc = CPU_CLASS(oc);
-    cc->parse_features(typename, model_pieces[1], &error_fatal);
-    g_strfreev(model_pieces);
-
      /* Calculates the limit to CPU APIC ID values
       *
       * Limit for the APIC ID value, so that all
@@ -1177,9 +1145,9 @@ void pc_cpus_init(PCMachineState *pcms)
       * This is used for FW_CFG_MAX_CPUS. See comments on bochs_bios_init().
       */
      pcms->apic_id_limit = x86_cpu_apic_id_from_index(max_cpus - 1) + 1;
-    possible_cpus = mc->possible_cpu_arch_ids(machine);
+    possible_cpus = mc->possible_cpu_arch_ids(ms);
      for (i = 0; i < smp_cpus; i++) {
-        pc_new_cpu(typename, possible_cpus->cpus[i].arch_id, &error_fatal);
+        pc_new_cpu(ms->cpu_type, possible_cpus->cpus[i].arch_id, &error_fatal);
      }
  }
@@ -2360,6 +2328,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) 
      hc->unplug_request = pc_machine_device_unplug_request_cb;
      hc->unplug = pc_machine_device_unplug_cb;
      nc->nmi_monitor_handler = x86_nmi;
+    mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
object_class_property_add(oc, PC_MACHINE_MEMHP_REGION_SIZE, "int", 
          pc_machine_get_hotplug_memory_region_size, NULL,
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 46dfd2c..a3f4e2a 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -378,9 +378,6 @@ static void pc_compat_0_13(MachineState *machine)
static void pc_init_isa(MachineState *machine) 
  {
-    if (!machine->cpu_model) {
-        machine->cpu_model = "486";
-    }
      x86_cpu_change_kvm_default("kvm-pv-eoi", NULL);
      enable_compat_apic_id_mode();
      pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE);
@@ -1104,6 +1101,7 @@ static void isapc_machine_options(MachineClass *m)
      pcmc->gigabyte_align = false;
      pcmc->smbios_legacy_mode = true;
      pcmc->has_reserved_memory = false;
+    m->default_cpu_type = X86_CPU_TYPE_NAME("486");
  }
DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa, 
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index f81576d..a91b2b6 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -705,9 +705,6 @@ void host_vendor_fms(char *vendor, int *family, int *model, 
int *stepping)
/* CPU class name definitions: */ -#define X86_CPU_TYPE_SUFFIX "-" TYPE_X86_CPU 
-#define X86_CPU_TYPE_NAME(name) (name X86_CPU_TYPE_SUFFIX)
-
  /* Return type name for a given CPU model name
   * Caller is responsible for freeing the returned string.
   */
reply via email to
[Prev in Thread] Current Thread [Next in Thread]