clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-09-04 20:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm: Support loading initrd image

Browse Source 
The start address of initrd image is set properly
but it seems we need /dev tuning since kernel issue
panic still.

Suggested-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov
2015-06-01 16:39:40 +01:00
committed by Will Deacon
parent 886c5381fc
commit 2065a6f762
3 changed files with 66 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/kvm/kvm.h
+2 -1
View File
@@ -35,7 +35,8 @@ struct kvm *kvm__init(const char *kvm_dev, unsigned long ram_size);
void kvm__delete(struct kvm *self);
void kvm__setup_cpuid(struct kvm *self);
void kvm__enable_singlestep(struct kvm *self);
bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename, const char *kernel_cmdline);
bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename,
const char *initrd_filename, const char *kernel_cmdline);
void kvm__reset_vcpu(struct kvm *self);
void kvm__setup_mem(struct kvm *self);
void kvm__run(struct kvm *self);
kvm.c
+57 -16
View File
@@ -21,6 +21,7 @@
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <sys/stat.h>
/*
* Compatibility code. Remove this when we move to tools/kvm.
@@ -275,12 +276,12 @@ static int load_flat_binary(struct kvm *self, int fd)
* default.
*/
#define BZ_KERNEL_START 0x100000UL
#define INITRD_START 0x1000000UL
#define BZ_DEFAULT_SETUP_SECTS 4
static const char *BZIMAGE_MAGIC = "HdrS";
#define BZ_DEFAULT_SETUP_SECTS 4
static bool load_bzimage(struct kvm *self, int fd, const char *kernel_cmdline)
static bool load_bzimage(struct kvm *self, int fd_kernel,
int fd_initrd, const char *kernel_cmdline)
{
struct boot_params *kern_boot;
unsigned long setup_sects;
@@ -295,21 +296,25 @@ static bool load_bzimage(struct kvm *self, int fd, const char *kernel_cmdline)
* memory layout.
*/
if (lseek(fd, 0, SEEK_SET) < 0)
if (lseek(fd_kernel, 0, SEEK_SET) < 0)
die_perror("lseek");
if (read(fd, &boot, sizeof(boot)) != sizeof(boot))
if (read(fd_kernel, &boot, sizeof(boot)) != sizeof(boot)) {
warning("Failed to read kernel boot area");
return false;
}
if (memcmp(&boot.hdr.header, BZIMAGE_MAGIC, strlen(BZIMAGE_MAGIC)) != 0)
if (memcmp(&boot.hdr.header, BZIMAGE_MAGIC, strlen(BZIMAGE_MAGIC))) {
warning("Kernel header corrupted");
return false;
}
if (boot.hdr.version < BOOT_PROTOCOL_REQUIRED) {
warning("Too old kernel");
return false;
}
if (lseek(fd, 0, SEEK_SET) < 0)
if (lseek(fd_kernel, 0, SEEK_SET) < 0)
die_perror("lseek");
if (!boot.hdr.setup_sects)
@@ -319,12 +324,14 @@ static bool load_bzimage(struct kvm *self, int fd, const char *kernel_cmdline)
setup_size = setup_sects << 9;
p = guest_real_to_host(self, BOOT_LOADER_SELECTOR, BOOT_LOADER_IP);
if (read(fd, p, setup_size) != setup_size)
/* copy setup.bin to mem*/
if (read(fd_kernel, p, setup_size) != setup_size)
die_perror("read");
/* copy vmlinux.bin to BZ_KERNEL_START*/
p = guest_flat_to_host(self, BZ_KERNEL_START);
while ((nr = read(fd, p, 65536)) > 0)
while ((nr = read(fd_kernel, p, 65536)) > 0)
p += nr;
p = guest_flat_to_host(self, BOOT_CMDLINE_OFFSET);
@@ -344,6 +351,34 @@ static bool load_bzimage(struct kvm *self, int fd, const char *kernel_cmdline)
kern_boot->hdr.heap_end_ptr = 0xfe00;
kern_boot->hdr.loadflags |= CAN_USE_HEAP;
/*
* Read initrd image into guest memory
*/
if (fd_initrd >= 0) {
struct stat initrd_stat;
unsigned long addr;
if (fstat(fd_initrd, &initrd_stat))
die_perror("fstat");
addr = boot.hdr.initrd_addr_max & ~0xfffff;
for (;;) {
if (addr < BZ_KERNEL_START)
die("Not enough memory for initrd");
else if (addr < (self->ram_size - initrd_stat.st_size))
break;
addr -= 0x100000;
}
p = guest_flat_to_host(self, addr);
nr = read(fd_initrd, p, initrd_stat.st_size);
if (nr != initrd_stat.st_size)
die("Failed to read initrd");
kern_boot->hdr.ramdisk_image = addr;
kern_boot->hdr.ramdisk_size = initrd_stat.st_size;
}
self->boot_selector = BOOT_LOADER_SELECTOR;
/*
* The real-mode setup code starts at offset 0x200 of a bzImage. See
@@ -361,20 +396,26 @@ static bool load_bzimage(struct kvm *self, int fd, const char *kernel_cmdline)
}
bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename,
const char *kernel_cmdline)
const char *initrd_filename, const char *kernel_cmdline)
{
bool ret;
int fd;
int fd_kernel = -1, fd_initrd = -1;
fd = open(kernel_filename, O_RDONLY);
if (fd < 0)
fd_kernel = open(kernel_filename, O_RDONLY);
if (fd_kernel < 0)
die("unable to open kernel");
ret = load_bzimage(kvm, fd, kernel_cmdline);
if (initrd_filename) {
fd_initrd = open(initrd_filename, O_RDONLY);
if (fd_initrd < 0)
die("unable to open initrd");
}
ret = load_bzimage(kvm, fd_kernel, fd_initrd, kernel_cmdline);
if (ret)
goto found_kernel;
ret = load_flat_binary(kvm, fd);
ret = load_flat_binary(kvm, fd_kernel);
if (ret)
goto found_kernel;
main.c
+7 -3
View File
@@ -18,7 +18,7 @@ static void usage(char *argv[])
fprintf(stderr, " usage: %s "
"[--single-step] [--ioport-debug] "
"[--kvm-dev=<device>] [--mem=<size-in-MiB>] [--params=<kernel-params>] "
"[--kernel=]<kernel-image>\n",
"[--initrd=<initrd>] [--kernel=]<kernel-image>\n",
argv[0]);
exit(1);
}
@@ -46,6 +46,7 @@ static bool option_matches(char *arg, const char *option)
int main(int argc, char *argv[])
{
const char *kernel_filename = NULL;
const char *initrd_filename = NULL;
const char *kernel_cmdline = NULL;
const char *kvm_dev = "/dev/kvm";
unsigned long ram_size = 64UL << 20;
@@ -58,6 +59,9 @@ int main(int argc, char *argv[])
if (option_matches(argv[i], "--kernel=")) {
kernel_filename = &argv[i][9];
continue;
} else if (option_matches(argv[i], "--initrd=")) {
initrd_filename = &argv[i][9];
continue;
} else if (option_matches(argv[i], "--params=")) {
kernel_cmdline = &argv[i][9];
continue;
@@ -94,13 +98,13 @@ int main(int argc, char *argv[])
kvm__setup_cpuid(kvm);
strcpy(real_cmdline, "notsc nolapic nosmp noacpi pci=conf1 earlyprintk=serial,keep ");
strcpy(real_cmdline, "notsc nolapic nosmp noacpi pci=conf1 earlyprintk=ttyS0,keep ");
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, real_cmdline))
if (!kvm__load_kernel(kvm, kernel_filename, initrd_filename, real_cmdline))
die("unable to load kernel %s", kernel_filename);
kvm__reset_vcpu(kvm);