qemu-kvm

diff -u ../orig/kvm-2/user/kvmctl.c user/kvmctl.c
@@ -61,8 +61,8 @@
 
 	fd = open("/dev/kvm", O_RDWR);
 	if (fd == -1) {
-		printf("open: %m\n");
-		exit(1);
+		perror("open");
+		return NULL;
 	}
 	kvm = malloc(sizeof(*kvm));
 	kvm->fd = fd;

@@ -71,6 +71,12 @@
 	return kvm;
 }
 
+void kvm_finalize(kvm_context_t kvm)
+{
+	close(kvm->fd);
+	free(kvm);
+}
+
 int kvm_create(kvm_context_t kvm, unsigned long memory, void **vm_mem)
 {
 	unsigned long dosmem = 0xa0000;

@@ -91,28 +97,28 @@
 	/* 640K should be enough. */
 	r = ioctl(fd, KVM_SET_MEMORY_REGION, &low_memory);
 	if (r == -1) {
-		printf("kvm_create_memory_region: %m\n");
-		exit(1);
+		fprintf(stderr, "kvm_create_memory_region: %m\n");
+		return -1;
 	}
 	if (extended_memory.memory_size) {
 		r = ioctl(fd, KVM_SET_MEMORY_REGION, &extended_memory);
 		if (r == -1) {
-			printf("kvm_create_memory_region: %m\n");
-			exit(1);
+			fprintf(stderr, "kvm_create_memory_region: %m\n");
+			return -1;
 		}
 	}
 
 	*vm_mem = mmap(0, memory, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
 	if (*vm_mem == MAP_FAILED) {
-		printf("mmap: %m\n");
-		exit(1);
+		fprintf(stderr, "mmap: %m\n");
+		return -1;
 	}
 	kvm->physical_memory = *vm_mem;
 
 	r = ioctl(fd, KVM_CREATE_VCPU, 0);
 	if (r == -1) {
-		printf("kvm_create_vcpu: %m\n");
-		exit(1);
+		fprintf(stderr, "kvm_create_vcpu: %m\n");
+		return -1;
 	}
 	return 0;
 }

@@ -174,7 +180,7 @@
 		return run->io.count != 0;
 }
 
-int handle_io(kvm_context_t kvm, struct kvm_run *run)
+static int handle_io(kvm_context_t kvm, struct kvm_run *run)
 {
 	uint16_t addr = run->io.port;
 	struct kvm_regs regs;

@@ -199,8 +205,8 @@
 			r = translate(kvm, run->vcpu, &tr, run->io.address, 
 				      &value_addr);
 			if (r) {
-				printf("failed translating I/O address %x\n",
-				       run->io.address);
+				fprintf(stderr, "failed translating I/O address %x\n",
+					run->io.address);
 				exit(1);
 			}
 		}

@@ -227,7 +233,7 @@
 				break;
 			}
 			default:
-				printf("bad I/O size\n");
+				fprintf(stderr, "bad I/O size\n");
 				exit(1);
 			}
 			break;

@@ -247,12 +253,12 @@
 						     *(uint32_t *)value_addr);
 				break;
 			default:
-				printf("bad I/O size\n");
+				fprintf(stderr, "bad I/O size\n");
 				exit(1);
 			}
 			break;
 		default:
-			printf("bad I/O size\n");
+			fprintf(stderr, "bad I/O size\n");
 			exit(1);
 		}
 		if (run->io.string) {

@@ -319,16 +325,17 @@
 		perror("KVM_GET_REGS");
 		exit(1);
 	}
-	printf("rax %016llx rbx %016llx rcx %016llx rdx %016llx\n"
-	       "rsi %016llx rdi %016llx rsp %016llx rbp %016llx\n"
-	       "r8  %016llx r9  %016llx r10 %016llx r11 %016llx\n"
-	       "r12 %016llx r13 %016llx r14 %016llx r15 %016llx\n"
-	       "rip %016llx rflags %08llx\n",
-	       regs.rax, regs.rbx, regs.rcx, regs.rdx,
-	       regs.rsi, regs.rdi, regs.rsp, regs.rbp,
-	       regs.r8,  regs.r9,  regs.r10, regs.r11,
-	       regs.r12, regs.r13, regs.r14, regs.r15,
-	       regs.rip, regs.rflags);
+	fprintf(stderr,
+		"rax %016llx rbx %016llx rcx %016llx rdx %016llx\n"
+		"rsi %016llx rdi %016llx rsp %016llx rbp %016llx\n"
+		"r8  %016llx r9  %016llx r10 %016llx r11 %016llx\n"
+		"r12 %016llx r13 %016llx r14 %016llx r15 %016llx\n"
+		"rip %016llx rflags %08llx\n",
+		regs.rax, regs.rbx, regs.rcx, regs.rdx,
+		regs.rsi, regs.rdi, regs.rsp, regs.rbp,
+		regs.r8,  regs.r9,  regs.r10, regs.r11,
+		regs.r12, regs.r13, regs.r14, regs.r15,
+		regs.rip, regs.rflags);
 }
 
 static int handle_cpuid(kvm_context_t kvm, struct kvm_run *run)

@@ -423,20 +430,20 @@
 	}
 	switch (kvm_run.exit_type) {
 	case KVM_EXIT_TYPE_FAIL_ENTRY:
-		printf("kvm_run: failed entry, reason %u\n", 
-		       kvm_run.exit_reason & 0xffff);
+		fprintf(stderr, "kvm_run: failed entry, reason %u\n", 
+			kvm_run.exit_reason & 0xffff);
 		exit(1);
 		break;
 	case KVM_EXIT_TYPE_VM_EXIT:
 		switch (kvm_run.exit_reason) {
 		case KVM_EXIT_UNKNOWN:
-			printf("unhandled vm exit:  0x%x\n", 
+			fprintf(stderr, "unhandled vm exit:  0x%x\n", 
 			       kvm_run.hw.hardware_exit_reason);
 			kvm_show_regs(kvm, vcpu);
 			abort();
 			break;
 		case KVM_EXIT_EXCEPTION:
-			printf("exception %d (%x)\n", 
+			fprintf(stderr, "exception %d (%x)\n", 
 			       kvm_run.ex.exception,
 			       kvm_run.ex.error_code);
 			abort();

@@ -457,7 +464,7 @@
 			r = handle_halt(kvm, &kvm_run);
 			break;
 		default:
-			printf("unhandled vm exit: 0x%x\n", kvm_run.exit_reason);
+			fprintf(stderr, "unhandled vm exit: 0x%x\n", kvm_run.exit_reason);
 			kvm_show_regs(kvm, vcpu);
 			abort();
 			break;

diff -u ../orig/kvm-2/user/kvmctl.h user/kvmctl.h
@@ -31,8 +31,11 @@
     int (*io_window)(void *opaque);
 };
 
+/* Create a new kvm context */
 kvm_context_t kvm_init(struct kvm_callbacks *callbacks,
 		       void *opaque);
+/* Cleanup the kvm context */
+void kvm_finalize(kvm_context_t kvm);
 int kvm_create(kvm_context_t kvm,
 	       unsigned long phys_mem_bytes,
 	       void **phys_mem);

diff -u ../orig/kvm-2/user/main.c user/main.c
@@ -120,7 +120,15 @@
 	void *vm_mem;
 
 	kvm = kvm_init(&test_callbacks, 0);
-	kvm_create(kvm, 128 * 1024 * 1024, &vm_mem);
+	if (!kvm) {
+	    fprintf(stderr, "kvm_init failed\n");
+	    return 1;
+	}
+	if (kvm_create(kvm, 128 * 1024 * 1024, &vm_mem) < 0) {
+	    kvm_finalize(kvm);
+	    fprintf(stderr, "kvm_create failed\n");
+	    return 1;
+	}
 	if (ac > 1)
 	    load_file(vm_mem + 0xf0000, av[1]);
 	if (ac > 2)

@@ -128,4 +136,6 @@
 	kvm_show_regs(kvm, 0);
 
 	kvm_run(kvm, 0);
+
+	return 0;
 }

diff -u ../orig/kvm-2/qemu/qemu-kvm.c qemu/qemu-kvm.c
@@ -450,10 +450,20 @@
     .io_window = kvm_io_window,
 };
 
-void kvm_qemu_init()
+int kvm_qemu_init()
 {
+    /* Try to initialize kvm */
     kvm_context = kvm_init(&qemu_kvm_ops, saved_env);
-    kvm_create(kvm_context, phys_ram_size, (void**)&phys_ram_base);
+    if (!kvm_context) {
+      	return -1;
+    }
+    phys_ram_size += KVM_EXTRA_PAGES * 4096;
+    if (kvm_create(kvm_context, phys_ram_size, (void**)&phys_ram_base) < 0) {
+	kvm_finalize(kvm_context);
+	return -1;
+    }
+
+    return 0;
 }
 
 int kvm_update_debugger(CPUState *env)

diff -u ../orig/kvm-2/qemu/qemu-kvm.h qemu/qemu-kvm.h
@@ -3,7 +3,9 @@
 
 #include "kvmctl.h"
 
-void kvm_qemu_init(void);
+#define KVM_EXTRA_PAGES 3
+
+int kvm_qemu_init(void);
 void kvm_load_registers(CPUState *env);
 int kvm_cpu_exec(CPUState *env);
 int kvm_update_debugger(CPUState *env);

diff -u ../orig/kvm-2/qemu/vl.c qemu/vl.c
@@ -6099,20 +6099,24 @@
     }
 
     /* init the memory */
-#if USE_KVM
     phys_ram_size = ram_size + vga_ram_size + bios_size;
+#if USE_KVM
+    /* Initialize kvm */
     if (kvm_allowed) {
-	    phys_ram_size += KVM_EXTRA_PAGES * 4096;
-	    kvm_qemu_init();
-    } else {
-	    phys_ram_base = qemu_vmalloc(phys_ram_size);
-	    if (!phys_ram_base) {
-		    fprintf(stderr, "Could not allocate physical memory\n");
-		    exit(1);
-	    }
+	if (kvm_qemu_init() < 0) {
+	    fprintf(stderr, "Could not initialize KVM\n");
+	    kvm_allowed = 0;
+	}
+    }
+    /* Fall back to normal qemu if KVM fails */
+    if (!kvm_allowed) {
+	phys_ram_base = qemu_vmalloc(phys_ram_size);
+	if (!phys_ram_base) {
+	    fprintf(stderr, "Could not allocate physical memory\n");
+	    exit(1);
+	}
     }
 #else
-    phys_ram_size = ram_size + vga_ram_size + bios_size;
     phys_ram_base = qemu_vmalloc(phys_ram_size);
     if (!phys_ram_base) {
         fprintf(stderr, "Could not allocate physical memory\n");

diff -u ../orig/kvm-2/qemu/vl.h qemu/vl.h
@@ -162,10 +162,6 @@
 #define BIOS_SIZE ((256 + 64) * 1024)
 #endif
 
-#if USE_KVM
-#define KVM_EXTRA_PAGES 3
-#endif
-
 /* keyboard/mouse support */
 
 #define MOUSE_EVENT_LBUTTON 0x01

diff -u ../orig/kvm-2/qemu/qemu-kvm.c qemu/qemu-kvm.c
@@ -450,10 +450,30 @@
     .io_window = kvm_io_window,
 };
 
-void kvm_qemu_init()
+int kvm_qemu_init()
 {
+    /* Try to initialize kvm */
     kvm_context = kvm_init(&qemu_kvm_ops, saved_env);
-    kvm_create(kvm_context, phys_ram_size, (void**)&phys_ram_base);
+    if (!kvm_context) {
+      	return -1;
+    }
+
+    return 0;
+}
+
+int kvm_qemu_create_context(void)
+{
+    if (kvm_create(kvm_context, phys_ram_size, (void**)&phys_ram_base) < 0) {
+	kvm_qemu_destroy();
+	return -1;
+    }
+
+    return 0;
+}
+
+void kvm_qemu_destroy(void)
+{
+    kvm_finalize(kvm_context);
 }
 
 int kvm_update_debugger(CPUState *env)

diff -u ../orig/kvm-2/qemu/qemu-kvm.h qemu/qemu-kvm.h
@@ -3,7 +3,9 @@
 
 #include "kvmctl.h"
 
-void kvm_qemu_init(void);
+int kvm_qemu_init(void);
+int kvm_qemu_create_context(void);
+void kvm_qemu_destroy(void);
 void kvm_load_registers(CPUState *env);
 int kvm_cpu_exec(CPUState *env);
 int kvm_update_debugger(CPUState *env);

diff -u ../orig/kvm-2/qemu/vl.c qemu/vl.c
@@ -5706,6 +5706,10 @@
 
     nb_nics = 0;
     /* default mac address of the first network interface */
+#if USE_KVM
+    if (kvm_qemu_init() < 0)
+	kvm_allowed = 0;
+#endif
     
     optind = 1;
     for(;;) {

@@ -6099,11 +6103,15 @@
     }
 
     /* init the memory */
-#if USE_KVM
     phys_ram_size = ram_size + vga_ram_size + bios_size;
+#if USE_KVM
+    /* Initialize kvm */
     if (kvm_allowed) {
 	    phys_ram_size += KVM_EXTRA_PAGES * 4096;
-	    kvm_qemu_init();
+	    if (kvm_qemu_create_context() < 0) {
+		    fprintf(stderr, "Could not create KVM context\n");
+		    exit(1);
+	    }
     } else {
 	    phys_ram_base = qemu_vmalloc(phys_ram_size);
 	    if (!phys_ram_base) {

@@ -6112,7 +6120,6 @@
 	    }
     }
 #else
-    phys_ram_size = ram_size + vga_ram_size + bios_size;
     phys_ram_base = qemu_vmalloc(phys_ram_size);
     if (!phys_ram_base) {
         fprintf(stderr, "Could not allocate physical memory\n");

diff -u ../orig/kvm-2/qemu/qemu-kvm.c qemu/qemu-kvm.c
@@ -450,10 +450,30 @@
     .io_window = kvm_io_window,
 };
 
-void kvm_qemu_init()
+int kvm_qemu_init()
 {
+    /* Try to initialize kvm */
     kvm_context = kvm_init(&qemu_kvm_ops, saved_env);
-    kvm_create(kvm_context, phys_ram_size, (void**)&phys_ram_base);
+    if (!kvm_context) {
+      	return -1;
+    }
+
+    return 0;
+}
+
+int kvm_qemu_create_context(void)
+{
+    if (kvm_create(kvm_context, phys_ram_size, (void**)&phys_ram_base) < 0) {
+	kvm_qemu_destroy();
+	return -1;
+    }
+
+    return 0;
+}
+
+void kvm_qemu_destroy(void)
+{
+    kvm_finalize(kvm_context);
 }
 
 int kvm_update_debugger(CPUState *env)

diff -u ../orig/kvm-2/qemu/qemu-kvm.h qemu/qemu-kvm.h
@@ -3,7 +3,9 @@
 
 #include "kvmctl.h"
 
-void kvm_qemu_init(void);
+int kvm_qemu_init(void);
+int kvm_qemu_create_context(void);
+void kvm_qemu_destroy(void);
 void kvm_load_registers(CPUState *env);
 int kvm_cpu_exec(CPUState *env);
 int kvm_update_debugger(CPUState *env);

diff -u ../orig/kvm-2/qemu/vl.c qemu/vl.c
@@ -6054,6 +6054,15 @@
         }
     }
 
+#if USE_KVM
+    if (kvm_allowed) {
+	if (kvm_qemu_init() < 0) {
+	    fprintf(stderr, "Could not initialize KVM, will disable KVM support\n");
+	    kvm_allowed = 0;
+	}
+    }
+#endif
+
 #ifdef USE_KQEMU
     if (smp_cpus > 1)
         kqemu_allowed = 0;

@@ -6099,11 +6108,15 @@
     }
 
     /* init the memory */
-#if USE_KVM
     phys_ram_size = ram_size + vga_ram_size + bios_size;
+#if USE_KVM
+    /* Initialize kvm */
     if (kvm_allowed) {
 	    phys_ram_size += KVM_EXTRA_PAGES * 4096;
-	    kvm_qemu_init();
+	    if (kvm_qemu_create_context() < 0) {
+		    fprintf(stderr, "Could not create KVM context\n");
+		    exit(1);
+	    }
     } else {
 	    phys_ram_base = qemu_vmalloc(phys_ram_size);
 	    if (!phys_ram_base) {

@@ -6112,7 +6125,6 @@
 	    }
     }
 #else
-    phys_ram_size = ram_size + vga_ram_size + bios_size;
     phys_ram_base = qemu_vmalloc(phys_ram_size);
     if (!phys_ram_base) {
         fprintf(stderr, "Could not allocate physical memory\n");