[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 11/18] e1000: Don't run e1000_instance_init() twice
From: |
Markus Armbruster |
Subject: |
[PATCH v2 11/18] e1000: Don't run e1000_instance_init() twice |
Date: |
Tue, 5 May 2020 17:29:19 +0200 |
QOM object initialization runs .instance_init() for the type and all
its supertypes; see object_init_with_type().
Both TYPE_E1000_BASE and its concrete subtypes set .instance_init() to
e1000_instance_init(). For the concrete subtypes, it duly gets run
twice. The second run fails, but the error gets ignored (a later
commit will change that).
Remove it from the subtypes.
Cc: Jason Wang <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Acked-by: Jason Wang <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
hw/net/e1000.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 2a69eee63f..0d2c2759e3 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -1824,7 +1824,6 @@ static void e1000_register_types(void)
type_info.parent = TYPE_E1000_BASE;
type_info.class_data = (void *)info;
type_info.class_init = e1000_class_init;
- type_info.instance_init = e1000_instance_init;
type_register(&type_info);
}
--
2.21.1
- [PATCH v2 00/18] qom: Spring cleaning, Markus Armbruster, 2020/05/05
- [PATCH v2 01/18] qom: Clearer reference counting in object_initialize_childv(), Markus Armbruster, 2020/05/05
- [PATCH v2 04/18] qom: Simplify object_property_get_enum(), Markus Armbruster, 2020/05/05
- [PATCH v2 11/18] e1000: Don't run e1000_instance_init() twice,
Markus Armbruster <=
- [PATCH v2 05/18] qom: Drop convenience method object_property_get_uint16List(), Markus Armbruster, 2020/05/05
- [PATCH v2 02/18] qom: Clean up inconsistent use of gchar * vs. char *, Markus Armbruster, 2020/05/05
- [PATCH v2 13/18] qdev: Clean up qdev_connect_gpio_out_named(), Markus Armbruster, 2020/05/05
- [PATCH v2 06/18] qom: Make all the object_property_add_FOO() return the property, Markus Armbruster, 2020/05/05
- [PATCH v2 08/18] tests/check-qom-proplist: Improve iterator coverage, Markus Armbruster, 2020/05/05
- [PATCH v2 15/18] Drop more @errp parameters after previous commit, Markus Armbruster, 2020/05/05
- [PATCH v2 18/18] qom: Drop @errp parameter of object_property_del(), Markus Armbruster, 2020/05/05