From patchwork Fri Dec 14 16:46:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 206524 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 5CC552C00B0 for ; Sat, 15 Dec 2012 03:47:16 +1100 (EST) Received: from localhost ([::1]:34062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjYPq-00039U-II for incoming@patchwork.ozlabs.org; Fri, 14 Dec 2012 11:47:14 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjYPb-00039G-5N for qemu-devel@nongnu.org; Fri, 14 Dec 2012 11:47:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TjYPZ-0002sK-Cw for qemu-devel@nongnu.org; Fri, 14 Dec 2012 11:46:59 -0500 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:40305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjYPZ-0002sB-4V for qemu-devel@nongnu.org; Fri, 14 Dec 2012 11:46:57 -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, 14 Dec 2012 16:46:39 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 14 Dec 2012 16:46:37 -0000 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBEGkjRu2687370 for ; Fri, 14 Dec 2012 16:46:45 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 qBEGkqlT025548 for ; Fri, 14 Dec 2012 09:46:53 -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 qBEGkpsM025536; Fri, 14 Dec 2012 09:46:52 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 1122) id E2BF8122442E; Fri, 14 Dec 2012 17:46:51 +0100 (CET) From: Jens Freimann To: Alexander Graf Date: Fri, 14 Dec 2012 17:46:46 +0100 Message-Id: <1355503606-54131-4-git-send-email-jfrei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1355503606-54131-1-git-send-email-jfrei@linux.vnet.ibm.com> References: <1355503606-54131-1-git-send-email-jfrei@linux.vnet.ibm.com> x-cbid: 12121416-2966-0000-0000-00000631CFCF 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 , 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 Reviewed-by: Andreas Färber --- v1 -> v2: * only print output with CONFIG_KVM --- 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 75d4036..adca789 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -28,8 +28,31 @@ #include "hw/hw.h" #include "qemu-common.h" #include "qemu-timer.h" +#include "arch_init.h" +/* 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