From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L2ogn-00016u-56
	for qemu-devel@nongnu.org; Wed, 19 Nov 2008 10:09:57 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L2ogm-00016c-Id
	for qemu-devel@nongnu.org; Wed, 19 Nov 2008 10:09:56 -0500
Received: from [199.232.76.173] (port=34457 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L2ogm-00016U-FC
	for qemu-devel@nongnu.org; Wed, 19 Nov 2008 10:09:56 -0500
Received: from savannah.gnu.org ([199.232.41.3]:60457 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1L2ogl-0003vR-Ry
	for qemu-devel@nongnu.org; Wed, 19 Nov 2008 10:09:56 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L2ogl-0002Ye-7S
	for qemu-devel@nongnu.org; Wed, 19 Nov 2008 15:09:55 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1L2ogk-0002Ya-Vs
	for qemu-devel@nongnu.org; Wed, 19 Nov 2008 15:09:55 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1L2ogk-0002Ya-Vs@cvs.savannah.gnu.org>
Date: Wed, 19 Nov 2008 15:09:55 +0000
Subject: [Qemu-devel] [5753] kvm: de-register mem region for MMIO (Glauber
	Costa)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5753
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5753
Author:   aliguori
Date:     2008-11-19 15:09:54 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
kvm: de-register mem region for MMIO (Glauber Costa)

Besides unassigned memory, we also don't care about MMIO.
So if we're giving an MMIO area that is already registered,
wipe it out.

Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/kvm-all.c

Modified: trunk/kvm-all.c
===================================================================
--- trunk/kvm-all.c	2008-11-19 15:03:36 UTC (rev 5752)
+++ trunk/kvm-all.c	2008-11-19 15:09:54 UTC (rev 5753)
@@ -322,7 +322,7 @@
 
     mem = kvm_lookup_slot(s, start_addr);
     if (mem) {
-        if (flags == IO_MEM_UNASSIGNED) {
+        if ((flags == IO_MEM_UNASSIGNED) || (flags >= TLB_MMIO)) {
             mem->memory_size = 0;
             mem->guest_phys_addr = start_addr;
             mem->userspace_addr = 0;