From nobody Mon Oct 27 18:31:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151629708155133.213045482623215; Thu, 18 Jan 2018 09:38:01 -0800 (PST) Received: from localhost ([::1]:43776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecE8V-0005lP-OZ for importer@patchew.org; Thu, 18 Jan 2018 12:37:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecE6Z-0004SN-Ce for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:36:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecE6W-0007y7-53 for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:35:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36932) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ecE6T-0007v7-R6; Thu, 18 Jan 2018 12:35:53 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E37BAC04B320; Thu, 18 Jan 2018 17:35:52 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9C8E78E7D; Thu, 18 Jan 2018 17:35:50 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 18:34:00 +0100 Message-Id: <1516296842-136976-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1516296842-136976-1-git-send-email-imammedo@redhat.com> References: <1516296842-136976-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 18 Jan 2018 17:35:52 +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] [RFC v2 3/5] linux-user: prepare for switching to cpu_create() API 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: , Cc: Peter Maydell , Eduardo Habkost , Laurent Vivier , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" temporarily add #ifdef CPU_RESOLVING_TYPE in linux-user/main.c so that each target could gradually switch to cpu_create() and not converted yet could continue to use cpu_init(). Once all targets are converted temporary ifdefs and cpu_init() API will be removed Signed-off-by: Igor Mammedov --- linux-user/main.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c index 450eb3c..d481e8c 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -44,6 +44,7 @@ static const char *argv0; static int gdbstub_port; static envlist_t *envlist; static const char *cpu_model; +static const char *cpu_type; unsigned long mmap_min_addr; unsigned long guest_base; int have_guest_base; @@ -3847,7 +3848,7 @@ void init_task_state(TaskState *ts) CPUArchState *cpu_copy(CPUArchState *env) { CPUState *cpu =3D ENV_GET_CPU(env); - CPUState *new_cpu =3D cpu_init(cpu_model); + CPUState *new_cpu =3D cpu_create(cpu_type); CPUArchState *new_env =3D new_cpu->env_ptr; CPUBreakpoint *bp; CPUWatchpoint *wp; @@ -4362,7 +4363,17 @@ int main(int argc, char **argv, char **envp) tcg_exec_init(0); /* NOTE: we need to init the CPU at this stage to get qemu_host_page_size */ + +#ifdef CPU_RESOLVING_TYPE + cpu_type =3D cpu_parse_cpu_model(CPU_RESOLVING_TYPE, cpu_model); + if (!cpu_type) { + exit(1); + } + cpu_create(cpu_type); +#else cpu =3D cpu_init(cpu_model); + cpu_type =3D object_class_get_name(object_get_class(OBJECT(cpu))); +#endif env =3D cpu->env_ptr; cpu_reset(cpu); =20 --=20 2.7.4