From nobody Sat Oct 25 21:42:26 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 1516297072847158.40682198189006; Thu, 18 Jan 2018 09:37:52 -0800 (PST) Received: from localhost ([::1]:43774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecE8O-0005fI-1W for importer@patchew.org; Thu, 18 Jan 2018 12:37:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecE6T-0004LI-4I for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:35:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecE6S-0007uR-4p for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:35:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59098) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ecE6O-0007qb-Ch; Thu, 18 Jan 2018 12:35:48 -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 700DF3C37; Thu, 18 Jan 2018 17:35:47 +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 069F578E7D; Thu, 18 Jan 2018 17:35:45 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 18:33:58 +0100 Message-Id: <1516296842-136976-2-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.30]); Thu, 18 Jan 2018 17:35:47 +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 1/5] tests: add machine 'none' with -cpu test 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" Check that "$QEMU -M none -cpu FOO" starts QEMU without error Signed-off-by: Igor Mammedov --- tests/Makefile.include | 2 ++ tests/machine-none.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 73 insertions(+) create mode 100644 tests/machine-none.c diff --git a/tests/Makefile.include b/tests/Makefile.include index 8883274..6661149 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -380,6 +380,7 @@ check-qtest-s390x-y +=3D tests/virtio-balloon-test$(EXE= SUF) check-qtest-s390x-y +=3D tests/virtio-console-test$(EXESUF) check-qtest-s390x-y +=3D tests/virtio-serial-test$(EXESUF) =20 +check-qtest-generic-y +=3D tests/machine-none$(EXESUF) check-qtest-generic-y +=3D tests/qom-test$(EXESUF) check-qtest-generic-y +=3D tests/test-hmp$(EXESUF) =20 @@ -782,6 +783,7 @@ tests/display-vga-test$(EXESUF): tests/display-vga-test= .o tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o tests/qom-test$(EXESUF): tests/qom-test.o tests/test-hmp$(EXESUF): tests/test-hmp.o +tests/machine-none$(EXESUF): tests/machine-none.o tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-virtio-obj-= y) tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-ob= j-y) tests/nvme-test$(EXESUF): tests/nvme-test.o diff --git a/tests/machine-none.c b/tests/machine-none.c new file mode 100644 index 0000000..d16c283 --- /dev/null +++ b/tests/machine-none.c @@ -0,0 +1,71 @@ +/* + * Machine 'none' tests. + * + * Copyright (c) 2018 Red Hat Inc. + * + * Authors: + * Igor Mammedov , + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" + +#include "qemu-common.h" +#include "qemu/cutils.h" +#include "libqtest.h" +#include "qapi/qmp/types.h" + +struct arch2cpu { + const char *arch; + const char *cpu_model; +}; + +static struct arch2cpu cpus_map[] =3D { + /* tested targets list */ +}; + +static const char *get_cpu_model_by_arch(const char *arch) +{ + int i; + + for (i =3D 0; i < ARRAY_SIZE(cpus_map); i++) { + if (!strcmp(arch, cpus_map[i].arch)) { + return cpus_map[i].cpu_model; + } + } + return NULL; +} + +static void test_machine_cpu_cli(void) +{ + char *args; + QDict *response; + const char *arch =3D qtest_get_arch(); + const char *cpu_model =3D get_cpu_model_by_arch(arch); + + if (!cpu_model) { + fprintf(stderr, "WARNING: cpu name for target '%s' isn't defined," + " add it to cpus_map\n", arch); + return; /* TODO: die here to force all targets have a test */ + } + args =3D g_strdup_printf("-machine none -cpu %s", cpu_model); + qtest_start(args); + + response =3D qmp("{ 'execute': 'quit' }"); + g_assert(qdict_haskey(response, "return")); + QDECREF(response); + + qtest_end(); + g_free(args); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + + qtest_add_func("machine/none/cpu_option", test_machine_cpu_cli); + + return g_test_run(); +} --=20 2.7.4 From nobody Sat Oct 25 21:42:26 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 1516297072168864.7508276171804; Thu, 18 Jan 2018 09:37:52 -0800 (PST) Received: from localhost ([::1]:43773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecE8N-0005en-Bl for importer@patchew.org; Thu, 18 Jan 2018 12:37:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecE6U-0004NJ-Qe for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:35:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecE6T-0007vX-Rv for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:35:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45168) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ecE6R-0007sz-Fw; Thu, 18 Jan 2018 12:35:51 -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 9424B83F44; Thu, 18 Jan 2018 17:35:50 +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 B3942414C; Thu, 18 Jan 2018 17:35:47 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 18:33:59 +0100 Message-Id: <1516296842-136976-3-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.27]); Thu, 18 Jan 2018 17:35:50 +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 2/5] machine: prepare machine 'none' to gradually switch 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 null-machine.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, MachineState::cpu_model and cpu_init() API will be removed Signed-off-by: Igor Mammedov --- hw/core/null-machine.c | 13 ++++++++++++- vl.c | 8 +++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 864832d..3cc6a49 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -23,10 +23,18 @@ static void machine_none_init(MachineState *mch) { CPUState *cpu =3D NULL; +#ifdef CPU_RESOLVING_TYPE + MachineClass *mc =3D MACHINE_GET_CLASS(mch); =20 - /* Initialize CPU (if a model has been specified) */ + /* Initialize CPU if cpu_type pointer is user provided + * (i.e. !=3D to pointer tot static default cpu type string) + */ + if (mch->cpu_type !=3D mc->default_cpu_type) { + cpu =3D cpu_create(mch->cpu_type); +#else if (mch->cpu_model) { cpu =3D cpu_init(mch->cpu_model); +#endif if (!cpu) { error_report("Unable to initialize CPU"); exit(1); @@ -54,6 +62,9 @@ static void machine_none_machine_init(MachineClass *mc) mc->init =3D machine_none_init; mc->max_cpus =3D 1; mc->default_ram_size =3D 0; +#ifdef CPU_RESOLVING_TYPE + mc->default_cpu_type =3D CPU_RESOLVING_TYPE; +#endif } =20 DEFINE_MACHINE("none", machine_none_machine_init) diff --git a/vl.c b/vl.c index 2586f25..8aa0131 100644 --- a/vl.c +++ b/vl.c @@ -4609,7 +4609,6 @@ int main(int argc, char **argv, char **envp) current_machine->maxram_size =3D maxram_size; current_machine->ram_slots =3D ram_slots; current_machine->boot_order =3D boot_order; - current_machine->cpu_model =3D cpu_model; =20 parse_numa_opts(current_machine); =20 @@ -4619,6 +4618,13 @@ int main(int argc, char **argv, char **envp) if (cpu_model) { current_machine->cpu_type =3D cpu_parse_cpu_model(machine_class->default_cpu_type, cpu_m= odel); + + /* machine 'none' depends on default cpu type pointer not being + * equal to resolved type name pointer to fugure out if type w= as + * user provided, make sure that if it becomes not true in fut= ure + * it won't beark silently */ + g_assert( + current_machine->cpu_type !=3D machine_class->default_cpu_= type); } } =20 --=20 2.7.4 From nobody Sat Oct 25 21:42:26 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 From nobody Sat Oct 25 21:42:26 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 1516297310793541.2453420834674; Thu, 18 Jan 2018 09:41:50 -0800 (PST) Received: from localhost ([::1]:43982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecECA-0000Yn-WF for importer@patchew.org; Thu, 18 Jan 2018 12:41:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecE6a-0004TZ-BV for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:36:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecE6Z-00081M-Ic for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:36:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6504) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ecE6V-0007ws-JE; Thu, 18 Jan 2018 12:35:55 -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 A0E215117D; Thu, 18 Jan 2018 17:35:54 +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 35A2178E7D; Thu, 18 Jan 2018 17:35:53 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 18:34:01 +0100 Message-Id: <1516296842-136976-5-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.39]); Thu, 18 Jan 2018 17:35:54 +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 4/5] arm: cpu: add CPU_RESOLVING_TYPE macro 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" it will be used for providing to cpu name resolving class for cpu_parse_cpu_model(CPU_RESOLVING_TYPE, ...) in null-machine.c and in linux-user/main.c Signed-off-by: Igor Mammedov --- target/arm/cpu.h | 3 +++ linux-user/main.c | 2 -- tests/machine-none.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 9631670..e2c7f08 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2172,6 +2172,9 @@ static inline bool arm_excp_unmasked(CPUState *cs, un= signed int excp_idx, #define ARM_CPU_TYPE_SUFFIX "-" TYPE_ARM_CPU #define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX) =20 +/* used to get target's callback in cpu_parse_cpu_model() */ +#define CPU_RESOLVING_TYPE TYPE_ARM_CPU + #define cpu_signal_handler cpu_arm_signal_handler #define cpu_list arm_cpu_list =20 diff --git a/linux-user/main.c b/linux-user/main.c index d481e8c..bcf2e55 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4326,8 +4326,6 @@ int main(int argc, char **argv, char **envp) #else cpu_model =3D "qemu32"; #endif -#elif defined(TARGET_ARM) - cpu_model =3D "any"; #elif defined(TARGET_UNICORE32) cpu_model =3D "any"; #elif defined(TARGET_M68K) diff --git a/tests/machine-none.c b/tests/machine-none.c index d16c283..7f64532 100644 --- a/tests/machine-none.c +++ b/tests/machine-none.c @@ -24,6 +24,8 @@ struct arch2cpu { =20 static struct arch2cpu cpus_map[] =3D { /* tested targets list */ + { "arm", "cortex-a15" }, + { "aarch64", "cortex-a15" }, }; =20 static const char *get_cpu_model_by_arch(const char *arch) --=20 2.7.4 From nobody Sat Oct 25 21:42:26 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 1516297399487413.75309769664443; Thu, 18 Jan 2018 09:43:19 -0800 (PST) Received: from localhost ([::1]:44040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEDe-0001Uq-Oq for importer@patchew.org; Thu, 18 Jan 2018 12:43:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecE6b-0004Un-Dg for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:36:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecE6a-000826-Hk for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:36:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50320) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ecE6X-0007yX-81; Thu, 18 Jan 2018 12:35:57 -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 65056C0587C9; Thu, 18 Jan 2018 17:35:56 +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 E347278E7D; Thu, 18 Jan 2018 17:35:54 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 18:34:02 +0100 Message-Id: <1516296842-136976-6-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.32]); Thu, 18 Jan 2018 17:35:56 +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 5/5] x86: cpu: add CPU_RESOLVING_TYPE macro 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" it will be used for providing to cpu name resolving class for cpu_parse_cpu_model(CPU_RESOLVING_TYPE, ...) in null-machine.c and in linux-user/main.c Signed-off-by: Igor Mammedov --- target/i386/cpu.h | 3 +++ tests/machine-none.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index f64e5ed..a1712fc 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1568,6 +1568,9 @@ uint64_t cpu_get_tsc(CPUX86State *env); #define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu32") #endif =20 +/* used to get target's callback in cpu_parse_cpu_model() */ +#define CPU_RESOLVING_TYPE TYPE_X86_CPU + #define cpu_signal_handler cpu_x86_signal_handler #define cpu_list x86_cpu_list =20 diff --git a/tests/machine-none.c b/tests/machine-none.c index 7f64532..8a306ba 100644 --- a/tests/machine-none.c +++ b/tests/machine-none.c @@ -26,6 +26,8 @@ static struct arch2cpu cpus_map[] =3D { /* tested targets list */ { "arm", "cortex-a15" }, { "aarch64", "cortex-a15" }, + { "x86_64", "qemu64,apic-id=3D0" }, + { "i386", "qemu32,apic-id=3D0" }, }; =20 static const char *get_cpu_model_by_arch(const char *arch) --=20 2.7.4