From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNj5M-0006NL-Qw for qemu-devel@nongnu.org; Tue, 17 Feb 2015 09:25:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNj5G-00016P-V2 for qemu-devel@nongnu.org; Tue, 17 Feb 2015 09:25:12 -0500 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:54772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNj5G-00013F-Dw for qemu-devel@nongnu.org; Tue, 17 Feb 2015 09:25:06 -0500 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Feb 2015 14:25:04 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7D6F517D80C4 for ; Tue, 17 Feb 2015 14:25:07 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1HEOs5T7537008 for ; Tue, 17 Feb 2015 14:24:54 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t1HEOr7g005148 for ; Tue, 17 Feb 2015 07:24:54 -0700 From: Michael Mueller Date: Tue, 17 Feb 2015 15:24:13 +0100 Message-Id: <1424183053-4310-16-git-send-email-mimu@linux.vnet.ibm.com> In-Reply-To: <1424183053-4310-1-git-send-email-mimu@linux.vnet.ibm.com> References: <1424183053-4310-1-git-send-email-mimu@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v2 15/15] cpu-model/s390: Enable S390 cpu model List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Michael Mueller , Gleb Natapov , Alexander Graf , Christian Borntraeger , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Andreas Faerber , Richard Henderson This patch enables QEMU to instantiate S390 CPUs with cpu model types. Signed-off-by: Michael Mueller --- hw/s390x/s390-virtio.c | 6 ++++++ target-s390x/helper.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index c215cd8..aabd772 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" @@ -152,6 +153,11 @@ void s390_init_cpus(const char *cpu_model, uint8_t *storage_keys) cpu_model = "host"; } + if (is_help_option(cpu_model)) { + list_cpus(stdout, &fprintf, cpu_model); + exit(0); + } + ipi_states = g_malloc(sizeof(S390CPU *) * smp_cpus); for (i = 0; i < smp_cpus; i++) { diff --git a/target-s390x/helper.c b/target-s390x/helper.c index 5958343..568428d 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 @@ -75,7 +76,7 @@ S390CPU *cpu_s390x_init(const char *cpu_model) { S390CPU *cpu; - cpu = S390_CPU(object_new(TYPE_S390_CPU)); + cpu = S390_CPU(object_new(s390_select_cpu_model(cpu_model))); object_property_set_bool(OBJECT(cpu), true, "realized", NULL); -- 1.8.3.1