From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47723)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <thuth@redhat.com>) id 1a5szL-0000DQ-M6
	for qemu-devel@nongnu.org; Mon, 07 Dec 2015 05:25:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <thuth@redhat.com>) id 1a5szH-00011B-Nc
	for qemu-devel@nongnu.org; Mon, 07 Dec 2015 05:25:47 -0500
References: <1449459280-14983-1-git-send-email-david@gibson.dropbear.id.au>
	<1449459280-14983-4-git-send-email-david@gibson.dropbear.id.au>
From: Thomas Huth <thuth@redhat.com>
Message-ID: <56655EA2.2040201@redhat.com>
Date: Mon, 7 Dec 2015 11:25:38 +0100
MIME-Version: 1.0
In-Reply-To: <1449459280-14983-4-git-send-email-david@gibson.dropbear.id.au>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCHv2 03/10] pseries: Remove redundant calls to
 spapr_machine_initfn()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: David Gibson <david@gibson.dropbear.id.au>, ehabkost@redhat.com, agraf@suse.de, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com
Cc: lvivier@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org

On 07/12/15 04:34, David Gibson wrote:
> 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 <david@gibson.dropbear.id.au>
> ---
>  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)

Right, I just checked, and without this patch, spapr_machine_initfn() is
indeed called twice.

Reviewed-by: Thomas Huth <thuth@redhat.com>