From: Glauber Costa <[EMAIL PROTECTED]>

kvm_qemu_create_context() will fail if we don't have
userspace memory capability, so no need to check it here.

Signed-off-by: Glauber Costa <[EMAIL PROTECTED]>
---
 qemu/vl.c |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/qemu/vl.c b/qemu/vl.c
index b34a114..25a1ee9 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -9934,20 +9934,12 @@ int main(int argc, char **argv)
                    fprintf(stderr, "Could not create KVM context\n");
                    exit(1);
            }
-#ifdef KVM_CAP_USER_MEMORY
-{
-            int ret;
 
-            ret = kvm_qemu_check_extension(KVM_CAP_USER_MEMORY);
-            if (ret) {
-                phys_ram_base = qemu_alloc_physram(phys_ram_size);
-               if (!phys_ram_base) {
-                       fprintf(stderr, "Could not allocate physical memory\n");
-                       exit(1);
-               }
-            }
-}
-#endif
+        phys_ram_base = qemu_alloc_physram(phys_ram_size);
+           if (!phys_ram_base) {
+                   fprintf(stderr, "Could not allocate physical memory\n");
+                   exit(1);
+           }
     } else {
            phys_ram_base = qemu_vmalloc(phys_ram_size);
            if (!phys_ram_base) {
-- 
1.5.5.1

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to