From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Thu, 30 Apr 2009 08:17:39 +0000 (+0200)
Subject: kvm: Relax aligment check of kvm_set_phys_mem
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e6f4afe029ae21853fd6625d94e9e0b2caa4defd;p=qemu.git

kvm: Relax aligment check of kvm_set_phys_mem

There is no need to reject an unaligned memory region registration if
the region will be I/O memory and it will not split an existing KVM
slot. This fixes KVM support on PPC.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/kvm-all.c b/kvm-all.c
index 32cd636f8f..0da5c7aa8d 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -583,7 +583,15 @@ void kvm_set_phys_mem(target_phys_addr_t start_addr,
     int err;
 
     if (start_addr & ~TARGET_PAGE_MASK) {
-        fprintf(stderr, "Only page-aligned memory slots supported\n");
+        if (flags >= IO_MEM_UNASSIGNED) {
+            if (!kvm_lookup_overlapping_slot(s, start_addr,
+                                             start_addr + size)) {
+                return;
+            }
+            fprintf(stderr, "Unaligned split of a KVM memory slot\n");
+        } else {
+            fprintf(stderr, "Only page-aligned memory slots supported\n");
+        }
         abort();
     }