[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/21] e1000: Don't run e1000_instance_init() twice
From: |
Markus Armbruster |
Subject: |
[PULL 11/21] e1000: Don't run e1000_instance_init() twice |
Date: |
Fri, 15 May 2020 08:04:14 +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>
Message-Id: <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
- [PULL 08/21] tests/check-qom-proplist: Improve iterator coverage, (continued)
- [PULL 08/21] tests/check-qom-proplist: Improve iterator coverage, Markus Armbruster, 2020/05/15
- [PULL 07/21] qom: Drop object_property_set_description() parameter @errp, Markus Armbruster, 2020/05/15
- [PULL 17/21] spapr_pci: Drop some dead error handling, Markus Armbruster, 2020/05/15
- [PULL 10/21] hw/isa/superio: Make the components QOM children, Markus Armbruster, 2020/05/15
- [PULL 09/21] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256, Markus Armbruster, 2020/05/15
- [PULL 06/21] qom: Make all the object_property_add_FOO() return the property, Markus Armbruster, 2020/05/15
- [PULL 15/21] Drop more @errp parameters after previous commit, Markus Armbruster, 2020/05/15
- [PULL 19/21] target: Remove unnecessary CPU() cast, Markus Armbruster, 2020/05/15
- [PULL 16/21] qdev: Unrealize must not fail, Markus Armbruster, 2020/05/15
- [PULL 04/21] qom: Simplify object_property_get_enum(), Markus Armbruster, 2020/05/15
- [PULL 11/21] e1000: Don't run e1000_instance_init() twice,
Markus Armbruster <=
- [PULL 20/21] various: Remove unnecessary OBJECT() cast, Markus Armbruster, 2020/05/15
- [PULL 21/21] hw: Remove unnecessary DEVICE() cast, Markus Armbruster, 2020/05/15
- [PULL 14/21] qom: Drop parameter @errp of object_property_add() & friends, Markus Armbruster, 2020/05/15
- [PULL 12/21] hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory, Markus Armbruster, 2020/05/15
- Re: [PULL 00/21] QOM patches for 2020-05-15, no-reply, 2020/05/15
- Re: [PULL 00/21] QOM patches for 2020-05-15, no-reply, 2020/05/15
- Re: [PULL 00/21] QOM patches for 2020-05-15, Peter Maydell, 2020/05/15
- Re: [PULL 00/21] QOM patches for 2020-05-15, no-reply, 2020/05/15