From nobody Fri May 17 12:14:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1676283100; cv=none; d=zohomail.com; s=zohoarc; b=MYw6KRNUOBt6p+in7uFM5m6+HaNK7pBdEoBZTu0bmmWp5un/G4adOFYlN7S0olXxJ1r7KiqboYDA8WW2VA/ZX/JzFTKuwSwkNcWDbjRafUJgLtkBEFa+v0Uo8vHFiKAM+oksfQKaY1jq5UjxNGCgqKTuu0GUeYq8B4C/SvXcBiE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676283100; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s4DvDo0UQW2wHHaZyEw/ZO2I4PAch3e8r1jmccdccY0=; b=fEasz8b/45Y7HC0kKhIIcYIHF4ckT+W7n0RvdYhEv6w/o84JkWfu1KCeTCrgzo2fPw31nXb4zswP5F4iKN0vJkKVRR+JvYEVUXNhi0Fs1VKYlfT2Ssrob6F9/+DlYG4GIGtvfnd3NPo2xvfK74jkyhwpbe63SjcKVWYnQ1XBFDg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676283100172689.1375256606468; Mon, 13 Feb 2023 02:11:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRVnX-0005Df-TO; Mon, 13 Feb 2023 05:10:59 -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 1pRVnW-0005DW-VZ for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:10:59 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRVnV-0003OT-Bo for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:10:58 -0500 Received: by mail-wm1-x336.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so10868042wma.1 for ; Mon, 13 Feb 2023 02:10:56 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id j20-20020a05600c191400b003dd8feea827sm18304989wmq.4.2023.02.13.02.10.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 02:10:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s4DvDo0UQW2wHHaZyEw/ZO2I4PAch3e8r1jmccdccY0=; b=Vetiidoy994cgLQd8Tg0t/nVbIAPuAnoxmD5wLDLCSNAIhULpFJTVf6VNm+QCBg4VO yVjhNPBqqqxD2Uy+9/CtFExcLTOoRT1bw6ib3cThuRto4Tvx1cRKjJgpNzO4tWrgH+VC L6IpwRSEVIpdkeMzjOjf6R7fZ2YNp9Kw6mp1TtXIror4vNAiWfFJ1TVhhd8lUPvzAM4+ oDYMYti+tSLLFrV3aKBoIyo8Q44q5PDvT0WrgiVvq/bnIt1jkZ5PYrwbdGKR8/dh8MH3 W3RRw1ctXM095PmUIC2xsOAPSsNtxVMUNsPL997ZTG85fG3HuXPtILNu5ElakMSchJbs zFkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s4DvDo0UQW2wHHaZyEw/ZO2I4PAch3e8r1jmccdccY0=; b=T9gr+Dzz1A7D6WCn7vg8ri93yUBPsPX5BsZeA+NDQIuXzZA8c/cluNVO1oY5sqGIRn iI+xkIi20zeoG+m3kPF6ts4WelMOrOqJmBwHfr/Ch0itbQUl90yK3WUua3AvJq47W7rI eDAzR+oMR6o//BSjTUz1pyHyH6lr9DplvnWjT+1Vx5Lbfbp9qOMKBormAL4cr7mv/5Dl Hy0Ey5oyl3ARbirDEWno8B6b3y0vqjHIMbVCoiMSjTVzmi9iJ8MdZARoVG+9hcJOBbXE BBg2Dpt1xQ1WkbfY76wHBJsReOEfz1fpQDKH6G9gLUR1uOEQytJIzXCd5PTEyXpRDgKg PGAg== X-Gm-Message-State: AO0yUKV38DeivAOgNVgrF3SlJ1QpSVn9uYPP5CFC2gcO0YguoLwph8KR ps6K2fqGDowtFexFvVBahkZcYNpuWst/+9vg X-Google-Smtp-Source: AK7set/Rq2+Dgsbbi1llXfpsSUj6YKN3z3hUSZk5BZfaOcZj8hR91AcNjnRNJwdWdtyP89BTsEcUTg== X-Received: by 2002:a05:600c:329d:b0:3dd:97d6:8f2e with SMTP id t29-20020a05600c329d00b003dd97d68f2emr17865001wmp.17.1676283055385; Mon, 13 Feb 2023 02:10:55 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Jason Wang , Thomas Huth , Igor Mammedov , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/7] hw/net/eepro100: Abort if pci_add_capability() ever fail Date: Mon, 13 Feb 2023 11:10:42 +0100 Message-Id: <20230213101048.94519-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213101048.94519-1-philmd@linaro.org> References: <20230213101048.94519-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676283101604100005 If pci_add_capability() ever fail, the EEPRO100 device is broken, which is a bug. No need to report that to the user, abort instead. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/eepro100.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index dc07984ae9..dce75039ec 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -549,13 +549,8 @@ static void e100_pci_reset(EEPRO100State *s, Error **e= rrp) if (info->power_management) { /* Power Management Capabilities */ int cfg_offset =3D 0xdc; - int r =3D pci_add_capability(&s->dev, PCI_CAP_ID_PM, - cfg_offset, PCI_PM_SIZEOF, - errp); - if (r < 0) { - return; - } - + pci_add_capability(&s->dev, PCI_CAP_ID_PM, cfg_offset, PCI_PM_SIZE= OF, + &error_abort); pci_set_word(pci_conf + cfg_offset + PCI_PM_PMC, 0x7e21); #if 0 /* TODO: replace dummy code for power management emulation. */ /* TODO: Power Management Control / Status. */ --=20 2.38.1 From nobody Fri May 17 12:14:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1676283088; cv=none; d=zohomail.com; s=zohoarc; b=e+1aDYrCO6A+kmAwhEsw5DIlE6ZfDnsmqSC5UJrep4DGgWS2MHn2Lhs1JQLwVzFZlgBx4v2EjKnFyMkdNm7N6lY8c1iGo24cMyY/mxMtX2n+LauRBXjnAhRTtg/+dfsNzcr7vPI0wXteW4FCtrnR/ulVbNSFn+6iPw8UO2gwWQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676283088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=e8yrXFW0jUJr8712z9qQtwR4EVFVh/k+PCDGhmBSEkw=; b=d84IG3LBiXmBYCi8o7eaq7qqmKAm1+rH5k4hPTbnatlcr4U2laPrr4TiJxd6180NKN6nJd+jF/cvi0lBEdqfOg/qPe3exHFHHxaSlz3zLdeDLsizHaPZe64LaIfi63qGDTu60LYPau1VeBYEitlRXGNDGdsww0eB0doR8dNAI9s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676283087983750.8643015748597; Mon, 13 Feb 2023 02:11:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRVnf-0005EY-4V; Mon, 13 Feb 2023 05:11:07 -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 1pRVnd-0005EC-4F for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:05 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRVna-0003QK-FC for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:04 -0500 Received: by mail-wr1-x42a.google.com with SMTP id a2so11543949wrd.6 for ; Mon, 13 Feb 2023 02:11:02 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id y1-20020a5d6201000000b002c3ea5ebc73sm10030121wru.101.2023.02.13.02.10.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 02:11:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e8yrXFW0jUJr8712z9qQtwR4EVFVh/k+PCDGhmBSEkw=; b=QeXmOlWnU9ZUpVHBUDR4/rZc6gLh6q5amrTn6UblZxGIhwkmeeIvUVYrB4EFoA2sbl 4UJ1jx2heQeHhZkDsALE9ljG6yqdxiU9E1skjEvTDFGPn/OuSiPMYT6IL/DbfT9KKwU0 QpYfUEKdzQTcDydwofjR2f8dOGvpUqhc9Aib7ZNdQv4h54813+vXrIK6IJ5cxHUBZvTo 1ATLeY+0iWzvEB6/AHQarvAY4PZjaz544zxw97JZXFHi8tL9KDcCxb/CzTIyhaYQl+YY OoCBZZr8HdOiKRHzukAwYlr2DxCkUZlIEwO9QThPVHVNttMsaNb/JJfT2kNi60ltB6Ma DC7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e8yrXFW0jUJr8712z9qQtwR4EVFVh/k+PCDGhmBSEkw=; b=HK8PAQdpK2XqSLblPvsuLK7zi08nvOY9REIq2CnG+CoppLtV6FkMheaMGVrbCcziVv QD8Nqaoso3vlXuC2LYvLpCLkC7OGbNfIu/tL0VrqR4kPV6Sxuo5IsiHZk/04VKF1uC32 BBOiCslNxusmFl7TRWqHkcNzY1m5Sw1Eytp+/T1x+b1CJJIX2Qgw37/38uO3+qwb6moj D2pYSLN3fZpVwUGN+pvcjcJOmmvR76zY5lKjy8lSauodMR4LrBaPCn0rH0GKeiTmvy2v RgW0kVGEKtCEXIi+dAh1o9SUMoHQsPNBityRj7/98XdHWcHn1F11+p0C6yw1E8/XAKJZ G6EQ== X-Gm-Message-State: AO0yUKUX706qEq6G/wf22TTvcl17F1MQ2Mx9Y9+saYcmcmSEjt7G15eg jFQTHb+5NMmKc4M7wYdJVxWinuBPF9e571OB X-Google-Smtp-Source: AK7set/2U167agw0mqjV+ZFagoXor36FT0ks3MgE5pNSF6n26E1EyNF4/qprC8aPjb9nCFAeB1zH3w== X-Received: by 2002:a5d:55cf:0:b0:2c5:557b:f837 with SMTP id i15-20020a5d55cf000000b002c5557bf837mr2869021wrw.14.1676283060322; Mon, 13 Feb 2023 02:11:00 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Jason Wang , Thomas Huth , Igor Mammedov , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/7] hw/net/eepro100: Introduce TYPE_EEPRO100 QOM abstract parent Date: Mon, 13 Feb 2023 11:10:43 +0100 Message-Id: <20230213101048.94519-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213101048.94519-1-philmd@linaro.org> References: <20230213101048.94519-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676283089573100003 Have all the EEPRO100-based devices share a common (abstract) QOM parent. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/eepro100.c | 58 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index dce75039ec..4b5d45576b 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -235,8 +235,20 @@ typedef enum { ru_ready =3D 4 } ru_state_t; =20 -typedef struct { +#define TYPE_EEPRO100 "eepro100" +OBJECT_DECLARE_TYPE(EEPRO100State, EEPRO100Class, EEPRO100) + +struct EEPRO100Class { + /*< private >*/ + PCIDeviceClass parent_class; + /*< public >*/ +}; + +struct EEPRO100State { + /*< private >*/ PCIDevice dev; + /*< public >*/ + /* Hash register (multicast mask array, multiple individual addresses)= . */ uint8_t mult[8]; MemoryRegion mmio_bar; @@ -279,7 +291,7 @@ typedef struct { /* Quasi static device properties (no need to save them). */ uint16_t stats_size; bool has_extended_tcb_support; -} EEPRO100State; +}; =20 /* Word indices in EEPROM. */ typedef enum { @@ -2055,43 +2067,55 @@ static Property e100_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 -static void eepro100_class_init(ObjectClass *klass, void *data) +static void eepro100_base_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); E100PCIDeviceInfo *info; =20 - info =3D eepro100_get_class_by_name(object_class_get_name(klass)); =20 set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); device_class_set_props(dc, e100_properties); - dc->desc =3D info->desc; k->vendor_id =3D PCI_VENDOR_ID_INTEL; k->class_id =3D PCI_CLASS_NETWORK_ETHERNET; k->romfile =3D "pxe-eepro100.rom"; k->realize =3D e100_nic_realize; k->exit =3D pci_nic_uninit; + + info =3D eepro100_get_class_by_name(object_class_get_name(klass)); + if (!info) { + /* base class */ + return; + } + dc->desc =3D info->desc; k->device_id =3D info->device_id; k->revision =3D info->revision; k->subsystem_vendor_id =3D info->subsystem_vendor_id; k->subsystem_id =3D info->subsystem_id; } =20 +static const TypeInfo eepro100_base_info =3D { + .name =3D TYPE_EEPRO100, + .parent =3D TYPE_PCI_DEVICE, + .abstract =3D true, + .class_init =3D eepro100_base_class_init, + .class_size =3D sizeof(EEPRO100Class), + .instance_size =3D sizeof(EEPRO100State), + .instance_init =3D eepro100_instance_init, + .interfaces =3D (InterfaceInfo[]) { + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + static void eepro100_register_types(void) { - size_t i; - for (i =3D 0; i < ARRAY_SIZE(e100_devices); i++) { - TypeInfo type_info =3D {}; - E100PCIDeviceInfo *info =3D &e100_devices[i]; + type_register_static(&eepro100_base_info); =20 - type_info.name =3D info->name; - type_info.parent =3D TYPE_PCI_DEVICE; - type_info.class_init =3D eepro100_class_init; - type_info.instance_size =3D sizeof(EEPRO100State); - type_info.instance_init =3D eepro100_instance_init; - type_info.interfaces =3D (InterfaceInfo[]) { - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, + for (size_t i =3D 0; i < ARRAY_SIZE(e100_devices); i++) { + TypeInfo type_info =3D { + .name =3D e100_devices[i].name, + .parent =3D TYPE_EEPRO100, }; =20 type_register(&type_info); --=20 2.38.1 From nobody Fri May 17 12:14:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1676283099; cv=none; d=zohomail.com; s=zohoarc; b=O3GOiHvsGXML/vh07nN7q60zU9E1iMyfRA3Qw5PtmgBCmlSDHOys8yR+46TiEgXBq7cZvsGtrYRwfyWw5XZ3/aTrcWbt0iOmd92Kxn57JyacAhLps3gop1RK7T6/QNHnRTceOWc7kLr8c5iHo7lK0d74srkaNVIS+2OdvmQ8Rk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676283099; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Tu5dVA6dI9cI2EiBQY93c/MUAVRJTVadUXPrnS7cBWs=; b=d72+RnQc8wb0EFdRL1NNsGk8um6tFXbP8cwxnwEJX+d7tiID02BL5UHNh0bHhy7NMtAWL4hGbN3JVC5SzOPKST0hzLYyfEk50rqcsJsH67FQt4fjaJCezk/OmlFU9t6ayQUYyXEZLyb979IriK/cite19hIhDFe4+YPksTeno8A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676283099302841.6982560585334; Mon, 13 Feb 2023 02:11:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRVnk-0005VK-RN; Mon, 13 Feb 2023 05:11:12 -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 1pRVnh-0005MH-85 for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:09 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRVne-0003SW-Te for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:08 -0500 Received: by mail-wm1-x334.google.com with SMTP id r18so8294402wmq.5 for ; Mon, 13 Feb 2023 02:11:06 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id iv12-20020a05600c548c00b003dc521f336esm14628652wmb.14.2023.02.13.02.11.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 02:11:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Tu5dVA6dI9cI2EiBQY93c/MUAVRJTVadUXPrnS7cBWs=; b=kd7JFUErabWj3jbv4l9FoJPEb7TNJf1BnTvreb61q8oEoF2iFKRm2sJfo2HgMhEQbB ig3HCa5JseNl759osJlGKNIRi5TgTJI87o30rpLdOaalDyOg5yRB+spAePMaAytuFyKB jlhcqFu8uoU6BQ1tdIo/vn0IyknvWdRZy4rtJHFG5cVPrHTQYjVq7tAxLvbkrjwmuDR5 sd8y+Moj3d/2HJiDBYqI7BgBhpWDlMn+ygbNxKhPbDkpbdWMEsL1hQ79e8UABvQQtoXV V5Zwu4lue42hUAUGq0/S7azR11XaUMMk/xjUYrHIyoxxCcrdk5qSwbjEn5cok5tt2wKx gKOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tu5dVA6dI9cI2EiBQY93c/MUAVRJTVadUXPrnS7cBWs=; b=aHZYToE8J2oD+BuBUbHedjDTJ5sfjxtM4AmjLUwSAoC4fAoCznysLii59GGmKdE1A3 vvomFJ1iYTXE/x3vVfesLdzq2XWI2HKzySkT+H3/ARxuk4MWauC3txzxnwoXyR3x8h2i YQ8N0v3/Y1cBNQP8djwWZ8xFodwpNNgKefd/HHpxPiQh+dLyH1VY3xWlW8otqRRQ2NqY EaSkZ5JZxUvHHAWva4he2dz/eKyYHIUqDF2bazXZ+R6u856egJRBu3zT5JTbVMxGmsg2 9DuQTyPzny7/iDCFnYt+a0aoJ9+FraY8L9Dj/kUOTHgSOccamJjGUaEnD6eveptKjna3 MyAQ== X-Gm-Message-State: AO0yUKWF3in5tNtkXgEvBGfe5J7MkRgNwHTnZ6fa06eQu7vq8fqgjbH/ ofkiIYFYTMBHrHOlvatttNrOA2UxC5Ef/bgU X-Google-Smtp-Source: AK7set8EPOuaF+L7gg2EefeAKBkkiisOmnEP/o93KZCJkPPF81mU0r3D+yVGvqusJFJ/XepfO8PiKQ== X-Received: by 2002:a05:600c:331b:b0:3dc:4356:533c with SMTP id q27-20020a05600c331b00b003dc4356533cmr18409573wmp.5.1676283065206; Mon, 13 Feb 2023 02:11:05 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Jason Wang , Thomas Huth , Igor Mammedov , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/7] hw/net/eepro100: Convert reset handler to DeviceReset Date: Mon, 13 Feb 2023 11:10:44 +0100 Message-Id: <20230213101048.94519-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213101048.94519-1-philmd@linaro.org> References: <20230213101048.94519-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676283099790100001 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/eepro100.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index 4b5d45576b..722fb55e4a 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -486,8 +486,9 @@ static void eepro100_fcp_interrupt(EEPRO100State * s) } #endif =20 -static void e100_pci_reset(EEPRO100State *s, Error **errp) +static void e100_pci_reset(DeviceState *dev) { + EEPRO100State *s =3D EEPRO100(dev); E100PCIDeviceInfo *info =3D eepro100_get_class(s); uint32_t device =3D s->device; uint8_t *pci_conf =3D s->dev.config; @@ -1847,18 +1848,11 @@ static void e100_nic_realize(PCIDevice *pci_dev, Er= ror **errp) { EEPRO100State *s =3D DO_UPCAST(EEPRO100State, dev, pci_dev); E100PCIDeviceInfo *info =3D eepro100_get_class(s); - Error *local_err =3D NULL; =20 TRACE(OTHER, logout("\n")); =20 s->device =3D info->device; =20 - e100_pci_reset(s, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - /* Add 64 * 2 EEPROM. i82557 and i82558 support a 64 word EEPROM, * i82559 and later support 64 or 256 word EEPROM. */ s->eeprom =3D eeprom93xx_new(&pci_dev->qdev, EEPROM_SIZE); @@ -2076,6 +2070,7 @@ static void eepro100_base_class_init(ObjectClass *kla= ss, void *data) =20 set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); device_class_set_props(dc, e100_properties); + dc->reset =3D e100_pci_reset; k->vendor_id =3D PCI_VENDOR_ID_INTEL; k->class_id =3D PCI_CLASS_NETWORK_ETHERNET; k->romfile =3D "pxe-eepro100.rom"; --=20 2.38.1 From nobody Fri May 17 12:14:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1676283134; cv=none; d=zohomail.com; s=zohoarc; b=hWQkT6HwLwQxO93igVGtOgcX49P5EFEe+5n10Jn8j9AyB52Dhsv++E1DvJS/KsewJyjXxRW5WbIwvRHpA5c2DRH9nI+WQXK+J7PziwCjTgetSUiuEurD2cqyGBgo5tv0ppHwy5yodTvENxv5a4bxc6D6/aU6FkGG9bNoNqjgYQU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676283134; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BZL+Bp8uavCHtbQrBbmxFnoeXirx45v+Dj9xYJzTDeg=; b=NmAgxqhZ3p3MTw3R2yQOzyGJZ6bWX14mDv9JSnz0oaCzEEyRnzBzSueehl47nB2eM8pYC7T1ofb4A1gsm8Qs05nOfk1lh1MGhb8f2kyJosaUiwTaEr2MS1/QOjqL59IzK/bC5DGni02hepd/FtvNLWN/Cam3MmJuBOclzsXVL9I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676283134126547.0580441956146; Mon, 13 Feb 2023 02:12:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRVnp-0005cW-K9; Mon, 13 Feb 2023 05:11:17 -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 1pRVnn-0005af-5g for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:16 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRVnk-0003Uc-Ru for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:14 -0500 Received: by mail-wm1-x32e.google.com with SMTP id j29-20020a05600c1c1d00b003dc52fed235so8566769wms.1 for ; Mon, 13 Feb 2023 02:11:11 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id m18-20020a5d6252000000b002c3dc4131f5sm10248084wrv.18.2023.02.13.02.11.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 02:11:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BZL+Bp8uavCHtbQrBbmxFnoeXirx45v+Dj9xYJzTDeg=; b=mexQoVgwoSQuueyuYWZ4fjYZWsc91Qg1sjG5uSvGkq3+KUR12HiwOvKduID2Oe8lA7 okDW24Ysa2a06DouOdKw23Xmwi6LG8/LeYZKnjb/P0dkQjIQwyMCRt8UD3A8I6OCV9NB XUgkML/Qra3KpeuHfxHNxFW5MVI2s99hHVPWWDofyAVkxZuc5t28HykSPEIkSCeBiROQ 6ni6sW3D/amcNW49Fdzo8T1jiX1EdgECfXPbrNRp85jDtR42qE6p5Clm+9jWY9nUUsBq vGCMZOPRHe1Jr9pq3GiyHE9I63+zu3bezCeBTVgK+0N0bzTO19vYzBGq0jdQNgUyWRCM 5QQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BZL+Bp8uavCHtbQrBbmxFnoeXirx45v+Dj9xYJzTDeg=; b=KII/UyX9/ceI6mOCsEzjVrtDxLnYMsjMTdRsUPgCyw9SEwRWE0Gx/+ytydDvkn1Nuu eSx+r47Xt71d/N1iYQty95cvweU24qpcFTWp52MJVQuYpnXK0/Axe8dbsr9fQP4Puh4U w4SHRhsCMNBMgE05xtm49cdyylcoX75tvTFkPN45l/5T37JsgNjFvDS7MkfnWygWq+3K 6lWeELSGE0yZhjoTsDC+EU75jOqU6WBHRkznrY3zRRCsZaLM8mevZGpzbMjSyWzTjiFW TGdu51jeWeMCx1EvGHIULu7f65yqxpI514juv6h7aEE0kPUXwDJBAJ+iFEdx7EfKFoN/ gsTw== X-Gm-Message-State: AO0yUKWNnERQzxRUNNxYtXa/nxN2SFVb/iuFA3ZChSB2z9Z+372shQls pV5w5BFY40bykvWrkeCHfr4Yuo3FNsOYluuJ X-Google-Smtp-Source: AK7set/ZGHnrE4CRB2i9sEIRHyE340h/ZXwO1ExCLVvGcX2ltiDQeTxi0HnWDx0Q9HG8LKn9fP9aPw== X-Received: by 2002:a05:600c:43d3:b0:3da:1357:4ca2 with SMTP id f19-20020a05600c43d300b003da13574ca2mr20544534wmn.11.1676283070236; Mon, 13 Feb 2023 02:11:10 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Jason Wang , Thomas Huth , Igor Mammedov , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/7] hw/net/eepro100: Pass E100PCIDeviceInfo as class init data Date: Mon, 13 Feb 2023 11:10:45 +0100 Message-Id: <20230213101048.94519-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213101048.94519-1-philmd@linaro.org> References: <20230213101048.94519-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676283135831100001 QOM already provides the TypeInfo::class_data to set class-specific data. Use it instead of reinventing the wheel with eepro100_get_class_by_name(). This finishes the QDev conversion started 12 years ago in commit 40021f0888 ("pci: convert to QEMU Object Model"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/eepro100.c | 63 +++++++++++++++-------------------------------- 1 file changed, 20 insertions(+), 43 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index 722fb55e4a..ab20558a18 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -242,6 +242,8 @@ struct EEPRO100Class { /*< private >*/ PCIDeviceClass parent_class; /*< public >*/ + + const E100PCIDeviceInfo *info; }; =20 struct EEPRO100State { @@ -338,8 +340,6 @@ static const uint16_t eepro100_mdi_mask[] =3D { 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, }; =20 -static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s); - /* Read a 16 bit control/status (CSR) register. */ static uint16_t e100_read_reg2(EEPRO100State *s, E100RegisterOffset addr) { @@ -489,8 +489,9 @@ static void eepro100_fcp_interrupt(EEPRO100State * s) static void e100_pci_reset(DeviceState *dev) { EEPRO100State *s =3D EEPRO100(dev); - E100PCIDeviceInfo *info =3D eepro100_get_class(s); - uint32_t device =3D s->device; + EEPRO100Class *ek =3D EEPRO100_GET_CLASS(s); + const E100PCIDeviceInfo *info =3D ek->info; + uint32_t device =3D info->device; uint8_t *pci_conf =3D s->dev.config; =20 TRACE(OTHER, logout("%p\n", s)); @@ -1847,11 +1848,11 @@ static NetClientInfo net_eepro100_info =3D { static void e100_nic_realize(PCIDevice *pci_dev, Error **errp) { EEPRO100State *s =3D DO_UPCAST(EEPRO100State, dev, pci_dev); - E100PCIDeviceInfo *info =3D eepro100_get_class(s); + EEPRO100Class *ek =3D EEPRO100_GET_CLASS(s); =20 TRACE(OTHER, logout("\n")); =20 - s->device =3D info->device; + s->device =3D ek->info->device; =20 /* Add 64 * 2 EEPROM. i82557 and i82558 support a 64 word EEPROM, * i82559 and later support 64 or 256 word EEPROM. */ @@ -2028,32 +2029,19 @@ static E100PCIDeviceInfo e100_devices[] =3D { } }; =20 -static E100PCIDeviceInfo *eepro100_get_class_by_name(const char *typename) +static void eepro100_class_init(ObjectClass *klass, void *data) { - E100PCIDeviceInfo *info =3D NULL; - int i; + DeviceClass *dc =3D DEVICE_CLASS(klass); + PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); + EEPRO100Class *ek =3D EEPRO100_CLASS(klass); + const E100PCIDeviceInfo *info =3D data; =20 - /* This is admittedly awkward but also temporary. QOM allows for - * parameterized typing and for subclassing both of which would suitab= le - * handle what's going on here. But class_data is already being used = as - * a stop-gap hack to allow incremental qdev conversion so we cannot u= se it - * right now. Once we merge the final QOM series, we can come back he= re and - * do this in a much more elegant fashion. - */ - for (i =3D 0; i < ARRAY_SIZE(e100_devices); i++) { - if (strcmp(e100_devices[i].name, typename) =3D=3D 0) { - info =3D &e100_devices[i]; - break; - } - } - assert(info !=3D NULL); - - return info; -} - -static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s) -{ - return eepro100_get_class_by_name(object_get_typename(OBJECT(s))); + dc->desc =3D info->desc; + k->device_id =3D info->device_id; + k->revision =3D info->revision; + k->subsystem_vendor_id =3D info->subsystem_vendor_id; + k->subsystem_id =3D info->subsystem_id; + ek->info =3D info; } =20 static Property e100_properties[] =3D { @@ -2065,8 +2053,6 @@ static void eepro100_base_class_init(ObjectClass *kla= ss, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); - E100PCIDeviceInfo *info; - =20 set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); device_class_set_props(dc, e100_properties); @@ -2076,17 +2062,6 @@ static void eepro100_base_class_init(ObjectClass *kl= ass, void *data) k->romfile =3D "pxe-eepro100.rom"; k->realize =3D e100_nic_realize; k->exit =3D pci_nic_uninit; - - info =3D eepro100_get_class_by_name(object_class_get_name(klass)); - if (!info) { - /* base class */ - return; - } - dc->desc =3D info->desc; - k->device_id =3D info->device_id; - k->revision =3D info->revision; - k->subsystem_vendor_id =3D info->subsystem_vendor_id; - k->subsystem_id =3D info->subsystem_id; } =20 static const TypeInfo eepro100_base_info =3D { @@ -2111,6 +2086,8 @@ static void eepro100_register_types(void) TypeInfo type_info =3D { .name =3D e100_devices[i].name, .parent =3D TYPE_EEPRO100, + .class_init =3D eepro100_class_init, + .class_data =3D (void *)&e100_devices[i], }; =20 type_register(&type_info); --=20 2.38.1 From nobody Fri May 17 12:14:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1676283162; cv=none; d=zohomail.com; s=zohoarc; b=LCS3mQxRFL5iVXPFfL8TEowQdCowGrt5DOrLfU+qJ5JH6D2yuEschpkcJ2bsmbToKvNfJd75y5erUqeXww4whEVNqRCvcLtPS8lTnX0ygHc67sIRaWiaLNuGxItj375H7t357dp/wb55NnBJg7MnqL3bifGRLPAsSpFT6BjK0ls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676283162; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OEDmvV7dprZjnBDzVsTadk4Q695IfZynhRqx282ioKQ=; b=MkP7zEHFteU0wxICbGjZEOv/m9+5RDZv+Yc/FafUCQnNiib8M2uRISjOfgYk9BYEldKFO1IXsRcilpHBGgeW7Gb0nh2Vj2ylBhBrBvC2MHDzIQD/lkPHv+OU9qIwKaupd3dSUBlt9P79OUa9w35cCrBjV+U0PGqh2zLKYV8eF9I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16762831624903.5061514604682316; Mon, 13 Feb 2023 02:12:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRVnx-0005er-DJ; Mon, 13 Feb 2023 05:11:25 -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 1pRVnu-0005dP-K8 for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:22 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRVnq-0003W3-IL for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:20 -0500 Received: by mail-wm1-x334.google.com with SMTP id n33so2296609wms.0 for ; Mon, 13 Feb 2023 02:11:16 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id p14-20020a1c544e000000b003db06493ee7sm17381648wmi.47.2023.02.13.02.11.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 02:11:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OEDmvV7dprZjnBDzVsTadk4Q695IfZynhRqx282ioKQ=; b=bA1SEdkAHr2a/FzF5KBg9EU55JU492UcPPUxDTOWBjnDa/fwmXQPy7eLNmOrDx93Tl XHHZnv3dUNkTgjEDXU2wfI/KzOif6Bb4A1BQgKI1kfAYQqgDfJLbLn2tGeorG192W4sE aUGUN/RAfDWfgGfAIqScoE8nNpq/HkVLwCE7exqnIhX3ZlgPPOJCvQAYkCZWKsApWGWk s51xxOSIxEWQyWN2VCf6Z0y7HUHgh2v5i3l2V1EPK7Sm5RbKGQuDyAX3OBUE59DDreND dctDupndlXzxcGPq9nEOETpU8fbhRWetNxxMbqvhEwMCVmxeXqOVgO0tV43USRF2xrY3 xS1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OEDmvV7dprZjnBDzVsTadk4Q695IfZynhRqx282ioKQ=; b=vqat6jxHKf2JdTnpNdaN3Rkc7DC/dEWR3Gw0dwO3oDpzU7DXky6UTC8tqebYPaOAZb 6cRZafAEEmdi4CPUfXF1GehGnjPpkBYeCx9xmPCDHbxULKAgly98T4cIOv+ZKJXCLcFS 7NeqlTPOnpl8qSTlLHYqOhHeLeRqfjKHaah3O0CCUnmf20uY0g4GQrB95htv0TF2c0tU YW7qWB5Iew4JZh4za28M53INW+ASAU9aDG2B3H2FvYq5IUyLLaJtLWVlFQM5NVlzt4CS D9MvFJBvoERBuMtMyrs8ME0AtrK5nVnBHZ+yMXQTxnhoH1cLGzBTPe/FocUcQVz325rR Gnow== X-Gm-Message-State: AO0yUKVodChu0qHLPWldYpDjvMQXYcskkuS12UGbPQHTjegF0ciMRt1b 1gphp7O72CrGpjAJaaFp3YRLH+WsILa5mxAr X-Google-Smtp-Source: AK7set9CillZABT/pBKESsC/+uJDriXYq5kcvUHrkJzxN3EEnldv9KjRjfiYH2EZK7SBHOX4TVpWig== X-Received: by 2002:a05:600c:181d:b0:3e0:c0d:75d8 with SMTP id n29-20020a05600c181d00b003e00c0d75d8mr20716066wmp.23.1676283075044; Mon, 13 Feb 2023 02:11:15 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Jason Wang , Thomas Huth , Igor Mammedov , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/7] hw/net/eepro100: Remove instance EEPRO100State::has_extended_tcb_support Date: Mon, 13 Feb 2023 11:10:46 +0100 Message-Id: <20230213101048.94519-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213101048.94519-1-philmd@linaro.org> References: <20230213101048.94519-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676283164132100003 'has_extended_tcb_support' is accessed read-only and is present in the class definition. No need to duplicate it in the instance state. Directly access the class field. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/eepro100.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index ab20558a18..d7757907c3 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -292,7 +292,6 @@ struct EEPRO100State { =20 /* Quasi static device properties (no need to save them). */ uint16_t stats_size; - bool has_extended_tcb_support; }; =20 /* Word indices in EEPROM. */ @@ -511,7 +510,6 @@ static void e100_pci_reset(DeviceState *dev) pci_set_byte(pci_conf + PCI_MAX_LAT, 0x18); =20 s->stats_size =3D info->stats_size; - s->has_extended_tcb_support =3D info->has_extended_tcb_support; =20 switch (device) { case i82550: @@ -746,6 +744,8 @@ static void read_cb(EEPRO100State *s) =20 static void tx_command(EEPRO100State *s) { + EEPRO100Class *ek =3D EEPRO100_GET_CLASS(s); + const E100PCIDeviceInfo *info =3D ek->info; const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; uint32_t tbd_array =3D s->tx.tbd_array_addr; uint16_t tcb_bytes =3D s->tx.tcb_bytes & 0x3fff; @@ -782,7 +782,7 @@ static void tx_command(EEPRO100State *s) uint16_t tx_buffer_size; uint16_t tx_buffer_el; =20 - if (s->has_extended_tcb_support && !(s->configuration[6] & BIT(4))= ) { + if (info->has_extended_tcb_support && !(s->configuration[6] & BIT(= 4))) { /* Extended Flexible TCB. */ for (; tbd_count < 2; tbd_count++) { ldl_le_pci_dma(&s->dev, tbd_address, &tx_buffer_address, a= ttrs); --=20 2.38.1 From nobody Fri May 17 12:14:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1676283105; cv=none; d=zohomail.com; s=zohoarc; b=bIxBt9IKG1tOprV+JUO9w2I78cB3eFOIjhOrfENre6okME8R0bvYwAMlmG1GVoXzmKBEETWTEuLmetZlRgzVLqEzw+Rvq28+Gk0aSCmPm0zcdAmFjRmnVsGM3uQZPFoL8tD1lvT7S3yefmE5WS/uEiAYIiOUE0ptFB1Mhfkt4GU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676283105; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xLHQgcdLxt1p5En4sn+xmWI1OSi7FkAFpHuHk9yrVdo=; b=JKf1y6mezZMk6FL77psTtOVjn1P7KmnFnc/74sAQoToGINpfMwE1vGvhAxSSLnz4iTGv/7swoql0oO2+O2G5onUHPw0ocghfbIW0K1z8llXSARjw+hAWLP5jRRo9Qwna7owM/yi0MjI42Gji+8LMH24Xv1kHhE56l0jLJAK5cjw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676283105789819.0757994382789; Mon, 13 Feb 2023 02:11:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRVny-0005f9-8D; Mon, 13 Feb 2023 05:11:26 -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 1pRVnw-0005eF-Nd for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:24 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRVnt-0003X0-NT for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:23 -0500 Received: by mail-wm1-x32f.google.com with SMTP id m16-20020a05600c3b1000b003dc4050c94aso8558114wms.4 for ; Mon, 13 Feb 2023 02:11:21 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id o19-20020a05600c4fd300b003dc59d6f2f8sm13851110wmq.17.2023.02.13.02.11.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 02:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xLHQgcdLxt1p5En4sn+xmWI1OSi7FkAFpHuHk9yrVdo=; b=EIklTWusualkftsgWJosmMrIsT3ku5RnbaviYb4OLb+inVC+SQWZ1C+e7EIuVDI3a1 C1Cg1Q8ah6h2ENlehqbqnXRvqeYSl0dCU8H6cZA6bxh+gM749DoriyJBkJRzt/1hkrDb HDR/2AZN/CLbtseL87s9V3mq0hCpu7vjb775kd+YpwO8cVgYqi8FW9urN2O37e3XeSFP UoyDa8DfGAhVy1W7kUpJOvQ7Db4Zy2VEmQGrlHAz+RR6lrRLb/Co7d7zrgM4dqyg0Nxn lVCW3xbWuNuEkTXOkUDF6nTRwL5NcNYkQI3EZ2dnc2nGpdihQs1sBeaOa7G7UxgJ+GHf nk7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xLHQgcdLxt1p5En4sn+xmWI1OSi7FkAFpHuHk9yrVdo=; b=IbCXrteXG7eoi2JVNOxK/9eOofkZRRUYkmW/0aAx9PzN7SCFc9+/Jucf3wlvNHwS99 BTCsw3l6MEXaW4V/rR7EVuFxvh4yYVynw1gsyZLv86w0q/XbydOLIM36uZT5kcH/0fzn F3q9fgBU+22gLhwUH1vXJWbiyE9Dm+/9CuDS1/srbpIqCpIFzuIK+qsLCIFQYT4TAjl9 Z6T6PWku1MiGxOYhPGLlhFOhHvzrfkDrnIchx67Q8clygjbxACq1q8kFYKHbbWMQZUwN oKufwRx+AAW8ZUOQvsMuXXkFhz5OI2YxJqIAd+HMtgA7UtVmEducQnUS2BLNMwdUg2mb a+tg== X-Gm-Message-State: AO0yUKXaa3zt9Co3AdwXQQBMq6z9CTfjVDBf4dCcx7syNPcnBMKdz0TS WrV6a4ZKyGPljjI5cnBrQJyDBXtV/QMhgwaa X-Google-Smtp-Source: AK7set9LBVCB95B9oSsjAyhk3ioG3k/NpWJQZc6AwaaLs4V7nGf4QI9QR+JN2LvhIYMTUdquL/vFVg== X-Received: by 2002:a05:600c:3416:b0:3df:85d2:c768 with SMTP id y22-20020a05600c341600b003df85d2c768mr18625647wmp.26.1676283079889; Mon, 13 Feb 2023 02:11:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Jason Wang , Thomas Huth , Igor Mammedov , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/7] hw/net/eepro100: Remove instance's EEPRO100State::device Date: Mon, 13 Feb 2023 11:10:47 +0100 Message-Id: <20230213101048.94519-7-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213101048.94519-1-philmd@linaro.org> References: <20230213101048.94519-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676283107685100003 'device' is accessed read-only and is present in the class definition. No need to duplicate it in the instance state. Directly access the class field. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/eepro100.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index d7757907c3..bce377688e 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -263,7 +263,6 @@ struct EEPRO100State { /* region must not be saved by nic_save. */ uint16_t mdimem[32]; eeprom_t *eeprom; - uint32_t device; /* device variant */ /* (cu_base + cu_offset) address the next command block in the command= block list. */ uint32_t cu_base; /* CU base address */ uint32_t cu_offset; /* CU address offset */ @@ -591,6 +590,9 @@ static void e100_pci_reset(DeviceState *dev) =20 static void nic_selective_reset(EEPRO100State * s) { + EEPRO100Class *ek =3D EEPRO100_GET_CLASS(s); + const E100PCIDeviceInfo *info =3D ek->info; + size_t i; uint16_t *eeprom_contents =3D eeprom93xx_data(s->eeprom); #if 0 @@ -598,8 +600,9 @@ static void nic_selective_reset(EEPRO100State * s) #endif memcpy(eeprom_contents, s->conf.macaddr.a, 6); eeprom_contents[EEPROM_ID] =3D EEPROM_ID_VALID; - if (s->device =3D=3D i82557B || s->device =3D=3D i82557C) + if (info->device =3D=3D i82557B || info->device =3D=3D i82557C) { eeprom_contents[5] =3D 0x0100; + } eeprom_contents[EEPROM_PHY_ID] =3D 1; uint16_t sum =3D 0; for (i =3D 0; i < EEPROM_SIZE - 1; i++) { @@ -1794,7 +1797,7 @@ static const VMStateDescription vmstate_eepro100 =3D { VMSTATE_UNUSED(19*4), VMSTATE_UINT16_ARRAY(mdimem, EEPRO100State, 32), /* The eeprom should be saved and restored by its own routines. */ - VMSTATE_UINT32(device, EEPRO100State), + VMSTATE_UNUSED(sizeof(uint32_t)), /* was device variant */ /* TODO check device. */ VMSTATE_UINT32(cu_base, EEPRO100State), VMSTATE_UINT32(cu_offset, EEPRO100State), @@ -1848,12 +1851,9 @@ static NetClientInfo net_eepro100_info =3D { static void e100_nic_realize(PCIDevice *pci_dev, Error **errp) { EEPRO100State *s =3D DO_UPCAST(EEPRO100State, dev, pci_dev); - EEPRO100Class *ek =3D EEPRO100_GET_CLASS(s); =20 TRACE(OTHER, logout("\n")); =20 - s->device =3D ek->info->device; - /* Add 64 * 2 EEPROM. i82557 and i82558 support a 64 word EEPROM, * i82559 and later support 64 or 256 word EEPROM. */ s->eeprom =3D eeprom93xx_new(&pci_dev->qdev, EEPROM_SIZE); --=20 2.38.1 From nobody Fri May 17 12:14:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1676283118; cv=none; d=zohomail.com; s=zohoarc; b=QD31L7RiRfeELjPZk3Tforu4sSf0yQ4Wh4xHvVnjkp9gNavzqQ04UoLH5EEcHGQjjPxk5kahZwNMgjv7lbtDwMBksZ0acekPCB8mfd7E7mBqiYMA8YelsYigqVr5iTAtYOpTW5EZ4ENGqkl9iK45j4mLR3GGwo+wyVnZtDLJ4Y0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676283118; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iAgmNlVIUOinPrwzOOaOjTPgQ/bZC+ofNOItCPLhOkw=; b=LBdAg9c4GqINkFfhScq3A/70vscl4RDgcggNENMSCjNMLmc6XU6dLFM7/m/CHZFqhPjDT8VRtCu6sckHEFCjZ8W6PiuzLPDXwkyeD/qgsjScsq0G/Zc3kDmV7m/RF+YiI9UwfPEqmbbeKsHAIcfSzOdAYgtEowMK6B4eNiNDNS8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676283118435483.5100119596432; Mon, 13 Feb 2023 02:11:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRVo5-0006HT-ER; Mon, 13 Feb 2023 05:11:33 -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 1pRVo4-0006C7-0i for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:32 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRVo2-0003YK-60 for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:11:31 -0500 Received: by mail-wm1-x32f.google.com with SMTP id he5so491170wmb.3 for ; Mon, 13 Feb 2023 02:11:25 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id o19-20020a05600c4fd300b003dc59d6f2f8sm13851336wmq.17.2023.02.13.02.11.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 02:11:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iAgmNlVIUOinPrwzOOaOjTPgQ/bZC+ofNOItCPLhOkw=; b=DADTOwmUY0Yx2wnpt7nyQKOI53EaTW5a4izqv/r3uRO6sm1J1SRuWZ+yKAuxeUGMHw SEy/pl630oz7JiqgPn0lf7H6FjDqEv1NfFzyRktsrPJJHfRZPf1UmwN92nrwzDNdz/xn Jl7GTVqzzEyaBMnJmatRQrAI+PT1keR1HHYHSosN2TXiPx8S1AmNpCahJz1eCLawxWiZ GQTsDZz80/XL+VOyymOmK5GqOEmdzfivdDA/xG1Y/tMREjxRDtZcdcD7RhfIVOjNzEIh ZtF5MIp/fvBCvxeke7LarCavukhy9ugwlKUDg3EvR0dLFpy/AF0KZYHfvDfqTCJifAqP BZdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iAgmNlVIUOinPrwzOOaOjTPgQ/bZC+ofNOItCPLhOkw=; b=POMSakKao/Zj2hu9GF2yhvcXkyZtPQN9gsSbq6g0B6xPg6CpmnMNg8VKzZyK6oqSMh w8QdiDPJDA49xL95hvcyWSM0SwxsoGDMDDP6CLHpD1nOkEl568ywldc28VM8WmvYpuaS hLZ/6CTaUtOG/PHihBRYOSB5DNTh+dL6bVgRVnPIdNlYixOl81bvm3pw4XYnXxYeND25 UEPH0h/WNon5OP3iY2ehkPHZbgY357z1ZZuUwIqDsnt3oUrIqVHmq3E1CDc0qIjvLhX3 ogo/q9Pl5HKDKg00I/rqXFngXfomwov0qqpJAw3Rlo3dTUEcqPEqKRH/iNeF7QwWO903 DJTA== X-Gm-Message-State: AO0yUKUB5hidpNtlLsWTwki12Wv2RJ0Jjg7CNeSH8OzDBJPWxzXRaVhn wwVHUsFc9cFieEckrQj4O3YD/CHjmyeTvVAW X-Google-Smtp-Source: AK7set+NZXJaZTc8+1GrWGImIH51z1KRsdU4xeU0h4DYgTOy8mLNrNjVQYo4+zyp1E/Ur9Bav9J4cA== X-Received: by 2002:a05:600c:1694:b0:3de:27c3:ef13 with SMTP id k20-20020a05600c169400b003de27c3ef13mr18354060wmn.9.1676283084674; Mon, 13 Feb 2023 02:11:24 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Jason Wang , Thomas Huth , Igor Mammedov , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 7/7] hw/net/eepro100: Replace DO_UPCAST(EEPRO100State) by EEPRO100() Date: Mon, 13 Feb 2023 11:10:48 +0100 Message-Id: <20230213101048.94519-8-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213101048.94519-1-philmd@linaro.org> References: <20230213101048.94519-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676283119699100001 Use the EEPRO100() QOM type-checking macro to avoid DO_UPCAST(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/eepro100.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index bce377688e..6db15f1ba2 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -1834,7 +1834,7 @@ static const VMStateDescription vmstate_eepro100 =3D { =20 static void pci_nic_uninit(PCIDevice *pci_dev) { - EEPRO100State *s =3D DO_UPCAST(EEPRO100State, dev, pci_dev); + EEPRO100State *s =3D EEPRO100(pci_dev); =20 vmstate_unregister(VMSTATE_IF(&pci_dev->qdev), s->vmstate, s); g_free(s->vmstate); @@ -1850,7 +1850,7 @@ static NetClientInfo net_eepro100_info =3D { =20 static void e100_nic_realize(PCIDevice *pci_dev, Error **errp) { - EEPRO100State *s =3D DO_UPCAST(EEPRO100State, dev, pci_dev); + EEPRO100State *s =3D EEPRO100(pci_dev); =20 TRACE(OTHER, logout("\n")); =20 @@ -1891,7 +1891,7 @@ static void e100_nic_realize(PCIDevice *pci_dev, Erro= r **errp) =20 static void eepro100_instance_init(Object *obj) { - EEPRO100State *s =3D DO_UPCAST(EEPRO100State, dev, PCI_DEVICE(obj)); + EEPRO100State *s =3D EEPRO100(obj); device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", DEVICE(s)); --=20 2.38.1