From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36620)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UtnYn-0000bG-IY
	for qemu-devel@nongnu.org; Mon, 01 Jul 2013 19:31:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UtnYm-0001pC-Kk
	for qemu-devel@nongnu.org; Mon, 01 Jul 2013 19:31:05 -0400
Message-ID: <51D21134.1050900@suse.de>
Date: Tue, 02 Jul 2013 01:31:00 +0200
From: =?ISO-8859-15?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1372169705-7645-1-git-send-email-pbonzini@redhat.com>
	<1372169705-7645-22-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1372169705-7645-22-git-send-email-pbonzini@redhat.com>
Content-Type: multipart/mixed; boundary="------------010304080504050008000709"
Subject: Re: [Qemu-devel] [PATCH 21/24] hw/p*: pass owner to
	memory_region_init_io
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: Paolo Bonzini <pbonzini@redhat.com>
Cc: peter.maydell@linaro.org, alex.williamson@redhat.com, qemu-ppc <qemu-ppc@nongnu.org>, qemu-devel@nongnu.org, Alexander Graf <agraf@suse.de>

This is a multi-part message in MIME format.
--------------010304080504050008000709
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable

Am 25.06.2013 16:15, schrieb Paolo Bonzini:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Needs an update after ppc-next merge, cf. attached.

Andreas

--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe=
rg

--------------010304080504050008000709
Content-Type: text/x-patch;
 name="owner_p.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="owner_p.diff"

diff --cc hw/ppc/mpc8544_guts.c
index 56249b4,6448772..0000000
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@@ -114,14 -108,24 +114,14 @@@ static const MemoryRegionOps mpc8544_gu
      },
  };
  
 -static int mpc8544_guts_initfn(SysBusDevice *dev)
 -{
 -    GutsState *s;
 -
 -    s = FROM_SYSBUS(GutsState, SYS_BUS_DEVICE(dev));
 -
 -    memory_region_init_io(&s->iomem, OBJECT(s), &mpc8544_guts_ops, s,
 -                          "mpc6544.guts", MPC8544_GUTS_MMIO_SIZE);
 -    sysbus_init_mmio(dev, &s->iomem);
 -
 -    return 0;
 -}
 -
 -static void mpc8544_guts_class_init(ObjectClass *klass, void *data)
 +static void mpc8544_guts_initfn(Object *obj)
  {
 -    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 +    SysBusDevice *d = SYS_BUS_DEVICE(obj);
 +    GutsState *s = MPC8544_GUTS(obj);
  
-     memory_region_init_io(&s->iomem, NULL, &mpc8544_guts_ops, s,
 -    k->init = mpc8544_guts_initfn;
++    memory_region_init_io(&s->iomem, obj, &mpc8544_guts_ops, s,
 +                          "mpc8544.guts", MPC8544_GUTS_MMIO_SIZE);
 +    sysbus_init_mmio(d, &s->iomem);
  }
  
  static const TypeInfo mpc8544_guts_info = {

--------------010304080504050008000709--