From patchwork Thu Feb 12 02:59:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 439002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6F1D414012A for ; Thu, 12 Feb 2015 14:02:03 +1100 (AEDT) Received: from localhost ([::1]:47960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLk2T-0000Kd-Fh for incoming@patchwork.ozlabs.org; Wed, 11 Feb 2015 22:02:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLk0H-0005DE-1J for qemu-devel@nongnu.org; Wed, 11 Feb 2015 21:59:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLk0D-0007g2-1o for qemu-devel@nongnu.org; Wed, 11 Feb 2015 21:59:44 -0500 Received: from mail-pd0-f180.google.com ([209.85.192.180]:35692) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLk0C-0007fr-Rs for qemu-devel@nongnu.org; Wed, 11 Feb 2015 21:59:40 -0500 Received: by pdbfl12 with SMTP id fl12so8752432pdb.2 for ; Wed, 11 Feb 2015 18:59:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=O5rHkCu2QMHxwlFY/U0dRBfWiritGaKToMejf2HPIiw=; b=M17plcCwD74b1smPc+x0a0nfLGL6u4SLHiSMdZxIDHE855tuziVH1mOHNVbgrQVquj Fx+AbQlB4m5EOEEjfGsvwIxqP2DvfWq6oQqOt6iwLrL94mL2W8VXRGHLpVveWAFmpM0x m1L5i47t+urld8/6APGic3OX96hjUIsPRO3uo0us84DuHtjf4L9vFoR1K3AU/vA8I3b7 hKJoDXajxXuQSkNEo4BcdtgBCvs+1yXrsujxt99Xoq4SVCqOlrswR84qTApT3pTSegjD rONH/slNaMr4LUqvvF7nl5i47ER437Yq3xtfnhEB8kJUaj5M/ET1UT/tnhBQpA4Z1cwh +TsQ== X-Gm-Message-State: ALoCoQkpYG2nhzRafwo9vtBc3jfEMlQWo6FImIW8C1No+egPsPXHbN5SW5bkLJ2+0ioFXaOtcfp1 X-Received: by 10.70.101.136 with SMTP id fg8mr2637805pdb.65.1423709980281; Wed, 11 Feb 2015 18:59:40 -0800 (PST) Received: from localhost.localdomain ([210.177.145.249]) by mx.google.com with ESMTPSA id fy8sm2140272pdb.42.2015.02.11.18.59.37 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Feb 2015 18:59:39 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, christoffer.dall@linaro.org, alex.bennee@linaro.org Date: Thu, 12 Feb 2015 10:59:06 +0800 Message-Id: <1423709948-7662-3-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1423709948-7662-1-git-send-email-greg.bellows@linaro.org> References: <1423709948-7662-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.180 Cc: edgar.iglesias@gmail.com, Greg Bellows , a.spyridakis@virtualopensystems.com Subject: [Qemu-devel] [PATCH v5 2/4] target-arm: Add feature parsing to virt 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 Added machvirt parsing of feature keywords added to the -cpu command line option. Parsing occurs during machine initialization. Signed-off-by: Greg Bellows Reviewed-by: Peter Maydell --- v3 -> v4 - Fix misspelling v1 -> v2 - Fix multiple property handling --- hw/arm/virt.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 34d9379..3c37a5e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -602,15 +602,19 @@ static void machvirt_init(MachineState *machine) MemoryRegion *ram = g_new(MemoryRegion, 1); const char *cpu_model = machine->cpu_model; VirtBoardInfo *vbi; + char **cpustr; if (!cpu_model) { cpu_model = "cortex-a15"; } - vbi = find_machine_info(cpu_model); + /* Separate the actual CPU model name from any appended features */ + cpustr = g_strsplit(cpu_model, ",", 2); + + vbi = find_machine_info(cpustr[0]); if (!vbi) { - error_report("mach-virt: CPU %s not supported", cpu_model); + error_report("mach-virt: CPU %s not supported", cpustr[0]); exit(1); } @@ -624,8 +628,10 @@ static void machvirt_init(MachineState *machine) create_fdt(vbi); for (n = 0; n < smp_cpus; n++) { - ObjectClass *oc = cpu_class_by_name(TYPE_ARM_CPU, cpu_model); + ObjectClass *oc = cpu_class_by_name(TYPE_ARM_CPU, cpustr[0]); + CPUClass *cc = CPU_CLASS(oc); Object *cpuobj; + Error *err = NULL; if (!oc) { fprintf(stderr, "Unable to find CPU definition\n"); @@ -633,6 +639,13 @@ static void machvirt_init(MachineState *machine) } cpuobj = object_new(object_class_get_name(oc)); + /* Handle any CPU options specified by the user */ + cc->parse_features(CPU(cpuobj), cpustr[1], &err); + if (err) { + error_report("%s", error_get_pretty(err)); + exit(1); + } + if (!vms->secure) { object_property_set_bool(cpuobj, false, "has_el3", NULL); } @@ -652,6 +665,7 @@ static void machvirt_init(MachineState *machine) object_property_set_bool(cpuobj, true, "realized", NULL); } + g_strfreev(cpustr); fdt_add_timer_nodes(vbi); fdt_add_cpu_nodes(vbi); fdt_add_psci_node(vbi);