From patchwork Mon Feb 25 08:50:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 222881 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 D7B502C029B for ; Mon, 25 Feb 2013 20:44:41 +1100 (EST) Received: from localhost ([::1]:55551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9tmj-0001Hj-18 for incoming@patchwork.ozlabs.org; Mon, 25 Feb 2013 03:51:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9tmO-0000oe-Rl for qemu-devel@nongnu.org; Mon, 25 Feb 2013 03:51:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U9tmK-00031h-85 for qemu-devel@nongnu.org; Mon, 25 Feb 2013 03:51:24 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:60631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9tmK-00031K-1U for qemu-devel@nongnu.org; Mon, 25 Feb 2013 03:51:20 -0500 Received: by mail-pa0-f52.google.com with SMTP id fb1so1628598pad.25 for ; Mon, 25 Feb 2013 00:51:19 -0800 (PST) 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=cwlnqWGMmTPEmUe8sUUj1MGfClu5nRZqCc+Pf4vC/s0=; b=SjeEFiRI5aQz6HRk2NWNY02FuaTjE2nEkYdfpFZpuGTTeOSBK/WmOzyMXyi3z4/u0j IlUtrpvtm6mmbkdJoS7K6dWFewFHorpSAgkOu4o2N10FoSRg3Hk8dtT01cXgSQF8AgKg uhEWtlYx0xYniW3D1T9UvbLNtiGnebhzc9YdInRcVLAVqh2zRPwbD3twB02QcaUydDaR dCjEi5Qjd1zK98UQhsqRBwXTlBA554aeScckjO8tr9qCa3KKt/gnMduK2881dztpFkdA 9MwkUv8mE33970JVozy9KWt0FKClLv1C7mx+34+PRMJWjiNIVdKPiCXwy9mWsHytWToz uzRg== X-Received: by 10.66.85.161 with SMTP id i1mr18083112paz.67.1361782279209; Mon, 25 Feb 2013 00:51:19 -0800 (PST) Received: from localhost ([1.134.54.163]) by mx.google.com with ESMTPS id in5sm12057371pbc.20.2013.02.25.00.51.15 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 25 Feb 2013 00:51:18 -0800 (PST) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Mon, 25 Feb 2013 18:50:13 +1000 Message-Id: <0819cb4748f0cc8550f48ad65ddab13d4b72fe59.1361782087.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: ALoCoQmIib0odzhgyanAFBMerTMblYZE5o5iylZ5ubuYSO8KQCcTI3TDPWjiqHxrWuV8jVCR0KPF X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.52 Cc: edgar.iglesias@gmail.com, Peter Crosthwaite , afaerber@suse.de, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH v2 5/8] petalogix_ml605_mmu: Fix machine node attachment 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 Just attach devices straight to the root machine node, rather than the "unattached node" Signed-off-by: Peter Crosthwaite Reviewed-by: Andreas Färber --- Suggested (indirectly) by Andreas if he wants to put his Suggested-by to it. hw/petalogix_ml605_mmu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c index 82d7183..98e647d 100644 --- a/hw/petalogix_ml605_mmu.c +++ b/hw/petalogix_ml605_mmu.c @@ -134,8 +134,8 @@ petalogix_ml605_init(QEMUMachineInitArgs *args) dma = qdev_create(NULL, "xlnx.axi-dma"); /* FIXME: attach to the sysbus instead */ - object_property_add_child(container_get(qdev_get_machine(), "/unattached"), - "xilinx-dma", OBJECT(dma), NULL); + object_property_add_child(qdev_get_machine(), "xilinx-dma", OBJECT(dma), + NULL); xilinx_axiethernet_init(eth0, &nd_table[0], STREAM_SLAVE(dma), 0x82780000, irq[3], 0x1000, 0x1000);