From patchwork Mon Nov 6 15:47:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10043743 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 65B2F603FF for ; Mon, 6 Nov 2017 15:50:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4978E29D9A for ; Mon, 6 Nov 2017 15:50:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AC0929E0C; Mon, 6 Nov 2017 15:50: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 A5DD829D9A for ; Mon, 6 Nov 2017 15:50:05 +0000 (UTC) Received: from localhost ([::1]:48759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBjf2-00073K-7c for patchwork-qemu-devel@patchwork.kernel.org; Mon, 06 Nov 2017 10:50:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBjdb-00071D-B5 for qemu-devel@nongnu.org; Mon, 06 Nov 2017 10:48:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBjda-0000OE-IB for qemu-devel@nongnu.org; Mon, 06 Nov 2017 10:48:35 -0500 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:44211) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eBjdW-0000Lf-70; Mon, 06 Nov 2017 10:48:30 -0500 Received: by mail-pg0-x243.google.com with SMTP id j3so8524898pga.1; Mon, 06 Nov 2017 07:48:30 -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=ns/VTSSJDM8QxFDFgYy70kNSnTqY+1rSy92OOo54vl8=; b=KwI57nCN6UlDYzOsOJmOk7Xbqu4beG9kUX0qXYA56VNYa72S7YrJNKacsuqk4nzvuY EQjiOlQ/+nRtSNr6QnAs73xOq4FL6desXXHXnTtbH58ZEsoeRkuIAlb4/VYYry4qBQjW TrvU8ItWPn0VrXvo27kZ6WItQSLzjW2SpPdokXcR/oCWBtIzJ1gh+aWaPZMcJZFYgdxK 7keqm1+kZ8bwgowviglJ4DV4qUTEh0uAmWvITm602qS1PIdsN3mr1Oyweiq3ZEqkdJjC Cj/UChkZjPGzhRk6aZf16P6J8zN1t1q7+01hO4o+vNRepKhPyLFw2bKM0bMNbDyyZBOK 4zhg== 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=ns/VTSSJDM8QxFDFgYy70kNSnTqY+1rSy92OOo54vl8=; b=R0Ogw3NGldveboX+M40/6VkfvRzbH6lb2+w3y/PHmXD1JrfDewg/BEXwO13aAqqt2Q de7FTM1UhSF7i6M8QdndtMV0/DcJ6IlTRfwsiUoRcT4+4ASQ6wSkpE088/bjFcCnwcpq dZPXwjx/b+GFnW/SVGTtuaeE2dsUqIyLG1HPybFw1RmHdzbmGJH8fp751S9BRZ8iZ+hS GdjaMEV6trhJ/Zt2b4GZwHuVezMNxWYgYpospdSpb61EO4lq2YtxOPCpJNyZs2UFzssZ TEbVxhrY5X60wnQcmDX5Jj7yMcisxmbw1CgX1DrFIELA12hpNhVDpLOzWnqUdvX5+7bq vaJg== X-Gm-Message-State: AMCzsaWTt4XUT5nh9VJrpV4bd2EsEJCUBO+8o2zTDM2NB4k/LELZYw/G NGN7XU9hjXWjAXYdoxZH3orwxWzBgk8= X-Google-Smtp-Source: ABhQp+T546xRgCS5cm7+IzQlfPVMA5QRTuvvRijfDOg1qgrPHOUBE/Er19sSsgsNLa1j4X3GUcPlMg== X-Received: by 10.98.158.211 with SMTP id f80mr17037515pfk.156.1509983308836; Mon, 06 Nov 2017 07:48:28 -0800 (PST) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id x1sm22719590pfh.113.2017.11.06.07.48.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Nov 2017 07:48:28 -0800 (PST) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 6 Nov 2017 07:47:44 -0800 Message-Id: <20171106154813.19936-2-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171106154813.19936-1-andrew.smirnov@gmail.com> References: <20171106154813.19936-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:c05::243 Subject: [Qemu-devel] [PATCH v3 01/30] 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);