Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

add option to disable KVM acceleration

Browse source 
- disable acceleration at Travis CI because Travis doesn't support KVM
This commit is contained in:
Stefan Lankes 2016-08-27 19:12:08 +02:00
parent 98eda3c24c
commit b366f95c36
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -24,3 +24,4 @@ env:
- HERMIT_ISLE=qemu
- HERMIT_CPUS=2
- HERMIT_MEM="128M"
- HERMIT_KVM="0"

30
hermit/tools/proxy.c
View file

@ -146,13 +146,14 @@ static int init_env(char *path)
static int init_qemu(char *path)
{
int kvm;
char* str;
char loader_path[MAX_PATH];
char hostfwd[MAX_PATH];
char monitor_str[MAX_PATH];
char chardev_file[MAX_PATH];
char* qemu_str = "qemu-system-x86_64";
char* qemu_argv[] = {qemu_str, "-nographic", "-smp", "1", "-m", "2G", "-net", "nic,model=rtl8139", "-net", hostfwd, "-chardev", chardev_file, "-device", "pci-serial,chardev=gnc0", "-monitor", monitor_str, "-machine", "accel=kvm", "-cpu", "host", "-kernel", loader_path, "-initrd", path, NULL, NULL, NULL};
char* qemu_argv[] = {qemu_str, "-nographic", "-smp", "1", "-m", "2G", "-net", "nic,model=rtl8139", "-net", hostfwd, "-chardev", chardev_file, "-device", "pci-serial,chardev=gnc0", "-monitor", monitor_str, "-kernel", loader_path, "-initrd", path, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
str = getenv("HERMIT_CPUS");
if (str)
@ -176,6 +177,33 @@ static int init_qemu(char *path)
str = strstr(loader_path, "proxy");
strncpy(str, "../arch/x86/loader/ldhermit.elf", MAX_PATH-strlen(loader_path)+5);
str = getenv("HERMIT_KVM");
if (str && (strcmp(str, "0") == 0))
kvm = 0;
else
kvm = 1;
if (kvm)
{
int i;
for(i=0; qemu_argv[i] != NULL; i++)
;
qemu_argv[i] = "-machine";
qemu_argv[i+1] = "accel=kvm";
qemu_argv[i+2] = "-cpu";
qemu_argv[i+3] = "host";
} /*else {
int i;
for(i=0; qemu_argv[i] != NULL; i++)
;
qemu_argv[i] = "-cpu";
qemu_argv[i+1] = "SandyBridge";
}*/
str = getenv("HERMIT_VERBOSE");
if (str)
{