From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LDMG4-0007xo-VR for qemu-devel@nongnu.org; Thu, 18 Dec 2008 12:01:57 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LDMG1-0007vB-05 for qemu-devel@nongnu.org; Thu, 18 Dec 2008 12:01:54 -0500 Received: from [199.232.76.173] (port=47962 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LDMFz-0007tq-K1 for qemu-devel@nongnu.org; Thu, 18 Dec 2008 12:01:51 -0500 Received: from mx2.redhat.com ([66.187.237.31]:34492) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LDMFy-00009t-2B for qemu-devel@nongnu.org; Thu, 18 Dec 2008 12:01:50 -0500 From: Glauber Costa Date: Thu, 18 Dec 2008 12:01:37 -0500 Message-Id: <1229619702-26315-2-git-send-email-glommer@redhat.com> In-Reply-To: <1229619702-26315-1-git-send-email-glommer@redhat.com> References: <1229619702-26315-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] remove smaller slots if registering a bigger one Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Ian.Jackson@eu.citrix.com, avi@redhat.com, kvm@vger.kernel.org, stefano.stabellini@eu.citrix.com It's like a shark eating a bunch of small fishes: in some situations (vga linear frame buffer mapping, for example), we need to register a new slot in place of older, smaller ones. This patch handles this case Signed-off-by: Glauber Costa --- kvm-all.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 11034df..3c12c37 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -582,6 +582,16 @@ void kvm_set_phys_mem(target_phys_addr_t start_addr, kvm_set_phys_mem(mem_start, mem_size, mem_offset); return; + } else if (start_addr <= mem->start_addr && + (start_addr + size) >= (mem->start_addr + + mem->memory_size)) { + KVMSlot slot; + /* unregister whole slot */ + memcpy(&slot, mem, sizeof(slot)); + mem->memory_size = 0; + kvm_set_user_memory_region(s, mem); + + kvm_set_phys_mem(start_addr, size, phys_offset); } else { printf("Registering overlapping slot\n"); abort(); -- 1.5.6.5