From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:37422)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1Qxxnw-00013h-Am
	for qemu-devel@nongnu.org; Mon, 29 Aug 2011 05:06:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1Qxxnv-0000aE-70
	for qemu-devel@nongnu.org; Mon, 29 Aug 2011 05:06:52 -0400
Received: from mx1.redhat.com ([209.132.183.28]:23426)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1Qxxnu-0000a8-Up
	for qemu-devel@nongnu.org; Mon, 29 Aug 2011 05:06:51 -0400
Message-ID: <4E5B56A7.6010006@redhat.com>
Date: Mon, 29 Aug 2011 12:06:47 +0300
From: Avi Kivity <avi@redhat.com>
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: Anthony Liguori <anthony@codemonkey.ws>, qemu-devel <qemu-devel@nongnu.org>

On 08/28/2011 06:52 PM, 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.
>
> Avi Kivity (2):
>       memory: fix memory_region_init_rom_device() not initializing ->ops
>       memory: add opaque parameter to memory_region_init_rom_device()
>

I tacked on a third commit:

commit b5fe14cc7efa4e3ef58f591728e69203287a9de4
Author: Avi Kivity <avi@redhat.com>
Date:   Mon Aug 29 09:12:49 2011 +0300

     memory: fix rom_device I/O mode

     When adding a rom_device in I/O mode, we incorrectly masked off the low
     bits, resulting in a pure RAM map.  Fix my masking off the high 
bits and
     IO_MEM_ROMD, yielding a pure I/O map.

     Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/memory.c b/memory.c
index 1491a39..eb31fa8 100644
--- a/memory.c
+++ b/memory.c
@@ -304,7 +304,7 @@ static void as_memory_range_add(AddressSpace *as, 
FlatRange *fr)
      }

      if (!fr->readable) {
-        phys_offset &= TARGET_PAGE_MASK;
+        phys_offset &= ~TARGET_PAGE_MASK & ~IO_MEM_ROMD;
      }

      cpu_register_physical_memory_log(fr->addr.start,


-- 
error compiling committee.c: too many arguments to function