Merge branch 'kvm-master' into HEAD

Browse source

This merge brings in a couple important SMM fixes, which makes it
easier to test latest KVM with unrestricted_guest=0 and to test
the in-progress work on SMM support in the firmware.

Conflicts:
	arch/x86/kvm/x86.c

...

This commit is contained in:

Paolo Bonzini 2015-10-13 21:32:50 +02:00

parent 1330a0170a 7391773933

commit 58f800d5ac

3 changed files with 83 additions and 84 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/x86/include/asm/kvm_host.h

View file

26

arch/x86/kvm/vmx.c

View file

135

arch/x86/kvm/x86.c

View file