diff options
| -rwxr-xr-x | tools/create-gce-image.sh | 2 | ||||
| -rw-r--r-- | vm/qemu/qemu.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/create-gce-image.sh b/tools/create-gce-image.sh index e670d950a..afa530d73 100755 --- a/tools/create-gce-image.sh +++ b/tools/create-gce-image.sh @@ -95,7 +95,7 @@ menuentry 'linux' --class gnu-linux --class gnu --class os { insmod part_msdos insmod ext2 set root='(hd0,1)' - linux /vmlinuz root=/dev/sda1 console=ttyS0 earlyprintk=serial vsyscall=native rodata=n ftrace_dump_on_oops=orig_cpu oops=panic panic_on_warn=1 panic=86400 kvm-intel.nested=1 kvm-intel.enable_unrestricted_guest=1 kvm-intel.ept=1 kvm-intel.flexpriority=1 kvm-intel.vpid=1 kvm-intel.emulate_invalid_guest_state=1 kvm-intel.eptad=1 kvm-intel.enable_shadow_vmcs=1 kvm-intel.pml=1 kvm-intel.enable_apicv=1 + linux /vmlinuz root=/dev/sda1 console=ttyS0 earlyprintk=serial vsyscall=native rodata=n ftrace_dump_on_oops=orig_cpu oops=panic panic_on_warn=1 panic=86400 kvm-intel.nested=1 kvm-intel.unrestricted_guest=1 kvm-intel.vmm_exclusive=1 kvm-intel.fasteoi=1 kvm-intel.ept=1 kvm-intel.flexpriority=1 kvm-intel.vpid=1 kvm-intel.emulate_invalid_guest_state=1 kvm-intel.eptad=1 kvm-intel.enable_shadow_vmcs=1 kvm-intel.pml=1 kvm-intel.enable_apicv=1 } EOF sudo grub-install --boot-directory=disk.mnt/boot --no-floppy /dev/nbd0 diff --git a/vm/qemu/qemu.go b/vm/qemu/qemu.go index 2b861c7e2..733476943 100644 --- a/vm/qemu/qemu.go +++ b/vm/qemu/qemu.go @@ -191,7 +191,8 @@ func (inst *instance) Boot() error { if inst.cfg.Kernel != "" { cmdline := "console=ttyS0 vsyscall=native rodata=n oops=panic panic_on_warn=1 panic=86400" + " ftrace_dump_on_oops=orig_cpu earlyprintk=serial slub_debug=UZ net.ifnames=0 biosdevname=0 " + - " kvm-intel.nested=1 kvm-intel.enable_unrestricted_guest=1 kvm-intel.ept=1 kvm-intel.flexpriority=1 " + + " kvm-intel.nested=1 kvm-intel.unrestricted_guest=1 kvm-intel.vmm_exclusive=1 kvm-intel.fasteoi=1 " + + " kvm-intel.ept=1 kvm-intel.flexpriority=1 " + " kvm-intel.vpid=1 kvm-intel.emulate_invalid_guest_state=1 kvm-intel.eptad=1 " + " kvm-intel.enable_shadow_vmcs=1 kvm-intel.pml=1 kvm-intel.enable_apicv=1 " if inst.cfg.Image == "9p" { |