From patchwork Thu Sep 7 13:27:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 111941 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp117738qge; Thu, 7 Sep 2017 06:47:41 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBK5DyV5WGLU0ublml03qByv5C0+CcncuSBWZZ1CzSySCbi+2i7b8vWs40wQLlVT8HsVO4I X-Received: by 10.55.18.96 with SMTP id c93mr3821182qkh.297.1504792061586; Thu, 07 Sep 2017 06:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504792061; cv=none; d=google.com; s=arc-20160816; b=HuzAYM8QbkMD2mU2/76wtCFFMQiFUM20dH+6NJrNl9f2pyjt9tx70HGRkLLXs6SCUM 5pF8wvo1hqMJx5wWjrynt8efVFHKhLCrhGa2srCzH01xrXGDN4dQNtlsc6iCEFfdR+GL yuz6//yRr5ZQIGicFa5iCTLUKw56MWuRe0MxcrP7ysUYceJ9NcQlj3vEF+T3X9EhDzW+ tIbbrM/WcSPKoq2f0w1Qigb/QQJ97ejEDqDQLsmuYjy1zcISpVsTcJcTwwjSKJ26GnCK 1R7MWper2yRn/CsbRCd9ElnEjuOxqtoHHzPYqYQ/jE9O+hsJj71/zwxzU70CinJawv+/ 12vw== 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=1+KuiclUgT7F3uKzW/KNxssuWPCVVGblwKRKrpp9y1M=; b=onPPowa8JMdtGIgOYk9wB/47EMEecX1fmbstd82MutjUSo7mKPvImC22/1xDlqmTdj jVzSRdT25DjQH2wewewOqwoMDY84Hsr6zLNB9pkr/n8Kg9zFYI6/yqirgekcmfoBl2nP fOXXJz+pqPptE5JrzioR7t+doL9eoXx5aTmJ0zS6u0ei7MIlmAe2FTVTho1QBOiTf+E7 lue9NUyQh1LVQYa0vLi0GOb3o10j7Y2kdj2DVOP0K+Jxh1RLWTn5YOFr2dCxYWGnGnp6 h76fLzEER9XLCkY7EbcC4N2LWdafXo7G8x8zlpjV9J3VMKVR2kbTe+t3fTN89YWciH5S yxRA== 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 w64si2838983qte.548.2017.09.07.06.47.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Sep 2017 06:47:41 -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]:40567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpx9f-0000z3-HE for patch@linaro.org; Thu, 07 Sep 2017 09:47:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpwr9-000141-Ck for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpwqy-0007eZ-Kc for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:31 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37190) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpwqy-0007ak-DM for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:20 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1dpwqj-0001VJ-5u for qemu-devel@nongnu.org; Thu, 07 Sep 2017 14:28:05 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 7 Sep 2017 14:27:55 +0100 Message-Id: <1504790904-17018-3-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 02/31] armv7m: Convert armv7m.memory 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-3-famz@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/armv7m.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 4c560dd..b64a409 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -132,12 +132,6 @@ static void armv7m_instance_init(Object *obj) /* Can't init the cpu here, we don't yet know which model to use */ - object_property_add_link(obj, "memory", - TYPE_MEMORY_REGION, - (Object **)&s->board_memory, - qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_UNREF_ON_RELEASE, - &error_abort); memory_region_init(&s->container, obj, "armv7m-container", UINT64_MAX); object_initialize(&s->nvic, sizeof(s->nvic), TYPE_NVIC); @@ -248,6 +242,8 @@ static void armv7m_realize(DeviceState *dev, Error **errp) static Property armv7m_properties[] = { DEFINE_PROP_STRING("cpu-model", ARMv7MState, cpu_model), + DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION, + MemoryRegion *), DEFINE_PROP_END_OF_LIST(), };