Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756783AbbBQO0E (ORCPT ); Tue, 17 Feb 2015 09:26:04 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:58040 "EHLO e06smtp11.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933378AbbBQOZ2 (ORCPT ); Tue, 17 Feb 2015 09:25:28 -0500 From: Michael Mueller To: qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Gleb Natapov , Alexander Graf , Christian Borntraeger , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Andreas Faerber , Richard Henderson , Michael Mueller Subject: [RFC PATCH v2 15/15] cpu-model/s390: Enable S390 cpu model Date: Tue, 17 Feb 2015 15:24:13 +0100 Message-Id: <1424183053-4310-16-git-send-email-mimu@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 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> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15021714-0041-0000-0000-000003690D3E Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1799 Lines: 61 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/