Commit 311ca98d authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

pc: use generic cpu_model parsing 



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: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1505318697-77161-5-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 6063d4c0

hw/i386/pc.c

+5 −36
Original line number Diff line number Diff line
@@ -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,

hw/i386/pc_piix.c

+1 −3
Original line number Diff line number Diff line
@@ -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);
@@ -1113,6 +1110,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,

target/i386/cpu.c

+0 −3
Original line number Diff line number Diff line
@@ -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.

 */

target/i386/cpu.h

+9 −0
Original line number Diff line number Diff line
@@ -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