From: Pekka Enberg <penberg@kernel.org>
Date: Fri, 8 Apr 2011 16:57:11 +0000 (+0300)
Subject: Merge branch 'kvm/gitish' into kvm/core
X-Git-Tag: next-20110824~3^2~469
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d7fe947419eb240a3b469d1b4ab306234d27b43;p=karo-tx-linux.git

Merge branch 'kvm/gitish' into kvm/core

Conflicts:
	tools/kvm/Makefile
	tools/kvm/main.c
---

6d7fe947419eb240a3b469d1b4ab306234d27b43
diff --cc tools/kvm/Makefile
index 45498a2ce160,a3d06a340af3..4bcfd74c5d04
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@@ -26,7 -26,11 +26,12 @@@ OBJS	+= mmio.
  OBJS	+= pci.o
  OBJS	+= util.o
  OBJS	+= term.o
 +OBJS	+= virtio.o
+ OBJS    += util/parse-options.o
+ OBJS    += util/strbuf.o
+ OBJS    += kvm-help.o
+ OBJS    += kvm-cmd.o
+ OBJS    += kvm-run.o
  
  DEPS	:= $(patsubst %.o,%.d,$(OBJS))
  
diff --cc tools/kvm/kvm-run.c
index 000000000000,90b821bcc97d..2f33dbd265ae
mode 000000,100644..100644
--- a/tools/kvm/kvm-run.c
+++ b/tools/kvm/kvm-run.c
@@@ -1,0 -1,244 +1,244 @@@
+ #include <stdio.h>
+ #include <string.h>
+ #include <signal.h>
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <inttypes.h>
+ #include <stdlib.h>
+ #include <termios.h>
+ 
+ /* user defined header files */
+ #include <linux/types.h>
+ #include <kvm/kvm.h>
+ #include <kvm/8250-serial.h>
 -#include <kvm/blk-virtio.h>
 -#include <kvm/console-virtio.h>
++#include <kvm/virtio-blk.h>
++#include <kvm/virtio-console.h>
+ #include <kvm/disk-image.h>
+ #include <kvm/util.h>
+ #include <kvm/pci.h>
+ #include <kvm/term.h>
+ 
+ /* header files for gitish interface  */
+ #include <kvm/kvm-run.h>
+ #include <kvm/parse-options.h>
+ 
+ #define DEFAULT_KVM_DEV		"/dev/kvm"
+ 
+ #define MB_SHIFT		(20)
+ #define MIN_RAM_SIZE_MB		(64UL)
+ #define MIN_RAM_SIZE_BYTE	(MIN_RAM_SIZE_MB << MB_SHIFT)
+ 
+ static struct kvm *kvm;
+ 
+ static void handle_sigint(int sig)
+ {
+ 	exit(1);
+ }
+ 
+ static void handle_sigquit(int sig)
+ {
+ 	kvm__show_registers(kvm);
+ 	kvm__show_code(kvm);
+ 	kvm__show_page_tables(kvm);
+ 
+ 	kvm__delete(kvm);
+ 
+ 	exit(1);
+ }
+ 
+ static u64 ram_size;
+ static const char *kernel_cmdline;
+ static const char *kernel_filename;
+ static const char *initrd_filename;
+ static const char *image_filename;
+ static const char *kvm_dev;
+ static bool single_step = false;
+ static bool virtio_console = false;
+ extern bool ioport_debug;
+ extern int  active_console;
+ 
+ static const char * const run_usage[] = {
+ 	"kvm run [<options>] <kernel image>",
+ 	NULL
+ };
+ 
+ static const struct option options[] = {
+ 	OPT_U64('m', "mem", &ram_size, "Virtual machine memory size in MiB."),
+ 	OPT_STRING('p', "params", &kernel_cmdline, "params",
+ 			"Kernel command line arguments"),
+ 	OPT_STRING('r', "initrd", &initrd_filename, "initrd",
+ 			"Initial RAM disk image"),
+ 	OPT_STRING('k', "kernel", &kernel_filename, "kernel",
+ 			"Kernel to boot in virtual machine"),
+ 	OPT_STRING('i', "image", &image_filename, "image", "Disk image"),
+ 	OPT_STRING('d', "kvm-dev", &kvm_dev, "kvm-dev", "KVM device file"),
+ 	OPT_BOOLEAN('s', "single-step", &single_step,
+ 			"Enable single stepping"),
+ 	OPT_BOOLEAN('g', "ioport-debug", &ioport_debug,
+ 			"Enable ioport debugging"),
+ 	OPT_BOOLEAN('c', "enable-virtio-console", &virtio_console,
+ 			"Enable the virtual IO console"),
+ 	OPT_END()
+ };
+ 
+ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
+ {
+ 	static char real_cmdline[2048];
+ 
+ 	signal(SIGQUIT, handle_sigquit);
+ 	signal(SIGINT, handle_sigint);
+ 
+ 	if (!argv || !*argv) {
+ 		/* no argument specified */
+ 		usage_with_options(run_usage, options);
+ 		return EINVAL;
+ 	}
+ 
+ 	while (argc != 0) {
+ 		argc = parse_options(argc, argv, options, run_usage,
+ 				PARSE_OPT_STOP_AT_NON_OPTION);
+ 		if (argc != 0) {
+ 			if (kernel_filename) {
+ 				fprintf(stderr, "Cannot handle parameter: "
+ 						"%s\n", argv[0]);
+ 				usage_with_options(run_usage, options);
+ 				return EINVAL;
+ 			}
+ 			/* first unhandled parameter is treated as a kernel
+ 			   image
+ 			 */
+ 			kernel_filename = argv[0];
+ 			argv++;
+ 			argc--;
+ 		}
+ 
+ 	}
+ 
+ 	if (!ram_size)
+ 		ram_size = MIN_RAM_SIZE_MB;
+ 	else if (ram_size < MIN_RAM_SIZE_MB) {
+ 		die("Not enough memory specified: %luMB (min %luMB)", ram_size,
+ 				MIN_RAM_SIZE_MB);
+ 	}
+ 	ram_size <<= MB_SHIFT;
+ 
+ 	if (!kvm_dev)
+ 		kvm_dev = DEFAULT_KVM_DEV;
+ 
+ 	if (virtio_console == true)
+ 		active_console  = CONSOLE_VIRTIO;
+ 
+ 	term_init();
+ 
+ 	kvm = kvm__init(kvm_dev, ram_size);
+ 
+ 	if (image_filename) {
+ 		kvm->disk_image	= disk_image__open(image_filename);
+ 		if (!kvm->disk_image)
+ 			die("unable to load disk image %s", image_filename);
+ 	}
+ 
+ 	kvm__setup_cpuid(kvm);
+ 
+ 	strcpy(real_cmdline, "notsc nolapic noacpi pci=conf1 console=ttyS0 ");
+ 	if (!kernel_cmdline || !strstr(kernel_cmdline, "root=")) {
+ 		strlcat(real_cmdline, "root=/dev/vda rw ",
+ 				sizeof(real_cmdline));
+ 	}
+ 
+ 	if (kernel_cmdline) {
+ 		strlcat(real_cmdline, kernel_cmdline, sizeof(real_cmdline));
+ 		real_cmdline[sizeof(real_cmdline)-1] = '\0';
+ 	}
+ 
+ 	if (!kvm__load_kernel(kvm, kernel_filename, initrd_filename,
+ 				real_cmdline))
+ 		die("unable to load kernel %s", kernel_filename);
+ 
+ 	kvm__reset_vcpu(kvm);
+ 
+ 	kvm__setup_bios(kvm);
+ 
+ 	if (single_step)
+ 		kvm__enable_singlestep(kvm);
+ 
+ 	serial8250__init(kvm);
+ 
+ 	pci__init();
+ 
 -	blk_virtio__init(kvm);
++	virtio_blk__init(kvm);
+ 
+ 	virtio_console__init(kvm);
+ 
+ 	kvm__start_timer(kvm);
+ 
+ 	for (;;) {
+ 		kvm__run(kvm);
+ 
+ 		switch (kvm->kvm_run->exit_reason) {
+ 		case KVM_EXIT_DEBUG:
+ 			kvm__show_registers(kvm);
+ 			kvm__show_code(kvm);
+ 			break;
+ 		case KVM_EXIT_IO: {
+ 			bool ret;
+ 
+ 			ret = kvm__emulate_io(kvm,
+ 					kvm->kvm_run->io.port,
+ 					(uint8_t *)kvm->kvm_run +
+ 					kvm->kvm_run->io.data_offset,
+ 					kvm->kvm_run->io.direction,
+ 					kvm->kvm_run->io.size,
+ 					kvm->kvm_run->io.count);
+ 
+ 			if (!ret)
+ 				goto panic_kvm;
+ 			break;
+ 		}
+ 		case KVM_EXIT_MMIO: {
+ 			bool ret;
+ 
+ 			ret = kvm__emulate_mmio(kvm,
+ 					kvm->kvm_run->mmio.phys_addr,
+ 					kvm->kvm_run->mmio.data,
+ 					kvm->kvm_run->mmio.len,
+ 					kvm->kvm_run->mmio.is_write);
+ 
+ 			if (!ret)
+ 				goto panic_kvm;
+ 			break;
+ 		}
+ 		case KVM_EXIT_INTR: {
+ 			serial8250__inject_interrupt(kvm);
+ 			virtio_console__inject_interrupt(kvm);
+ 			break;
+ 		}
+ 		case KVM_EXIT_SHUTDOWN:
+ 			goto exit_kvm;
+ 		default:
+ 			goto panic_kvm;
+ 		}
+ 	}
+ exit_kvm:
+ 	disk_image__close(kvm->disk_image);
+ 	kvm__delete(kvm);
+ 
+ 	printf("\n  # KVM session ended normally.\n");
+ 
+ 	return 0;
+ 
+ panic_kvm:
+ 	fprintf(stderr, "KVM exit reason: %" PRIu32 " (\"%s\")\n",
+ 		kvm->kvm_run->exit_reason,
+ 		kvm_exit_reasons[kvm->kvm_run->exit_reason]);
+ 	if (kvm->kvm_run->exit_reason == KVM_EXIT_UNKNOWN)
+ 		fprintf(stderr, "KVM exit code: 0x%" PRIu64 "\n",
+ 			kvm->kvm_run->hw.hardware_exit_reason);
+ 	disk_image__close(kvm->disk_image);
+ 	kvm__show_registers(kvm);
+ 	kvm__show_code(kvm);
+ 	kvm__show_page_tables(kvm);
+ 	kvm__delete(kvm);
+ 
+ 	return 1;
+ }