From patchwork Thu Sep 7 13:27:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 111920 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp97537qge; Thu, 7 Sep 2017 06:31:45 -0700 (PDT) X-Google-Smtp-Source: ADKCNb48IG2HtApd7P7eBw263D2d6fZjJxoWke/Wrlwh0Q/kwQ5f9CDR78liMbCf1kIVqGmm/VNt X-Received: by 10.237.33.102 with SMTP id 93mr4003659qtc.267.1504791105095; Thu, 07 Sep 2017 06:31:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504791105; cv=none; d=google.com; s=arc-20160816; b=lijFpCFwfD7x/qtYo0RbTzm9cCvAErGJhSm3PzHLAkF81F97ZdSGtwAg2fO1hGRDH9 R4oJZm9Ye0xrSDQ183+1pGv2abET1W3R/B1bL26SBoKDqo1hftLf3ySy0orOD8ufbt02 UsXE9d/3sfQzjhiRVTkmxeC44mJMphfslyPhoQc+xRLoiBL3mXethVm6wwM/aPK6ByfU ibEXMOGVPg5lGY39eyDDV34muSuUgnhUC0FGt+IE4L3vwih050oAqfaEGmGwSxaVCeZ9 gpOFaqu22ej2l7r0zu/DPfXA/wuPcZQ6v0hOCUy47sAwjEUizD4q4Vd2FhISPmQ6OxXL XImw== 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=ajbv6dEBjaFx9NA1kJvHqbTi1v117Rq6H8TZxUdTmhY=; b=DumEZEsZXLFpkTMNSIk/jMSfyMyzJfpGusPvToqXfJM/jSbcGYR6A/ws8Tw5IsLX/6 JyCeKv0PNSZPwMxOPbIjXrOOqDdZN4vU08UWw6GhBAVrW/CadkOTekG+AR4HZ87Ud1PA V6Nl2BoQNyGkbmE09XhyynNXsKLe8p2ilgQnwvATflc/rJqbEhesVrf7O85Bbk/fl88q noGUqlOlW9WBsimuKFJgxG7bQec/EMrgY2/C0QiXAVCFHf0yDwFqhntq7rlchndU/2mA V2cLG2qu38n/P0sXU0BwhN/BWCTtx/ZMyFjz1lt1Ar8wbKDsV8b0IDL99hz0xFk3rRrR YboA== 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 i123si2763363qkd.128.2017.09.07.06.31.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Sep 2017 06:31:45 -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]:40508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpwuF-0003WJ-01 for patch@linaro.org; Thu, 07 Sep 2017 09:31:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpwr7-00011u-2d for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpwqx-0007dK-3Q for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:29 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37188) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpwqw-0007a4-T0 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 1dpwql-0001XX-UI for qemu-devel@nongnu.org; Thu, 07 Sep 2017 14:28:07 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 7 Sep 2017 14:27:59 +0100 Message-Id: <1504790904-17018-7-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 06/31] xilinx_axidma: 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-7-famz@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/dma/xilinx_axidma.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) -- 2.7.4 diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 3987b5f..9b48103 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -562,18 +562,6 @@ static void xilinx_axidma_init(Object *obj) XilinxAXIDMA *s = XILINX_AXI_DMA(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj); - object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE, - (Object **)&s->tx_data_dev, - qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_UNREF_ON_RELEASE, - &error_abort); - object_property_add_link(obj, "axistream-control-connected", - TYPE_STREAM_SLAVE, - (Object **)&s->tx_control_dev, - qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_UNREF_ON_RELEASE, - &error_abort); - object_initialize(&s->rx_data_dev, sizeof(s->rx_data_dev), TYPE_XILINX_AXI_DMA_DATA_STREAM); object_initialize(&s->rx_control_dev, sizeof(s->rx_control_dev), @@ -593,6 +581,10 @@ static void xilinx_axidma_init(Object *obj) static Property axidma_properties[] = { DEFINE_PROP_UINT32("freqhz", XilinxAXIDMA, freqhz, 50000000), + DEFINE_PROP_LINK("axistream-connected", XilinxAXIDMA, + tx_data_dev, TYPE_STREAM_SLAVE, StreamSlave *), + DEFINE_PROP_LINK("axistream-control-connected", XilinxAXIDMA, + tx_control_dev, TYPE_STREAM_SLAVE, StreamSlave *), DEFINE_PROP_END_OF_LIST(), };