From patchwork Mon Feb 13 07:08:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 653179 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp2267183wrr; Sun, 12 Feb 2023 23:12:37 -0800 (PST) X-Google-Smtp-Source: AK7set/sUEZPvWvUbQsoDbCu1svWOtsOhWID3nAanLWu+tGeVFY/0hOdULiWAL+8nILXhQqOzKsG X-Received: by 2002:ac8:5f92:0:b0:3ba:13d8:67b5 with SMTP id j18-20020ac85f92000000b003ba13d867b5mr36338357qta.36.1676272357271; Sun, 12 Feb 2023 23:12:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676272357; cv=none; d=google.com; s=arc-20160816; b=Uut9Sex5/QhEef1WKm0v7zMObz0RuiUkVXO3HRmqIO3CFSEy/qRIhwLKxoBsc1GjZc 61W+7qIgcXZpUFWdk+CpaTkPLlIhgX3968msCN3CBvQHQiT7ThMw7y1vWGso44f3QeHz lrIQbT6kA5JpY2cq0u6gobXJUYGGEQjeMUPzuuEz6s3bcEhNpSjxf7fgjywm07qFXvlR HpFZzJu6UbSu5OP1KMLZhoWRYdHs5NqBK43GMPXYg5LjcpGcIUmIv1ecwVZZbkFd97md YqmOOWSMnRCFNoyIEQQO2+1fFHKZktBGHg+I5JhI1vt4a5yuq21FRGDu48xOoGFTlASF LYpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XrL23td/SqJ6TLHwH0jeBHZYA8cTqwvHD0D623uYOIU=; b=qRHg1cBvH86fNsx933myUJgarDe7IIcKHIOpQ5MWJi+w506kU0TtqmZ5tTOFrMBK9a LTXAjBOmkrVtGCC5Ntb1E7XuB6DTYzTfMsjLc7vrHJurodHRu6eALuUaZxI1t2QMd9zT AoARzKMm2sgYk0ba6dTdeSbAQNvSEUTRVi/DiP4hjvqTbpm9BNnQp+aUhVqClYYzdHXx ujuPA4wrLSKZAao8LYq95i1SuqhAORtgvmVnf9mwaOQcHypM/xtnnf9WXoeToC6ZNw5H krCa96GfwFVLFsodEZIaVVYuqLo8cKDrjV5d+Y02WhFbtakr7NZPPnl322mfYiTYzOHT o4+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LWxWbfPU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l23-20020ac84597000000b003ba35744382si8412042qtn.216.2023.02.12.23.12.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Feb 2023 23:12:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LWxWbfPU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRSxa-0001R0-TU; Mon, 13 Feb 2023 02:09:10 -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 1pRSxX-0001DW-OQ for qemu-devel@nongnu.org; Mon, 13 Feb 2023 02:09:07 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRSxV-0001ll-20 for qemu-devel@nongnu.org; Mon, 13 Feb 2023 02:09:07 -0500 Received: by mail-wr1-x434.google.com with SMTP id r2so11040065wrv.7 for ; Sun, 12 Feb 2023 23:09: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=XrL23td/SqJ6TLHwH0jeBHZYA8cTqwvHD0D623uYOIU=; b=LWxWbfPUIPzqD8om+TUcUCM4IthTRA43s8m8VW+ekjLsvBhu2aDOqgJLgpb+7fVNJC P4b5w2aZcqDBQmkbWcGDl+NL87/RYKvxZfNLw7crODYFdGGv3WawqTFq3YWutxc6bnJ+ CIATB2FyLCeYVfYWE4BQuS9q0AXrae+Luw2dYDMy/QvLpfKaQ+jgBGnvwJ6gmKpqbaKq Yg/y/AkAQiQZttCiWKRNXk7wfT2GbEzoke6PtZz70HA9A5W9hQFwdpmwMgMPQI3/FBJL kmOkULLnIAX+T2Qgdi+4ba8DbkCGVs+fpHEJ3GW8TKDiHNiNySv8KUAMZ1PAEDSwTy5R pRKw== 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=XrL23td/SqJ6TLHwH0jeBHZYA8cTqwvHD0D623uYOIU=; b=smEtqt0dooFRBU0B3CXZ0RSPUrm/FBCTLmPlGN8yKjuaHBZG68OD34QZZumwkiG3Ug dWYVjm7n00a72LNCHszmc/zclD/IDQnNo5/1r3l+DjquA2CqUk78K0mv+6g8gdOr4LpB 96tXSFWh9MFwYvxLEQbU5fg+WimJ3oFNifSAA6Mg/lv+9JI+PFvwRaoglCGo/VokMI+8 etGscupT6ufnNoSdKG0LvJ0eha+YcCIKMpJ+CIqJcNkPK+xBQLzNginXnOT5RKyqHpUg Mt42YQ9Q3GK7LkaSRzOTwG6M472LC3Rbb4CCkFMtp9Io635gB1lmyBGfaI0Ha00S85in ZJlw== X-Gm-Message-State: AO0yUKWzrgRtpZ82j3IKzEx+lGzuKVJjJLTdSJZ91iSeTsPkiiMfiSZd 5DOSFo4PAkTnZ1+a8dNrpRokecITZdpQ3crM X-Received: by 2002:adf:d08a:0:b0:236:695b:82d4 with SMTP id y10-20020adfd08a000000b00236695b82d4mr21142772wrh.30.1676272144053; Sun, 12 Feb 2023 23:09:04 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id p3-20020adff203000000b002c3f6d7d5fesm9817057wro.44.2023.02.12.23.09.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 12 Feb 2023 23:09:03 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: qemu-block@nongnu.org, Thomas Huth , Li Qiang , qemu-s390x@nongnu.org, Hu Tao , Gonglei Arei , Cao jin , xiaoqiang zhao , Paolo Bonzini , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Stefan Weil , Jason Wang Subject: [PATCH v2 08/19] hw/net/eepro100: Introduce TYPE_EEPRO100 QOM abstract parent Date: Mon, 13 Feb 2023 08:08:09 +0100 Message-Id: <20230213070820.76881-9-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213070820.76881-1-philmd@linaro.org> References: <20230213070820.76881-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Have all the EEPRO100-based devices share a common (abstract) QOM parent. Signed-off-by: Philippe Mathieu-Daudé --- hw/net/eepro100.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index dc07984ae9..dac42ba17b 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -235,8 +235,14 @@ typedef enum { ru_ready = 4 } ru_state_t; -typedef struct { +#define TYPE_EEPRO100 "eepro100" +OBJECT_DECLARE_SIMPLE_TYPE(EEPRO100State, EEPRO100) + +struct EEPRO100State { + /*< private >*/ PCIDevice dev; + /*< public >*/ + /* Hash register (multicast mask array, multiple individual addresses). */ uint8_t mult[8]; MemoryRegion mmio_bar; @@ -279,7 +285,7 @@ typedef struct { /* Quasi static device properties (no need to save them). */ uint16_t stats_size; bool has_extended_tcb_support; -} EEPRO100State; +}; /* Word indices in EEPROM. */ typedef enum { @@ -2082,21 +2088,27 @@ static void eepro100_class_init(ObjectClass *klass, void *data) k->subsystem_id = info->subsystem_id; } +static const TypeInfo eepro100_info = { + .name = TYPE_EEPRO100, + .parent = TYPE_PCI_DEVICE, + .class_init = eepro100_class_init, + .abstract = true, + .instance_size = sizeof(EEPRO100State), + .instance_init = eepro100_instance_init, + .interfaces = (InterfaceInfo[]) { + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + static void eepro100_register_types(void) { - size_t i; - for (i = 0; i < ARRAY_SIZE(e100_devices); i++) { - TypeInfo type_info = {}; - E100PCIDeviceInfo *info = &e100_devices[i]; + type_register_static(&eepro100_info); - type_info.name = info->name; - type_info.parent = TYPE_PCI_DEVICE; - type_info.class_init = eepro100_class_init; - type_info.instance_size = sizeof(EEPRO100State); - type_info.instance_init = eepro100_instance_init; - type_info.interfaces = (InterfaceInfo[]) { - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, + for (size_t i = 0; i < ARRAY_SIZE(e100_devices); i++) { + TypeInfo type_info = { + .name = e100_devices[i].name, + .parent = TYPE_EEPRO100, }; type_register(&type_info);