From patchwork Wed Apr 3 05:17:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 233243 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 BE3402C0124 for ; Wed, 3 Apr 2013 16:23:31 +1100 (EST) Received: from localhost ([::1]:52320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNGAT-0006tb-Sh for incoming@patchwork.ozlabs.org; Wed, 03 Apr 2013 01:23:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNGA8-0006r4-AH for qemu-devel@nongnu.org; Wed, 03 Apr 2013 01:23:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNGA5-0003ce-Ps for qemu-devel@nongnu.org; Wed, 03 Apr 2013 01:23:08 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:45178) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNGA5-0003cZ-Ia for qemu-devel@nongnu.org; Wed, 03 Apr 2013 01:23:05 -0400 Received: by mail-pb0-f44.google.com with SMTP id wz12so647901pbc.17 for ; Tue, 02 Apr 2013 22:23:05 -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:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=ef7JOFMVvHwNpSHtBF9qxY4+8uwi6Fktm42jqaC0+xg=; b=jd9oLpFlgwY1R58jEtwFYilyzxclU2RGKvJxtOx6iIZCf3w5F618/7KKWYKWrWu1qd 4frYGfdR+VJUA/3y7K+UJbNK31s1SXMQNXvXzzwoCOgGl7d+UItneFxHx1UA8EsoVhGz gWOEC/ZIqaj0nQqwGywWoxK0Z5szHq7K7k5JETNTNjHn6NBT24emleonXwhGoPTgwq2F g6jRLzN1PKqjqeuGpXZvvKy5pjpgbeab9obUQgxKE3cIo3TLi9WGNdQKe59dWWCIgqE2 w++vKVzlS9zzb0G7u48/v2AL0plHwCMVVoaotTrZLZ5nFJVarcCtE6rHVrcin2d+op3S xJ4Q== X-Received: by 10.67.5.132 with SMTP id cm4mr1142392pad.80.1364966584780; Tue, 02 Apr 2013 22:23:04 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPS id qa6sm4442539pbc.46.2013.04.02.22.23.02 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 22:23:03 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com Date: Wed, 3 Apr 2013 15:17:09 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnfvHX+ks4DtHpTQrNzMzldOiDvl0WMxMuA7yNIzSfhnLTgAIzS1UTfWJYAQaRlcWShtn4r X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.44 Cc: Peter Crosthwaite Subject: [Qemu-devel] [PATCH v5 09/16] 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 Acked-by: Edgar E. Iglesias --- Suggested (indirectly) by Andreas if he wants to put his Suggested-by to it. hw/microblaze/petalogix_ml605_mmu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index cfc0220..ca918b9 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/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);