From patchwork Tue Dec 18 17:50:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 207164 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 65FB72C0084 for ; Wed, 19 Dec 2012 04:51:29 +1100 (EST) Received: from localhost ([::1]:46934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl1KB-00065r-Gm for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2012 12:51:27 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl1Jx-000634-Ft for qemu-devel@nongnu.org; Tue, 18 Dec 2012 12:51:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tl1Jv-0005dt-BP for qemu-devel@nongnu.org; Tue, 18 Dec 2012 12:51:13 -0500 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:33169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl1Jv-0005d0-2s for qemu-devel@nongnu.org; Tue, 18 Dec 2012 12:51:11 -0500 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Dec 2012 17:50:49 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp17.uk.ibm.com (192.168.101.147) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 18 Dec 2012 17:50:48 -0000 Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBIHp0Ai62193696 for ; Tue, 18 Dec 2012 17:51:00 GMT Received: from d06av08.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBIHp7Ro007662 for ; Tue, 18 Dec 2012 10:51:07 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qBIHp7it007659; Tue, 18 Dec 2012 10:51:07 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 1122) id 5C751122442E; Tue, 18 Dec 2012 18:51:07 +0100 (CET) From: Jens Freimann To: Alexander Graf Date: Tue, 18 Dec 2012 18:50:59 +0100 Message-Id: <1355853059-37453-4-git-send-email-jfrei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1355853059-37453-1-git-send-email-jfrei@linux.vnet.ibm.com> References: <1355853059-37453-1-git-send-email-jfrei@linux.vnet.ibm.com> x-cbid: 12121817-0542-0000-0000-000003EA69C9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.113 Cc: Heinz Graalfs , qemu-devel , Andreas Faerber , Christian Borntraeger , Jens Freimann , Cornelia Huck , Viktor Mihajlovski , Einar Lueck Subject: [Qemu-devel] [PATCH 3/3] S390: Enable -cpu help and QMP query-cpu-definitions 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 help to return a list of supported CPU models on s390 and also to query for cpu definitions in the monitor. Initially only cpu model = host is returned. This needs to be reworked into a full-fledged CPU model handling later on. 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 --- hw/s390-virtio.c | 6 +++++- target-s390x/cpu.c | 23 +++++++++++++++++++++++ target-s390x/cpu.h | 3 +++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index a350430..60fde26 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 . */ diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 58e412a..1cddf41 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -28,11 +28,34 @@ #include "hw/hw.h" #include "qemu-common.h" #include "qemu-timer.h" +#include "arch_init.h" #define IPL_PSW_MASK 0x0000000180000000ULL #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; +/* generate CPU information for cpu -? */ +void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf) +{ +#ifdef CONFIG_KVM + (*cpu_fprintf)(f, "s390 %16s\n", "host"); +#endif +} + +CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) +{ + CpuDefinitionInfoList *entry; + CpuDefinitionInfo *info; + + info = g_malloc0(sizeof(*info)); + info->name = g_strdup("host"); + + entry = g_malloc0(sizeof(*entry)); + entry->value = info; + + return entry; +} + /* 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