Commit 41868f84 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/cpumodel: "host" and "qemu" as CPU subclasses 



This patch introduces two CPU models, "host" and "qemu".
"qemu" is used as default when running under TCG. "host" is used
as default when running under KVM. "host" cannot be used without KVM.
"host" is not migration-safe. They both inherit from the base s390x CPU,
which is turned into an abstract class.

This patch also changes CPU creation to take care of the passed CPU string
and reuses common code parse_features() function for that purpose. Unknown
CPU definitions are now reported. The "-cpu ?" and "query-cpu-definition"
commands are changed to list all CPU subclasses automatically, including
migration-safety and whether static.

Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <20160905085244.99980-3-dahi@linux.vnet.ibm.com>
[CH: fix up self-assignments in s390_cpu_list, as spotted by clang]
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent fc4b84b1

hw/s390x/s390-virtio.c

+5 −1
Original line number Diff line number Diff line
@@ -101,7 +101,11 @@ void s390_init_cpus(MachineState *machine) 
    gchar *name;



    if (machine->cpu_model == NULL) {

        if (kvm_enabled()) {

            machine->cpu_model = "host";

        } else {

            machine->cpu_model = "qemu";

        }

    }



    cpu_states = g_new0(S390CPU *, max_cpus);

target-s390x/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
obj-y += translate.o helper.o cpu.o interrupt.o

obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o

obj-y += gdbstub.o

obj-y += gdbstub.o cpu_models.o

obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o

obj-$(CONFIG_KVM) += kvm.o

target-s390x/cpu-qom.h

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ typedef struct S390CPUClass { 
    /*< private >*/

    CPUClass parent_class;

    /*< public >*/

    bool kvm_required;

    bool is_static;

    bool is_migration_safe;

    const char *desc;



    int64_t next_cpu_id;

target-s390x/cpu.c

+8 −25
Original line number Diff line number Diff line
@@ -44,30 +44,6 @@ 
#define CR0_RESET       0xE0UL

#define CR14_RESET      0xC2000000UL;



/* generate CPU information for cpu -? */

void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf)

{

#ifdef CONFIG_KVM

    (*cpu_fprintf)(f, "s390 %16s\n", "host");

#endif

}



#ifndef CONFIG_USER_ONLY

CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)

{

    CpuDefinitionInfoList *entry;

    CpuDefinitionInfo *info;



    info = g_malloc0(sizeof(*info));

    info->name = g_strdup("host");



    entry = g_malloc0(sizeof(*entry));

    entry->value = info;



    return entry;

}

#endif



static void s390_cpu_set_pc(CPUState *cs, vaddr value)

{

    S390CPU *cpu = S390_CPU(cs);
@@ -206,6 +182,12 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) 
    CPUS390XState *env = &cpu->env;

    Error *err = NULL;



    /* the model has to be realized before qemu_init_vcpu() due to kvm */

    s390_realize_cpu_model(cs, &err);

    if (err) {

        goto out;

    }



#if !defined(CONFIG_USER_ONLY)

    if (cpu->id >= max_cpus) {

        error_setg(&err, "Unable to add CPU: %" PRIi64
@@ -435,6 +417,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) 
    scc->cpu_reset = s390_cpu_reset;

    scc->initial_cpu_reset = s390_cpu_initial_reset;

    cc->reset = s390_cpu_full_reset;

    cc->class_by_name = s390_cpu_class_by_name,

    cc->has_work = s390_cpu_has_work;

    cc->do_interrupt = s390_cpu_do_interrupt;

    cc->dump_state = s390_cpu_dump_state;
@@ -470,7 +453,7 @@ static const TypeInfo s390_cpu_type_info = { 
    .instance_size = sizeof(S390CPU),

    .instance_init = s390_cpu_initfn,

    .instance_finalize = s390_cpu_finalize,

    .abstract = false,

    .abstract = true,

    .class_size = sizeof(S390CPUClass),

    .class_init = s390_cpu_class_init,

};

target-s390x/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -633,6 +633,8 @@ extern void subsystem_reset(void); 


void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf);

#define cpu_list s390_cpu_list

void s390_realize_cpu_model(CPUState *cs, Error **errp);

ObjectClass *s390_cpu_class_by_name(const char *name);



#define EXCP_EXT 1 /* external interrupt */

#define EXCP_SVC 2 /* supervisor call (syscall) */