From nobody Tue Nov 26 14:48:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1706806558356477.07775453683973; Thu, 1 Feb 2024 08:55:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVaE1-0007r1-As; Thu, 01 Feb 2024 11:47:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVaB5-0002wC-D1 for qemu-devel@nongnu.org; Thu, 01 Feb 2024 11:44:39 -0500 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVaAu-0002Up-MT for qemu-devel@nongnu.org; Thu, 01 Feb 2024 11:44:38 -0500 Received: from [2001:8b0:10b:1::ebe] (helo=i7.infradead.org) by desiato.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVaAh-00000009cM8-1xgQ for qemu-devel@nongnu.org; Thu, 01 Feb 2024 16:44:15 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVaAg-00000003INd-1PEf for qemu-devel@nongnu.org; Thu, 01 Feb 2024 16:44:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description; bh=9dHA4yvR5zgy9wGYmYhDI2MzGMa5tnlxfToC7F7mpyQ=; b=U6lKgoeX1DAKpbdBBCZe7PlvTX PRCjX4dLFR8+EH7lEyW8XR8YD8K9w0HH6QIZj9k1obbTPBKYQH7F3DFbGz5fE96RVaL9sJYoDpUw1 7ANxhVmU0dE7ueGfoWDht3K7l5ttiEuT1wF8ZfuOQAZycKBeWwy0NdyY0OU898RzR0fQUpvgeLG6y 1a9ilLJ0D6ottRwMDXv+5jWoGVHqA704pXq3jZPQhwzCUx+jxZQgYCGsAR4GDEJKbQCBX6v6h5TYX N5lm/3h2FEbZ+bzQ4/7eEB2pZim27x7oW7rsHpgbSXmt9/S41iqdnzEIriL/S+j4LPCsG/j66Ti1K EWig1psA==; From: David Woodhouse To: qemu-devel@nongnu.org Subject: [PULL 27/47] hw/arm/highbank: use qemu_create_nic_device() Date: Thu, 1 Feb 2024 16:43:52 +0000 Message-ID: <20240201164412.785520-28-dwmw2@infradead.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240201164412.785520-1-dwmw2@infradead.org> References: <20240201164412.785520-1-dwmw2@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SRS-Rewrite: SMTP reverse-path rewritten from by desiato.infradead.org. See http://www.infradead.org/rpr.html Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; envelope-from=BATV+1220c4869a9b484313cc+7466+infradead.org+dwmw2@desiato.srs.infradead.org; helo=desiato.infradead.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1706806558667100001 Content-Type: text/plain; charset="utf-8" From: David Woodhouse Signed-off-by: David Woodhouse Reviewed-by: Thomas Huth --- hw/arm/highbank.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index e6e27d69af..e12374766e 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -297,19 +297,17 @@ static void calxeda_init(MachineState *machine, enum = cxmachines machine_id) =20 sysbus_create_simple(TYPE_SYSBUS_AHCI, 0xffe08000, pic[83]); =20 - if (nd_table[0].used) { - qemu_check_nic_model(&nd_table[0], "xgmac"); - dev =3D qdev_new("xgmac"); - qdev_set_nic_properties(dev, &nd_table[0]); + dev =3D qemu_create_nic_device("xgmac", true, NULL); + if (dev) { sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xfff50000); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[77]); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, pic[78]); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 2, pic[79]); + } =20 - qemu_check_nic_model(&nd_table[1], "xgmac"); - dev =3D qdev_new("xgmac"); - qdev_set_nic_properties(dev, &nd_table[1]); + dev =3D qemu_create_nic_device("xgmac", true, NULL); + if (dev) { sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xfff51000); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[80]); --=20 2.43.0