From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIUE2-0007px-KQ for qemu-devel@nongnu.org; Sun, 10 Jan 2016 23:37:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIUDy-0004RI-RB for qemu-devel@nongnu.org; Sun, 10 Jan 2016 23:37:02 -0500 From: David Gibson Date: Mon, 11 Jan 2016 15:37:28 +1100 Message-Id: <1452487058-17182-7-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1452487058-17182-1-git-send-email-david@gibson.dropbear.id.au> References: <1452487058-17182-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PULL 06/16] pseries: Remove redundant calls to spapr_machine_initfn() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, mdroth@linux.vnet.ibm.com, aik@ozlabs.ru Cc: lvivier@redhat.com, thuth@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson The instance_init() functions for several of the pseries-x.y versioned machine types explicitly call spapr_machine_initfn(). But that's the instance_init function for the common parent of all those machine types, so will already have been called beforehand by the QOM infrastructure. Remove the redundant calls. Signed-off-by: David Gibson Reviewed-by: Thomas Huth Reviewed-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c126e10..c7c6517 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2366,7 +2366,6 @@ static void spapr_compat_2_3(Object *obj) static void spapr_machine_2_3_instance_init(Object *obj) { spapr_compat_2_3(obj); - spapr_machine_initfn(obj); } static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data) @@ -2409,7 +2408,6 @@ static void spapr_compat_2_2(Object *obj) static void spapr_machine_2_2_instance_init(Object *obj) { spapr_compat_2_2(obj); - spapr_machine_initfn(obj); } static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data) @@ -2446,7 +2444,6 @@ static void spapr_compat_2_1(Object *obj) static void spapr_machine_2_1_instance_init(Object *obj) { spapr_compat_2_1(obj); - spapr_machine_initfn(obj); } static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data) -- 2.5.0