From patchwork Fri Apr 5 08:43:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 234067 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CADD42C00AD for ; Fri, 5 Apr 2013 19:47:32 +1100 (EST) Received: from localhost ([::1]:50244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2J1-00059S-2t for incoming@patchwork.ozlabs.org; Fri, 05 Apr 2013 04:47:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2Ig-000595-EX for qemu-devel@nongnu.org; Fri, 05 Apr 2013 04:47:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO2Ib-0006dg-Qp for qemu-devel@nongnu.org; Fri, 05 Apr 2013 04:47:10 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:34043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2Ib-0006dW-Kb for qemu-devel@nongnu.org; Fri, 05 Apr 2013 04:47:05 -0400 Received: by mail-pd0-f171.google.com with SMTP id z10so1915685pdj.30 for ; Fri, 05 Apr 2013 01:47:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references:x-gm-message-state; bh=DcykZhpiYjqkyhRrpntqyGc7pTQd8Lhj0OtONzybvLo=; b=a/n5KCdG/atqrEbJMy/yHtL/8Z+AzOnHXgIJnL1nax8j0kYDbY4QWRjXuOjKN+Cfpu qLGPGkGZ1KKPYiw8+dt3UHYXyINTRgp2GQij8y49j4burzzTctoS48UaKbLb2tWKXKJJ RHTmSdL9S+ir3CT+lmdqLXurlw+LmGQQXfDANP2jES+ZE4XYHsWslQfTSUpY0co/tXAU 5AZXgSerjdawEgdSrRgn9oiSKHQu/co9KL+RYGCcjkH06O3PJWBRTlCn7i9/TzGPKxxy aqZaDdga7RJ9eKDSPsXu68SHEbIhEg08tqE1hl47BnC3DoT7qNL4EMKN0zEr52nNFp2R GIiw== X-Received: by 10.68.44.233 with SMTP id h9mr13538942pbm.24.1365151624423; Fri, 05 Apr 2013 01:47:04 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPS id oq3sm15129115pac.16.2013.04.05.01.47.02 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 05 Apr 2013 01:47:03 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Fri, 5 Apr 2013 18:43:44 +1000 Message-Id: <37891325cb818306e68c6a2d3117552caa13a5ae.1365151096.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkiTe35+cnWnnQg06/2KeajfXEI3NE6byOto8kBRjJk95YGRAzNKvx0/gF6pgyXA88+9OOa X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.192.171 Cc: peter.maydell@linaro.org, "Peter A. G. Crosthwaite" , mst@redhat.com, blauwirbel@gmail.com, kraxel@redhat.com, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH v2 5/5] xilinx_zynq: added devcfg to machine model 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 From: Peter A. G. Crosthwaite Signed-off-by: Peter A. G. Crosthwaite --- Changed since v1: Added manual parenting of devcfg node (evil but needed for early access to canonical path by devcfgs realize fn). hw/arm/xilinx_zynq.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 6f36286..fb3a089 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -220,6 +220,14 @@ static void zynq_init(QEMUMachineInitArgs *args) sysbus_connect_irq(busdev, n + 1, pic[dma_irqs[n] - IRQ_OFFSET]); } + dev = qdev_create(NULL, "xlnx.ps7-dev-cfg"); + object_property_add_child(qdev_get_machine(), "xilinx-devcfg", OBJECT(dev), + NULL); + qdev_init_nofail(dev); + busdev = SYS_BUS_DEVICE(dev); + sysbus_connect_irq(busdev, 0, pic[40-IRQ_OFFSET]); + sysbus_mmio_map(busdev, 0, 0xF8007000); + zynq_binfo.ram_size = ram_size; zynq_binfo.kernel_filename = kernel_filename; zynq_binfo.kernel_cmdline = kernel_cmdline;