From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YmkQN-0007kN-L2 for qemu-devel@nongnu.org; Mon, 27 Apr 2015 10:54:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YmkQJ-00018t-L4 for qemu-devel@nongnu.org; Mon, 27 Apr 2015 10:54:19 -0400 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:52120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YmkQJ-00018f-Cb for qemu-devel@nongnu.org; Mon, 27 Apr 2015 10:54:15 -0400 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 27 Apr 2015 15:54:14 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id C560317D8066 for ; Mon, 27 Apr 2015 15:54:52 +0100 (BST) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t3REsBLQ49938590 for ; Mon, 27 Apr 2015 14:54:12 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t3REs7a2025340 for ; Mon, 27 Apr 2015 08:54:11 -0600 From: Michael Mueller Date: Mon, 27 Apr 2015 16:53:31 +0200 Message-Id: <1430146411-34632-18-git-send-email-mimu@linux.vnet.ibm.com> In-Reply-To: <1430146411-34632-1-git-send-email-mimu@linux.vnet.ibm.com> References: <1430146411-34632-1-git-send-email-mimu@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v6 17/17] target-s390x: Enable S390 CPU model usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Gleb Natapov , Alexander Graf , Christian Borntraeger , Daniel Hansel , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Richard Henderson , Andreas Faerber , Michael Mueller This patch enables QEMU to instantiate S390 CPUs with CPU model types. Signed-off-by: Michael Mueller Acked-by: Christian Borntraeger --- hw/s390x/s390-virtio.c | 12 +++++++++++- target-s390x/helper.c | 9 ++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index bdb5388..8fda717 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -32,6 +32,7 @@ #include "hw/virtio/virtio.h" #include "hw/sysbus.h" #include "sysemu/kvm.h" +#include "sysemu/cpus.h" #include "exec/address-spaces.h" #include "hw/s390x/s390-virtio-bus.h" @@ -157,7 +158,12 @@ void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys) int i; if (cpu_model == NULL) { - cpu_model = "host"; + cpu_model = "none"; + } + + if (is_help_option(cpu_model)) { + list_cpus(stdout, &fprintf, cpu_model); + exit(0); } ipi_states = g_malloc(sizeof(S390CPU *) * smp_cpus); @@ -167,6 +173,10 @@ void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys) CPUState *cs; cpu = cpu_s390x_init(cpu_model); + if (cpu == NULL) { + fprintf(stderr, "Unable to find CPU definition\n"); + exit(1); + } cs = CPU(cpu); ipi_states[i] = cpu; diff --git a/target-s390x/helper.c b/target-s390x/helper.c index f1060c2..29dabe2 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -22,6 +22,7 @@ #include "exec/gdbstub.h" #include "qemu/timer.h" #include "exec/cpu_ldst.h" +#include "cpu-models.h" #ifndef CONFIG_USER_ONLY #include "sysemu/sysemu.h" #endif @@ -66,13 +67,7 @@ void s390x_cpu_timer(void *opaque) S390CPU *cpu_s390x_init(const char *cpu_model) { - S390CPU *cpu; - - cpu = S390_CPU(object_new(TYPE_S390_CPU)); - - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); - - return cpu; + return S390_CPU(cpu_generic_init(TYPE_S390_CPU, cpu_model)); } #if defined(CONFIG_USER_ONLY) -- 1.8.3.1