From patchwork Thu Sep 7 13:27:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 111933 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp108646qge; Thu, 7 Sep 2017 06:40:05 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAlHrhqVrs4NheNv2mHeC5V/bhea3xGUKvk7/aEfH5yvBaTqRu+e9Y/dt5uWr1FK5AGtENZ X-Received: by 10.55.3.133 with SMTP id 127mr4012315qkd.42.1504791605264; Thu, 07 Sep 2017 06:40:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504791605; cv=none; d=google.com; s=arc-20160816; b=edACEToQ4lTRHSc/2TehylbtXiSns+FZoNNFgflbGQEc4f9zQT28QX2p8VvgMkF8SZ ecr2mDu9GNuZSvbeSsvsKWcEqlPCUPecdYpaicUqz5YZpkKW4dh8Duy/7sdSG+m2Ba3+ fvdi0MIPTtIClQWKlu8C0HxZKNVssJbR12aBc+ZwsucIvjUK58zRRRP9vIkvKrC3zAsJ C98bUQkKsUBDMUSBRGme5Fx6u+OsppJAK9zE3met0FjNapFexAQP9IX3Quyt1ITtxYF7 Xe7njz1PAraY1RTlBGNFaUU96dKblaHw+M7m1Mv8pHWVY8HcXQXXYQG5KaF3lTIH5b6e Gvww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=Vh5mmvipkAUx4adfWZRPD2wMp0nmMWTrnIYxMfi62uo=; b=kdb3mADrqeTDzE4QWWoEp8xzEDBwwgoCN595hk5NYFAhSfed6DAcr3e4cWo8463JXS maclkADlel6OuKjgnx5Y6B59gdMUmo2kcrBPoGq0XNU6Qeh7tu01XNTuq8JYhld8FqTF B5MhnpROi4S6fURQx6UjP6jeaMpYaLWWbAnHRYGzcZg9nRl7szERgxHnaKX7jWoJrDf0 7TmS/guIs7/Ig0ivdDo4gXnE4lgPtwT5+2+SD/dS8ZT/rGO04lhCv0hM2E+XAAbI77ib j/7rxE0TvdEhEoyNGMBdGyplLdXU/pkeDi/7UohuQFz3qT8sa8TTnci1x9WZVNJZL2vf yq3A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h64si2677736qkf.505.2017.09.07.06.40.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Sep 2017 06:40:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpx2J-0002IM-6h for patch@linaro.org; Thu, 07 Sep 2017 09:40:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpwr2-0000zy-My for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpwqx-0007ds-Te for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:24 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37192) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpwqx-0007bf-NK for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:19 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1dpwqk-0001Vn-K6 for qemu-devel@nongnu.org; Thu, 07 Sep 2017 14:28:06 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 7 Sep 2017 14:27:57 +0100 Message-Id: <1504790904-17018-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504790904-17018-1-git-send-email-peter.maydell@linaro.org> References: <1504790904-17018-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 04/31] xlnx_zynqmp: Convert to DEFINE_PROP_LINK X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Fam Zheng Signed-off-by: Fam Zheng Reviewed-by: Philippe Mathieu-Daudé Message-id: 20170905131149.10669-5-famz@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/xlnx-zynqmp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 9eceadb..22c2a33 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -140,11 +140,6 @@ static void xlnx_zynqmp_init(Object *obj) &error_abort); } - object_property_add_link(obj, "ddr-ram", TYPE_MEMORY_REGION, - (Object **)&s->ddr_ram, - qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); - object_initialize(&s->gic, sizeof(s->gic), gic_class_name()); qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default()); @@ -433,6 +428,8 @@ static Property xlnx_zynqmp_props[] = { DEFINE_PROP_STRING("boot-cpu", XlnxZynqMPState, boot_cpu), DEFINE_PROP_BOOL("secure", XlnxZynqMPState, secure, false), DEFINE_PROP_BOOL("has_rpu", XlnxZynqMPState, has_rpu, false), + DEFINE_PROP_LINK("ddr-ram", XlnxZynqMPState, ddr_ram, TYPE_MEMORY_REGION, + MemoryRegion *), DEFINE_PROP_END_OF_LIST() };