From patchwork Mon Dec 11 21:29:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10105785 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 04CC4602D8 for ; Mon, 11 Dec 2017 21:33:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 004EC2990E for ; Mon, 11 Dec 2017 21:33:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E920229912; Mon, 11 Dec 2017 21:33:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 815CF2990E for ; Mon, 11 Dec 2017 21:33:06 +0000 (UTC) Received: from localhost ([::1]:55541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOVh9-00037s-6w for patchwork-qemu-devel@patchwork.kernel.org; Mon, 11 Dec 2017 16:33:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOVf7-0000it-2m for qemu-devel@nongnu.org; Mon, 11 Dec 2017 16:30:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOVf6-00048s-0R for qemu-devel@nongnu.org; Mon, 11 Dec 2017 16:30:57 -0500 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:46971) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eOVf0-0003tU-D8; Mon, 11 Dec 2017 16:30:50 -0500 Received: by mail-pf0-x241.google.com with SMTP id c204so12521900pfc.13; Mon, 11 Dec 2017 13:30:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xduqlof8RSbyi8r9qMPGqSAd4q4+/VM3I7uumoz45oU=; b=cpPMAJab7BPehdAYfFkhca72CDGLiPBPwi//I23/vgCkf1BVn42Zp+I3d1ltHdFp3X k6CQ+6BaIgj3gtN+kSUWel9yXo4WK3JLn4DZe53KLsKSndQTFL8br8B/cWjbrUmrbv8w IX0zLf47Faxc4EE8rOtZ50VDy8dZF+Va9Lamn5r8v082TK4fRDdnu+7Z/fVOjmmBGxSK HBudFEkenmPKKm68duEsSZwrUTwjRhBhiXvnG/SYxZbDuXwXTX2PRH1KFRFED7Ojb9bM qnKjkLwbmevbIuKg8mOnUNySVu6kSGsnU6lykf/EZ4HvqgStBKNO9eUqeByOLFbimVz3 EJ8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xduqlof8RSbyi8r9qMPGqSAd4q4+/VM3I7uumoz45oU=; b=nY02eEZE2KZlH/FC7D9EtJz+PooscHDmMcWS4kThgiELNwJe3v5y5e6h43JvqaYtZE BshIEXtokoiwF3iUZcDsvad3OjkAhuOGrNgN6Bh5kUnv7IDZ9V3FANGSpOseOXhuDgFX 7SivUoNaNZcfteILzpiaYqINu9lHRvyHJWgMk4+Dnvu6P470B7YbJgG83uqVYeNmYcnq ovB2inL5ZB3srmIErBJdh4NIRisOKtF5H8auA4OS0646DPWEEVQltQJ3DKro44svhqDO ByWzkf1L/Z3toSim+RTt6Y7NruJxSYp+tXTwN/DoIPqba8Tfo1WtNb+0Wu0wlj38XBSm ZDHw== X-Gm-Message-State: AKGB3mL+13lVwyjmSN2vF+OLbnvWkK98aAhW5/Ke9IGzhMAq/DPJC4hF DE+EVJxYVi22MM8aU2X13yYe1TyZ X-Google-Smtp-Source: ACJfBotn7hkK0j/A0fRMh3QhZG5rCLtf0+It4Gyp0DcFhqmrlzZLVOvCxK0/IeYQP0OsdDFJzHlnTA== X-Received: by 10.159.197.67 with SMTP id d3mr1625597plo.409.1513027848643; Mon, 11 Dec 2017 13:30:48 -0800 (PST) Received: from squirtle.westlake.spaceflightindustries.com ([173.226.206.194]) by smtp.gmail.com with ESMTPSA id q10sm25359690pgc.84.2017.12.11.13.30.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Dec 2017 13:30:48 -0800 (PST) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 11 Dec 2017 13:29:55 -0800 Message-Id: <20171211213007.7353-2-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171211213007.7353-1-andrew.smirnov@gmail.com> References: <20171211213007.7353-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH 01/13] imx_fec: Do not link to netdev 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: , Cc: Peter Maydell , Andrey Smirnov , Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, yurovsky@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Binding to a particular netdev doesn't seem to belong to this layer and should probably be done as a part of board or SoC specific code. Convert all of the users of this IP block to use qdev_set_nic_properties() instead. Cc: Peter Maydell Cc: Jason Wang Cc: Philippe Mathieu-Daudé Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Cc: yurovsky@gmail.com Reviewed-by: Peter Maydell Signed-off-by: Andrey Smirnov --- hw/arm/fsl-imx6.c | 1 + hw/net/imx_fec.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 26fd214004..2ed7146c52 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -385,6 +385,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) spi_table[i].irq)); } + qdev_set_nic_properties(DEVICE(&s->eth), &nd_table[0]); object_property_set_bool(OBJECT(&s->eth), true, "realized", &err); if (err) { error_propagate(errp, err); diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 90e6ee35ba..88b4b049d7 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -1171,8 +1171,6 @@ static void imx_eth_realize(DeviceState *dev, Error **errp) qemu_macaddr_default_if_unset(&s->conf.macaddr); - s->conf.peers.ncs[0] = nd_table[0].netdev; - s->nic = qemu_new_nic(&imx_eth_net_info, &s->conf, object_get_typename(OBJECT(dev)), DEVICE(dev)->id, s);