From patchwork Fri Aug 18 10:08:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 9908245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1E872600CC for ; Fri, 18 Aug 2017 10:18:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 103CA28BA7 for ; Fri, 18 Aug 2017 10:18:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 052F228C83; Fri, 18 Aug 2017 10:18:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A0B0328BA7 for ; Fri, 18 Aug 2017 10:18:28 +0000 (UTC) Received: from localhost ([::1]:40677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dieMF-0003bv-M5 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 18 Aug 2017 06:18:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dieDM-00041y-2s for qemu-devel@nongnu.org; Fri, 18 Aug 2017 06:09:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dieDL-0000b2-1Q for qemu-devel@nongnu.org; Fri, 18 Aug 2017 06:09:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64106) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dieDK-0000Zn-Oc for qemu-devel@nongnu.org; Fri, 18 Aug 2017 06:09:14 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA720C0587E9 for ; Fri, 18 Aug 2017 10:09:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DA720C0587E9 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=imammedo@redhat.com Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F4FA5D743 for ; Fri, 18 Aug 2017 10:09:13 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Fri, 18 Aug 2017 12:08:41 +0200 Message-Id: <1503050939-227939-10-git-send-email-imammedo@redhat.com> In-Reply-To: <1503050939-227939-1-git-send-email-imammedo@redhat.com> References: <1503050939-227939-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 18 Aug 2017 10:09:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.11 09/27] s390x: replace cpu_s390x_init() with cpu_generic_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP cpu_s390x_init() is used only *-user targets indirectly via cpu_init() macro and has a hack to assign ids to created cpus (I'm not sure if 'id' really matters to *-user emulation). So to on safe side, instead of having custom wrapper to do numbering replace it with cpu_generic_init() and use S390CPUClass::next_cpu_id which could serve the same purpose as static variable and move cpu->id initialization to s390_cpu_initfn for CONFIG_USER_ONLY use-case. PS: ifdef is ugly but it allows us to hide s390x detail that isn't set by *-user targets and reuse generic cpu creation utility for btoh machine and user emulation. Signed-off-by: Igor Mammedov Acked-by: Cornelia Huck --- perhaps cpu->id isn't need by CONFIG_USER_ONLY but I'd leave to it s390x maintainers to deal with it. --- target/s390x/cpu.h | 3 +-- target/s390x/cpu.c | 7 +++++++ target/s390x/helper.c | 14 -------------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 29fdd5d..7891d68 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -474,7 +474,6 @@ static inline bool get_per_in_range(CPUS390XState *env, uint64_t addr) } } -S390CPU *cpu_s390x_init(const char *cpu_model); S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp); S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp); void s390x_translate_init(void); @@ -638,7 +637,7 @@ static inline unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu) extern void subsystem_reset(void); -#define cpu_init(model) CPU(cpu_s390x_init(model)) +#define cpu_init(cpu_model) cpu_generic_init(TYPE_S390_CPU, cpu_model) #define cpu_signal_handler cpu_s390x_signal_handler void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf); diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 489bc25..72b0b9e 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -303,6 +303,13 @@ static void s390_cpu_initfn(Object *obj) inited = true; s390x_translate_init(); } + +#if defined(CONFIG_USER_ONLY) + { + S390CPUClass *scc = S390_CPU_GET_CLASS(obj); + cpu->id = scc->next_cpu_id; + } +#endif } static void s390_cpu_finalize(Object *obj) diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 0c989b1..5c23552 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -128,20 +128,6 @@ out: return cpu; } -S390CPU *cpu_s390x_init(const char *cpu_model) -{ - Error *err = NULL; - S390CPU *cpu; - /* Use to track CPU ID for linux-user only */ - static int64_t next_cpu_id; - - cpu = s390x_new_cpu(cpu_model, next_cpu_id++, &err); - if (err) { - error_report_err(err); - } - return cpu; -} - #ifndef CONFIG_USER_ONLY hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr vaddr)