From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:39528)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Qy3C6-0001z5-Hj
	for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:52:11 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Qy3C4-0000np-5r
	for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:52:10 -0400
Received: from mail-gy0-f173.google.com ([209.85.160.173]:53001)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Qy3C4-0000mJ-3B
	for qemu-devel@nongnu.org; Mon, 29 Aug 2011 10:52:08 -0400
Received: by gyd12 with SMTP id 12so5543682gyd.4
	for <qemu-devel@nongnu.org>; Mon, 29 Aug 2011 07:52:07 -0700 (PDT)
Message-ID: <4E5BA795.9010909@codemonkey.ws>
Date: Mon, 29 Aug 2011 09:52:05 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <4E5A6431.5060309@redhat.com>
In-Reply-To: <4E5A6431.5060309@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PULL] Memory API fixes - rom/device
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: Avi Kivity <avi@redhat.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

On 08/28/2011 10:52 AM, Avi Kivity wrote:
> Anthony, please pull from
>
> git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/core
>
> to receive fixes for the rom/device API - initialize ->ops and a new
> ->opaque.

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Avi Kivity (2):
> memory: fix memory_region_init_rom_device() not initializing ->ops
> memory: add opaque parameter to memory_region_init_rom_device()
>
> memory.c | 3 +++
> memory.h | 1 +
> 2 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/memory.c b/memory.c
> index 8e9ac46..1491a39 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -962,11 +962,14 @@ void memory_region_init_alias(MemoryRegion *mr,
>
> void memory_region_init_rom_device(MemoryRegion *mr,
> const MemoryRegionOps *ops,
> + void *opaque,
> DeviceState *dev,
> const char *name,
> uint64_t size)
> {
> memory_region_init(mr, name, size);
> + mr->ops = ops;
> + mr->opaque = opaque;
> mr->terminates = true;
> mr->destructor = memory_region_destructor_rom_device;
> mr->ram_addr = qemu_ram_alloc(dev, name, size);
> diff --git a/memory.h b/memory.h
> index 0553cc7..06b83ae 100644
> --- a/memory.h
> +++ b/memory.h
> @@ -235,6 +235,7 @@ void memory_region_init_alias(MemoryRegion *mr,
> */
> void memory_region_init_rom_device(MemoryRegion *mr,
> const MemoryRegionOps *ops,
> + void *opaque,
> DeviceState *dev, /* FIXME: layering violation */
> const char *name,
> uint64_t size);
>
>