From patchwork Fri May 24 05:49:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 246078 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 492552C0082 for ; Fri, 24 May 2013 15:53:59 +1000 (EST) Received: from localhost ([::1]:36112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ufkwv-000495-I6 for incoming@patchwork.ozlabs.org; Fri, 24 May 2013 01:53:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfkwU-00042z-2x for qemu-devel@nongnu.org; Fri, 24 May 2013 01:53:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UfkwO-00040h-DB for qemu-devel@nongnu.org; Fri, 24 May 2013 01:53:30 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:47912) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfkwO-00040X-6k for qemu-devel@nongnu.org; Fri, 24 May 2013 01:53:24 -0400 Received: by mail-pd0-f175.google.com with SMTP id 6so3409575pdd.20 for ; Thu, 23 May 2013 22:53:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=CjjcRBkkew1Qd8v6t0HTCEzR6uANbN30i8vjW62DAeU=; b=NdXrAnVICiVIWhk82PiA8LglijWE/mWFtGzwkWKVq6squzzqekrdt6xm/Ld9g9jEa+ lQ8kvdjJbkhaRF1r9AJpcTiYIus+onBlvRXGAGezs9FoffkphJ2XaaUviHkrUdSK9xTL hjIzpJVzbazJuN/xi4x7XOicrrEuqOnTevQb02j1vjAeJjAon5WMLlYGN81n108s5vzX A8fs7AISrHM40qoIFcGkZv+DLBEp9aY0Eim9beB8GDRu4OqKrD1u4UhOkHc1DZm2yTA9 XwdDAnVUykQibTYi+yXoA/5l/eC9msQt60ZW3eEKSKZydZBURG6rsa2Y6i6RTw7AjsOc APlQ== X-Received: by 10.68.175.68 with SMTP id by4mr16382498pbc.53.1369374803375; Thu, 23 May 2013 22:53:23 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id fm2sm15984819pab.13.2013.05.23.22.53.20 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Thu, 23 May 2013 22:53:22 -0700 (PDT) From: peter.crosthwaite@xilinx.com To: qemu-devel@nongnu.org Date: Fri, 24 May 2013 15:49:45 +1000 Message-Id: <01aacdb82b061b436a9898619fd233ebc1bc97c6.1369374096.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.8.3.rc1.44.gb387c77.dirty In-Reply-To: References: X-Gm-Message-State: ALoCoQnBleSdyMAhAfSraX97Q8b7QxzvNG/uSybWlS+90w3X1qEbbzMpq+JRjCXZzd88io0v1ecX X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.175 Cc: blauwirbel@gmail.com, peter.maydell@linaro.org, edgar.iglesias@gmail.com, kraxel@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v3 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 file changed, 8 insertions(+) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 41505c3..16fea43 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -219,6 +219,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;