From patchwork Mon Jan 19 22:30:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 430719 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 CAE6D1402BD for ; Tue, 20 Jan 2015 09:31:36 +1100 (AEDT) Received: from localhost ([::1]:40068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDKr8-0004DY-MJ for incoming@patchwork.ozlabs.org; Mon, 19 Jan 2015 17:31:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDKqX-0003AQ-BT for qemu-devel@nongnu.org; Mon, 19 Jan 2015 17:30:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDKqS-0003Qu-7b for qemu-devel@nongnu.org; Mon, 19 Jan 2015 17:30:57 -0500 Received: from mail-pd0-f171.google.com ([209.85.192.171]:56327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDKqS-0003Qf-25 for qemu-devel@nongnu.org; Mon, 19 Jan 2015 17:30:52 -0500 Received: by mail-pd0-f171.google.com with SMTP id fp1so17532336pdb.2 for ; Mon, 19 Jan 2015 14:30:51 -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=EQfo0RwyKnc0CizZGCxe19bX6cvr+BI8PmB921bAqeI=; b=SjHu/tZwTgzMsXBpQO6454GKG3+ltl2aCIe0pSvF9ShDXWoykfb0q1aISS4U7Gazut zHNuIAi3Q28yN4Uf6O+gNVdv09AsUIDDxgZwIoTGaxaf9EWSU8nHhuu/GvlGqZSuwrdQ ZJe4F3AEOxZK/Wa77sgurTiMay8/0W96ix6U9AOeKCkUyl1sudviakEt0vvASw4z/pBq oSGRWxSj5X/0QDPF1eymF6Heq0u59SePegkeG227yWdUt8fhJGY7L83WNTqWgtPZApz2 IJseenZvH01J4YzNClKuaFSgFzOdt2nx5geWsQsURerAfZdwTU+CJTMuBBwXV1jeZg33 J+lw== X-Gm-Message-State: ALoCoQk8u3usGxkwSNWHUv8TaAj2hxx4hoX0LA0KYEOBReEpQ7afHgMfvTNyAl9DyBp8zs9TKaIG X-Received: by 10.68.217.97 with SMTP id ox1mr47944228pbc.53.1421706651307; Mon, 19 Jan 2015 14:30:51 -0800 (PST) Received: from gbellows-linaro.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com. [67.52.129.61]) by mx.google.com with ESMTPSA id rl10sm985994pbb.67.2015.01.19.14.30.49 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Jan 2015 14:30:50 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, christoffer.dall@linaro.org Date: Mon, 19 Jan 2015 16:30:18 -0600 Message-Id: <1421706621-23731-3-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1421706621-23731-1-git-send-email-greg.bellows@linaro.org> References: <1421706621-23731-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.171 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH 2/5] 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 --- hw/arm/virt.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 2353440..cd192ae 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -573,12 +573,19 @@ static void machvirt_init(MachineState *machine) MemoryRegion *ram = g_new(MemoryRegion, 1); const char *cpu_model = machine->cpu_model; VirtBoardInfo *vbi; + char *cpuname, *features; if (!cpu_model) { cpu_model = "cortex-a15"; } - vbi = find_machine_info(cpu_model); + /* Separate the actual CPU model name from any appended features */ + cpuname = g_strdup(cpu_model); + cpuname = strtok(cpuname, ","); + /* Keep track of the features for later parsing */ + features = strtok(NULL, ","); + + vbi = find_machine_info(cpuname); if (!vbi) { error_report("mach-virt: CPU %s not supported", cpu_model); @@ -595,8 +602,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, cpuname); + CPUClass *cc = CPU_CLASS(oc); Object *cpuobj; + Error *err = NULL; if (!oc) { fprintf(stderr, "Unable to find CPU definition\n"); @@ -604,6 +613,13 @@ static void machvirt_init(MachineState *machine) } cpuobj = object_new(object_class_get_name(oc)); + /* Handle any CPU options specfied by the user */ + cc->parse_features(CPU(cpuobj), features, &err); + if (err) { + error_report("%s", error_get_pretty(err)); + exit(1); + } + if (!vms->secure) { object_property_set_bool(cpuobj, false, "has_el3", NULL); } @@ -623,6 +639,7 @@ static void machvirt_init(MachineState *machine) object_property_set_bool(cpuobj, true, "realized", NULL); } + g_free(cpuname); fdt_add_timer_nodes(vbi); fdt_add_cpu_nodes(vbi); fdt_add_psci_node(vbi);