From patchwork Fri Jul 11 07:21:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alvise Rigo X-Patchwork-Id: 369017 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 931D91400E6 for ; Fri, 11 Jul 2014 17:22:53 +1000 (EST) Received: from localhost ([::1]:42656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5VAR-0000wL-Hr for incoming@patchwork.ozlabs.org; Fri, 11 Jul 2014 03:22:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5V97-0007DG-1m for qemu-devel@nongnu.org; Fri, 11 Jul 2014 03:21:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5V90-00062u-AZ for qemu-devel@nongnu.org; Fri, 11 Jul 2014 03:21:28 -0400 Received: from mail-we0-f179.google.com ([74.125.82.179]:46698) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5V90-00062U-4n for qemu-devel@nongnu.org; Fri, 11 Jul 2014 03:21:22 -0400 Received: by mail-we0-f179.google.com with SMTP id p10so345940wes.10 for ; Fri, 11 Jul 2014 00:21:21 -0700 (PDT) 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=X1btNEszLr92xkrIQ8JAX5VgkoPvyV5CBeXoYFMaGIY=; b=aV/l2yESHcw+5fks0WxTFo3R4OGQaJKYBId6vEGunDxjTW6C/USrG2NKnzyRuIVTO5 UFb/H4/+dwK78BchDRmo9QD62ScsQ0KUMQFgBCNWaPh909ResKr/8wLF+pg9+jCN7Aqk Y84zehGFxYS8GERi+daMdKTv6UtZPuWwXns/15wAsCp48f8IGlpPrQF0NnIlr42yNA/L tTcOy7KL+tuNYV7c+YwMUeKh+fuX8XERJlpw52hQAjuYY4vxKG9cTBEIFL50CRKZnI99 Q1lArI1l7aCoVMrU41UU9mt4Fq/VhtkBHqXB4yBlcp0tOSrtVlvVK5qe3IkiZhuUMst3 qiVw== X-Gm-Message-State: ALoCoQkFk/FO7wURMdG0WISpcTp0MqQtbn5fFPXyVrABZ3lqFPQQ+bPeS5A0lzWmGX4ZmqcNVOxr X-Received: by 10.180.183.131 with SMTP id em3mr2728805wic.56.1405063280987; Fri, 11 Jul 2014 00:21:20 -0700 (PDT) Received: from localhost.localdomain (AGrenoble-651-1-561-138.w90-52.abo.wanadoo.fr. [90.52.105.138]) by mx.google.com with ESMTPSA id fc7sm3310882wjc.37.2014.07.11.00.21.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Jul 2014 00:21:19 -0700 (PDT) From: Alvise Rigo To: qemu-devel@nongnu.org, rob.herring@linaro.org Date: Fri, 11 Jul 2014 09:21:03 +0200 Message-Id: <1405063270-18902-2-git-send-email-a.rigo@virtualopensystems.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1405063270-18902-1-git-send-email-a.rigo@virtualopensystems.com> References: <1405063270-18902-1-git-send-email-a.rigo@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.179 Cc: Peter Maydell , tech@virtualopensystems.com, Alvise Rigo Subject: [Qemu-devel] [RFC PATCH 1/8] mach-virt: move GIC inside mach-virt structure 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 Signed-off-by: Alvise Rigo --- hw/arm/virt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7122e99..ed9fc7a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -83,6 +83,7 @@ typedef struct VirtBoardInfo { void *fdt; int fdt_size; uint32_t clock_phandle; + qemu_irq pic[NUM_IRQS]; } VirtBoardInfo; /* Addresses and sizes of our components. @@ -440,7 +441,6 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) static void machvirt_init(MachineState *machine) { - qemu_irq pic[NUM_IRQS]; MemoryRegion *sysmem = get_system_memory(); int n; MemoryRegion *ram = g_new(MemoryRegion, 1); @@ -452,6 +452,7 @@ static void machvirt_init(MachineState *machine) } vbi = find_machine_info(cpu_model); + qemu_irq *pic = vbi->pic; if (!vbi) { error_report("mach-virt: CPU %s not supported", cpu_model);