All of lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, Jason Wang <jasowang@redhat.com>
Subject: [PULL 11/21] e1000: Don't run e1000_instance_init() twice
Date: Fri, 15 May 2020 08:04:14 +0200	[thread overview]
Message-ID: <20200515060424.18993-12-armbru@redhat.com> (raw)
In-Reply-To: <20200515060424.18993-1-armbru@redhat.com>

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 <jasowang@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-12-armbru@redhat.com>
---
 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



  parent reply	other threads:[~2020-05-15  6:08 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-15  6:04 [PULL 00/21] QOM patches for 2020-05-15 Markus Armbruster
2020-05-15  6:04 ` [PULL 01/21] qom: Clearer reference counting in object_initialize_childv() Markus Armbruster
2020-05-15  6:04 ` [PULL 02/21] qom: Clean up inconsistent use of gchar * vs. char * Markus Armbruster
2020-05-15  6:04 ` [PULL 03/21] qom: Drop object_property_del_child()'s unused parameter @errp Markus Armbruster
2020-05-15  6:04 ` [PULL 04/21] qom: Simplify object_property_get_enum() Markus Armbruster
2020-05-15  6:04 ` [PULL 05/21] qom: Drop convenience method object_property_get_uint16List() Markus Armbruster
2020-05-15  6:04 ` [PULL 06/21] qom: Make all the object_property_add_FOO() return the property Markus Armbruster
2020-05-15  6:04 ` [PULL 07/21] qom: Drop object_property_set_description() parameter @errp Markus Armbruster
2020-05-15  6:04 ` [PULL 08/21] tests/check-qom-proplist: Improve iterator coverage Markus Armbruster
2020-05-15  6:04 ` [PULL 09/21] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256 Markus Armbruster
2020-05-15  6:04 ` [PULL 10/21] hw/isa/superio: Make the components QOM children Markus Armbruster
2020-05-15  6:04 ` Markus Armbruster [this message]
2020-05-15  6:04 ` [PULL 12/21] hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory Markus Armbruster
2020-05-15  6:04 ` [PULL 13/21] qdev: Clean up qdev_connect_gpio_out_named() Markus Armbruster
2020-05-15  6:04 ` [PULL 14/21] qom: Drop parameter @errp of object_property_add() & friends Markus Armbruster
2020-05-15  6:04 ` [PULL 15/21] Drop more @errp parameters after previous commit Markus Armbruster
2020-05-15  6:04 ` [PULL 16/21] qdev: Unrealize must not fail Markus Armbruster
2020-05-15  6:04 ` [PULL 17/21] spapr_pci: Drop some dead error handling Markus Armbruster
2020-05-15  6:04 ` [PULL 18/21] qom: Drop @errp parameter of object_property_del() Markus Armbruster
2020-05-15  6:04 ` [PULL 19/21] target: Remove unnecessary CPU() cast Markus Armbruster
2020-05-15  6:04 ` [PULL 20/21] various: Remove unnecessary OBJECT() cast Markus Armbruster
2020-05-15  6:04 ` [PULL 21/21] hw: Remove unnecessary DEVICE() cast Markus Armbruster
2020-05-15  7:17 ` [PULL 00/21] QOM patches for 2020-05-15 no-reply
2020-05-15  8:54 ` no-reply
2020-05-15 10:17 ` Peter Maydell
2020-05-15 14:34 ` no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200515060424.18993-12-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.