Commit 7d00bf94 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/cpumodel: factor out determination of default model name 



Now we can drop inclusion of "sysemu/kvm.h" from "s390-virtio.c".

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170818114353.13455-7-david@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent fe7cb8ea

hw/s390x/s390-virtio.c

+1 −6
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "hw/boards.h"

#include "hw/loader.h"

#include "hw/virtio/virtio.h"

#include "sysemu/kvm.h"

#include "exec/address-spaces.h"

#include "sysemu/qtest.h"
@@ -93,11 +92,7 @@ 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";

        }

        machine->cpu_model = s390_default_cpu_model_name();

    }



    cpu_states = g_new0(S390CPU *, max_cpus);

target/s390x/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ void s390_cpu_model_register_props(Object *obj); 
void s390_cpu_model_class_register_props(ObjectClass *oc);

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

ObjectClass *s390_cpu_class_by_name(const char *name);

const char *s390_default_cpu_model_name(void);



#define EXCP_EXT 1 /* external interrupt */

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

target/s390x/cpu_models.c

+8 −0
Original line number Diff line number Diff line
@@ -1200,6 +1200,14 @@ ObjectClass *s390_cpu_class_by_name(const char *name) 
    return oc;

}



const char *s390_default_cpu_model_name(void)

{

     if (kvm_enabled()) {

        return "host";

     }

     return "qemu";

}



static const TypeInfo qemu_s390_cpu_type_info = {

    .name = S390_CPU_TYPE_NAME("qemu"),

    .parent = TYPE_S390_CPU,