From: Markus Armbruster Date: Tue, 5 May 2020 15:29:19 +0000 (+0200) Subject: e1000: Don't run e1000_instance_init() twice X-Git-Tag: v5.1.0-rc0~126^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a13f20422dc657719c3fa335788300c7ccf464ee;p=thirdparty%2Fqemu.git e1000: Don't run e1000_instance_init() twice 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 Signed-off-by: Markus Armbruster Acked-by: Jason Wang Reviewed-by: Paolo Bonzini Message-Id: <20200505152926.18877-12-armbru@redhat.com> --- diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 2a69eee63f2..0d2c2759e36 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); }