From patchwork Fri Nov 23 12:36:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 201309 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 746752C008F for ; Fri, 23 Nov 2012 23:36:38 +1100 (EST) Received: from localhost ([::1]:36974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbsUm-000051-Ky for incoming@patchwork.ozlabs.org; Fri, 23 Nov 2012 07:36:36 -0500 Received: from eggs.gnu.org ([208.118.235.92]:48121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbsUc-0008W8-31 for qemu-devel@nongnu.org; Fri, 23 Nov 2012 07:36:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TbsUY-0004Is-9V for qemu-devel@nongnu.org; Fri, 23 Nov 2012 07:36:26 -0500 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:46385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbsUY-0004Ii-0h for qemu-devel@nongnu.org; Fri, 23 Nov 2012 07:36:22 -0500 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 23 Nov 2012 12:36:20 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 23 Nov 2012 12:36:17 -0000 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps3074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qANCa9Bq57606370 for ; Fri, 23 Nov 2012 12:36:09 GMT Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qANCaGCX003279 for ; Fri, 23 Nov 2012 05:36:16 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qANCaGj3003263; Fri, 23 Nov 2012 05:36:16 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 1122) id 557011224439; Fri, 23 Nov 2012 13:36:16 +0100 (CET) From: Jens Freimann To: Alexander Graf Date: Fri, 23 Nov 2012 13:36:14 +0100 Message-Id: <1353674174-42656-1-git-send-email-jfrei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.12.4 x-cbid: 12112312-2966-0000-0000-000005F7E6A9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.109 Cc: Heinz Graalfs , qemu-devel , Viktor Mihajlovski , Christian Borntraeger , Jens Freimann , Cornelia Huck , Einar Lueck Subject: [Qemu-devel] [PATCH] S390: Basic CPU model support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Viktor Mihajlovski This enables qemu -cpu ? to return the list of supported CPU models on s390. Since only the host model is supported at this point in time this is pretty straight-forward. Further, a validity check for the requested CPU model was added. This change is needed to allow libvirt exploiters (like OpenStack) to specify a CPU model. Signed-off-by: Viktor Mihajlovski Signed-off-by: Jens Freimann Reviewed-by: Christian Borntraeger --- Added copyright statement changes for s390-virtio.c, equivalent to the changes we made to kvm.c recently. hw/s390-virtio.c | 11 ++++++++++- target-s390x/cpu.c | 6 ++++++ target-s390x/cpu.h | 3 +++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 685cb54..bb85de7 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -2,6 +2,7 @@ * QEMU S390 virtio target * * Copyright (c) 2009 Alexander Graf + * Copyright IBM Corp 2012 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -13,7 +14,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public + * Contributions after 2012-10-29 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. + * + * You should have received a copy of the GNU (Lesser) General Public * License along with this library; if not, see . */ @@ -209,6 +213,11 @@ static void s390_init(QEMUMachineInitArgs *args) cpu_model = "host"; } + if (strcmp(cpu_model, "host")) { + fprintf(stderr, "S390 only supports host CPU model\n"); + exit(1); + } + ipi_states = g_malloc(sizeof(S390CPU *) * smp_cpus); for (i = 0; i < smp_cpus; i++) { diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 619b202..03fdc31 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -25,6 +25,12 @@ #include "qemu-timer.h" +/* generate CPU information for cpu -? */ +void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf) +{ + (*cpu_fprintf)(f, "s390 %16s\n", "[host]"); +} + /* CPUClass::reset() */ static void s390_cpu_reset(CPUState *s) { diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 0f9a1f7..3513976 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -350,6 +350,9 @@ static inline void cpu_set_tls(CPUS390XState *env, target_ulong newtls) #define cpu_gen_code cpu_s390x_gen_code #define cpu_signal_handler cpu_s390x_signal_handler +void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf); +#define cpu_list s390_cpu_list + #include "exec-all.h" #ifdef CONFIG_USER_ONLY