From patchwork Mon Jan 7 16:09:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 210013 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 485D32C0091 for ; Tue, 8 Jan 2013 04:11:47 +1100 (EST) Received: from localhost ([::1]:44079 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsFH2-0001SG-E4 for incoming@patchwork.ozlabs.org; Mon, 07 Jan 2013 11:10:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsFGf-0001Bd-PF for qemu-devel@nongnu.org; Mon, 07 Jan 2013 11:09:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsFGa-0007JY-Eg for qemu-devel@nongnu.org; Mon, 07 Jan 2013 11:09:41 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41677 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsFGa-0007Is-4y for qemu-devel@nongnu.org; Mon, 07 Jan 2013 11:09:36 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 54231A50E4; Mon, 7 Jan 2013 17:09:31 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2013 17:09:23 +0100 Message-Id: <1357574966-9671-4-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1357574966-9671-1-git-send-email-agraf@suse.de> References: <1357574966-9671-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Blue Swirl , Jens Freimann , Aurelien Jarno , Viktor Mihajlovski Subject: [Qemu-devel] [PATCH 3/6] 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 [agraf: fix s390x-linux-user, adjust header locations] Signed-off-by: Alexander Graf --- hw/s390-virtio.c | 6 +++++- target-s390x/cpu.c | 26 ++++++++++++++++++++++++++ target-s390x/cpu.h | 3 +++ 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 816c62f..a208c41 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 249f063..4833b3e 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -23,7 +23,33 @@ #include "cpu.h" #include "qemu-common.h" #include "qemu/timer.h" +#ifndef CONFIG_USER_ONLY +#include "sysemu/arch_init.h" +#endif + +/* 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 +} +#ifndef CONFIG_USER_ONLY +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; +} +#endif /* CPUClass::reset() */ static void s390_cpu_reset(CPUState *s) diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 8984edc..1a4b4df 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -353,6 +353,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/exec-all.h" #ifdef CONFIG_USER_ONLY