From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35440)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UtnVh-0007er-W5
	for qemu-devel@nongnu.org; Mon, 01 Jul 2013 19:27:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UtnVg-0000Zf-Ee
	for qemu-devel@nongnu.org; Mon, 01 Jul 2013 19:27:53 -0400
Message-ID: <51D21072.501@suse.de>
Date: Tue, 02 Jul 2013 01:27:46 +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-19-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1372169705-7645-19-git-send-email-pbonzini@redhat.com>
Content-Type: multipart/mixed; boundary="------------060201030701000600040108"
Subject: Re: [Qemu-devel] [PATCH 18/24] hw/i*: 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.
--------------060201030701000600040108
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable

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

Needs 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

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

diff --cc hw/intc/openpic.c
index b9e025f,d324b1e..0000000
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@@ -1527,17 -1526,9 +1527,17 @@@ static void map_list(OpenPICState *opp
      }
  }
  
 -static int openpic_init(SysBusDevice *dev)
 +static void openpic_init(Object *obj)
  {
 -    OpenPICState *opp = FROM_SYSBUS(typeof (*opp), dev);
 +    OpenPICState *opp = OPENPIC(obj);
 +
-     memory_region_init(&opp->mem, NULL, "openpic", 0x40000);
++    memory_region_init(&opp->mem, obj, "openpic", 0x40000);
 +}
 +
 +static void openpic_realize(DeviceState *dev, Error **errp)
 +{
 +    SysBusDevice *d = SYS_BUS_DEVICE(dev);
 +    OpenPICState *opp = OPENPIC(dev);
      int i, j;
      int list_count = 0;
      static const MemReg list_le[] = {
diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index 6775879..2f73193 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -155,7 +155,7 @@ static void kvm_openpic_init(Object *obj)
 {
     KVMOpenPICState *opp = KVM_OPENPIC(obj);
 
-    memory_region_init_io(&opp->mem, &kvm_openpic_mem_ops, opp,
+    memory_region_init_io(&opp->mem, obj, &kvm_openpic_mem_ops, opp,
                           "kvm-openpic", 0x40000);
 }
 

--------------060201030701000600040108--