From patchwork Thu Feb 12 05:53:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 44586 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 603CE21527 for ; Thu, 12 Feb 2015 05:56:04 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id e53sf5483953eek.3 for ; Wed, 11 Feb 2015 21:56:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=O5rHkCu2QMHxwlFY/U0dRBfWiritGaKToMejf2HPIiw=; b=DAs/d/FqI9FqUJmX0HY9yTo76fBj3A94IRpfuRGrvgOoeYKjoE0oFzjxKJqGG3NPus Ty0YSenpk1kCdNCEbuEv2bUOUZM3ODMDIEKM7ULSOOx/FCd7H669BfmK4ztdOGxSchou tgsPWR83Bp6L2ColRp58wPAXJXQDP9dZ5FtTyrZfhgHBqW35Q5BpTpFs3X3SO+ZvI20T SsMh4l01GSa6mNgznvFZrv6diRB8LE29uGd6ZHSbiKZY7P8HXsVH9xu3BApz72vcYZ9r QL8khNTFo/KeDcJHOu9PKLJzdCUf24GhekwrilVfe4Q2vK2Bjq4ceURDkb79L4IMQuvO dw+A== X-Gm-Message-State: ALoCoQlEPY2NLwS68mmjJsJlvGhbjH7UOMDkr5bEeAd6bzwBVq591kEJLmCw3B4i/pv4TfCQ8sqB X-Received: by 10.180.12.146 with SMTP id y18mr188243wib.6.1423720563553; Wed, 11 Feb 2015 21:56:03 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.102 with SMTP id ud6ls137615lac.26.gmail; Wed, 11 Feb 2015 21:56:03 -0800 (PST) X-Received: by 10.112.155.168 with SMTP id vx8mr1765802lbb.110.1423720563394; Wed, 11 Feb 2015 21:56:03 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id o6si2179841lbw.88.2015.02.11.21.56.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Feb 2015 21:56:03 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by labhz20 with SMTP id hz20so7864428lab.0 for ; Wed, 11 Feb 2015 21:56:03 -0800 (PST) X-Received: by 10.112.181.41 with SMTP id dt9mr1865573lbc.56.1423720563123; Wed, 11 Feb 2015 21:56:03 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp238834lbj; Wed, 11 Feb 2015 21:56:02 -0800 (PST) X-Received: by 10.236.38.132 with SMTP id a4mr1809570yhb.183.1423720561603; Wed, 11 Feb 2015 21:56:01 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c2si421451qaa.67.2015.02.11.21.56.01 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 11 Feb 2015 21:56:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:48561 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLmkq-00032m-SM for patch@linaro.org; Thu, 12 Feb 2015 00:56:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLmip-00005d-Eu for qemu-devel@nongnu.org; Thu, 12 Feb 2015 00:53:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLmim-000140-7R for qemu-devel@nongnu.org; Thu, 12 Feb 2015 00:53:55 -0500 Received: from mail-ie0-f171.google.com ([209.85.223.171]:42961) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLmim-00013w-3K for qemu-devel@nongnu.org; Thu, 12 Feb 2015 00:53:52 -0500 Received: by iery20 with SMTP id y20so9595706ier.9 for ; Wed, 11 Feb 2015 21:53:51 -0800 (PST) X-Received: by 10.43.127.198 with SMTP id hb6mr6789237icc.86.1423720431588; Wed, 11 Feb 2015 21:53:51 -0800 (PST) Received: from localhost.localdomain ([113.28.134.59]) by mx.google.com with ESMTPSA id hi15sm638526igb.19.2015.02.11.21.53.48 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Feb 2015 21:53:50 -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 13:53:32 +0800 Message-Id: <1423720414-32041-3-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1423720414-32041-1-git-send-email-greg.bellows@linaro.org> References: <1423720414-32041-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.223.171 Cc: edgar.iglesias@gmail.com, Greg Bellows , a.spyridakis@virtualopensystems.com Subject: [Qemu-devel] [PATCH v6 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: greg.bellows@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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);