From patchwork Tue Jan 2 19:36:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10141273 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 D7DA36035E for ; Tue, 2 Jan 2018 19:41:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C74A028E10 for ; Tue, 2 Jan 2018 19:41:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBD1428E1D; Tue, 2 Jan 2018 19:41:08 +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 4502628E10 for ; Tue, 2 Jan 2018 19:41:08 +0000 (UTC) Received: from localhost ([::1]:52935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWSQt-0006x9-Bc for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 Jan 2018 14:41:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWSMc-0003Ew-9s for qemu-devel@nongnu.org; Tue, 02 Jan 2018 14:36:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWSMb-0000Ke-BB for qemu-devel@nongnu.org; Tue, 02 Jan 2018 14:36:42 -0500 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:33284) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWSMW-0000Fb-74; Tue, 02 Jan 2018 14:36:36 -0500 Received: by mail-pl0-x243.google.com with SMTP id 1so27784182plv.0; Tue, 02 Jan 2018 11:36:36 -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=3U1En5R2uXgrFUkLERe0C7CX7L6LBbdyf7stsxqaX3M=; b=Fo4Q2k/wqzV8jpyWZ6eA4UfCvHyDLwGjKxh7p7kTRrWe9QiEv4tvimCAhos3wbPryC 7Pondb01d7XTPEsVUhDV2BBYz1yT4kGLMtj3KD3Xl2a7W48df2ga4lenwUZ6NaazGnxE x4nASCniWkw6T/slUcitHLIA4yahNtca1riqVRviydPSYz+VX72CBLXHsRThSlmZv9kq IMySBcWieYXZ16gIpBqts67aUtbIyomOG0kqHeY3DM0UBUklYrn+DCPuqrz7hZe7jhdk UWbF5gE6+9aYzVfDPcYiQlAWqguqZYw6uuoBfjsNMnK/LbZe6iw9oFQuKFrhCUHDWZ5f 9ZqA== 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=3U1En5R2uXgrFUkLERe0C7CX7L6LBbdyf7stsxqaX3M=; b=hvKIRCP99/H2EXLeAYQpv2gz9/qqFa+6wXjwZca12xkJfBScNLgkVGes2pqQDVZMRN 6fRLDdY6MK6FyA91I30XaWKGApGXOmzLlzsYbRmNrrKUqSdw0NcGTmxO5P/TjUTxdFu0 lkqU1D+U5r6clkDWv2I9Dhz+/oYrp7J+sUyP/Dsu+d/tVmEAz0RlWp+5Op5+jSnmmJHn WflH/sE/dczMT/BmOxRJfLBrjHLVjfAmJYs78PR1Scrgeoe+NP5a07gffgm0nQ8UXQwi 3KhIjJ/4RebLJs2XbS1on96z7SSfkcSJz7p8l0W1FoGnyVTZIn45IqaeWLv4xiWXEy8W NZuQ== X-Gm-Message-State: AKGB3mLA65S+kweQ4DMMHx/zElbRsYAtgR6yrp1spjXAUl4uFVtBf51l VDwKHpIKKkb5eoH+cPAw0axtpaKAVMk= X-Google-Smtp-Source: ACJfBotAS0qZKZQqTpb1cfbVagYqnbZ1brLBwTBfcnCCG4zuIzAt189IqQlEbMmIrYJbHt8EZhYSVw== X-Received: by 10.84.129.9 with SMTP id 9mr47224975plb.138.1514921794989; Tue, 02 Jan 2018 11:36:34 -0800 (PST) Received: from squirtle.westlake.spaceflightindustries.com ([173.226.206.194]) by smtp.gmail.com with ESMTPSA id g9sm97905951pfk.0.2018.01.02.11.36.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Jan 2018 11:36:34 -0800 (PST) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Tue, 2 Jan 2018 11:36:12 -0800 Message-Id: <20180102193622.27215-2-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180102193622.27215-1-andrew.smirnov@gmail.com> References: <20180102193622.27215-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:c01::243 Subject: [Qemu-devel] [PATCH v3 01/11] 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 59ef33efa9..b0d4088290 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);