From patchwork Thu Apr 5 15:48:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mitsyanko Igor X-Patchwork-Id: 151051 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 37CEAB707A for ; Fri, 6 Apr 2012 11:45:13 +1000 (EST) Received: from localhost ([::1]:48888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFoy1-0004eI-Ux for incoming@patchwork.ozlabs.org; Thu, 05 Apr 2012 11:51:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFovm-0001mV-FY for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:49:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFovc-0006jr-Vp for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:48:59 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:40630) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFovc-0006jH-Oh for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:48:52 -0400 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from euspt2 ([210.118.77.13]) by mailout3.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0M20008BMJWZBP80@mailout3.w1.samsung.com> for qemu-devel@nongnu.org; Thu, 05 Apr 2012 16:48:35 +0100 (BST) Received: from dodo.rnd.samsung.ru ([106.109.8.162]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M2000IDGJWVHW@spt2.w1.samsung.com> for qemu-devel@nongnu.org; Thu, 05 Apr 2012 16:48:49 +0100 (BST) Date: Thu, 05 Apr 2012 19:48:32 +0400 From: Igor Mitsyanko In-reply-to: <1333640913-16028-1-git-send-email-i.mitsyanko@samsung.com> To: qemu-devel@nongnu.org Message-id: <1333640913-16028-10-git-send-email-i.mitsyanko@samsung.com> X-Mailer: git-send-email 1.7.4.1 References: <1333640913-16028-1-git-send-email-i.mitsyanko@samsung.com> X-detected-operating-system: by eggs.gnu.org: Solaris 9.1 X-Received-From: 210.118.77.13 Cc: peter.maydell@linaro.org, Igor Mitsyanko , quintela@redhat.com, kyungmin.park@samsung.com, michael@walle.cc, paul@codesourcery.com, afaerber@suse.de, d.solodkiy@samsung.com Subject: [Qemu-devel] [PATCH V2 09/10] SD card: make SD card a child of host controller 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 Only for host controllers implemented as QOM object. Signed-off-by: Igor Mitsyanko --- hw/milkymist-memcard.c | 1 + hw/pl181.c | 1 + hw/ssi-sd.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/milkymist-memcard.c b/hw/milkymist-memcard.c index 80cac20..c8a6bae 100644 --- a/hw/milkymist-memcard.c +++ b/hw/milkymist-memcard.c @@ -259,6 +259,7 @@ static int milkymist_memcard_init(SysBusDevice *dev) object_property_set_int(OBJECT(s->card), dinfo->unit, "if-idx", &errp); } object_property_set_bool(OBJECT(s->card), false, "spi-mode", &errp); + object_property_add_child(OBJECT(s), "card", OBJECT(s->card), &errp); assert_no_error(errp); SD_INIT(s->card); s->enabled = dinfo ? bdrv_is_inserted(dinfo->bdrv) : 0; diff --git a/hw/pl181.c b/hw/pl181.c index 48720ae..5f81531 100644 --- a/hw/pl181.c +++ b/hw/pl181.c @@ -490,6 +490,7 @@ static int pl181_init(SysBusDevice *dev) object_property_set_int(OBJECT(s->card), dinfo->unit, "if-idx", &errp); } object_property_set_bool(OBJECT(s->card), false, "spi-mode", &errp); + object_property_add_child(OBJECT(s), "card", OBJECT(s->card), &errp); assert_no_error(errp); SD_INIT(s->card); return 0; diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c index 9f4510d..f30a553 100644 --- a/hw/ssi-sd.c +++ b/hw/ssi-sd.c @@ -245,6 +245,7 @@ static int ssi_sd_init(SSISlave *dev) object_property_set_int(OBJECT(s->sd), dinfo->unit, "if-idx", &errp); } object_property_set_bool(OBJECT(s->sd), true, "spi-mode", &errp); + object_property_add_child(OBJECT(s), "card", OBJECT(s->sd), &errp); assert_no_error(errp); SD_INIT(s->sd); register_savevm(&dev->qdev, "ssi_sd", -1, 1, ssi_sd_save, ssi_sd_load, s);