Commit 07acfc2a authored May 24, 2012 by Linus Torvalds

Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM changes from Avi Kivity:
 "Changes include additional instruction emulation, page-crossing MMIO,
  faster dirty logging, preventing the watchdog from killing a stopped
  guest, module autoload, a new MSI ABI, and some minor optimizations
  and fixes.  Outside x86 we have a small s390 and a very large ppc
  update.

  Regarding the new (for kvm) rebaseless workflow, some of the patches
  that were merged before we switch trees had to be rebased, while
  others are true pulls.  In either case the signoffs should be correct
  now."

Fix up trivial conflicts in Documentation/feature-removal-schedule.txt
arch/powerpc/kvm/book3s_segment.S and arch/x86/include/asm/kvm_para.h.

I suspect the kvm_para.h resolution ends up doing the "do I have cpuid"
check effectively twice (it was done differently in two different
commits), but better safe than sorry ;)

* 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (125 commits)
  KVM: make asm-generic/kvm_para.h have an ifdef __KERNEL__ block
  KVM: s390: onereg for timer related registers
  KVM: s390: epoch difference and TOD programmable field
  KVM: s390: KVM_GET/SET_ONEREG for s390
  KVM: s390: add capability indicating COW support
  KVM: Fix mmu_reload() clash with nested vmx event injection
  KVM: MMU: Don't use RCU for lockless shadow walking
  KVM: VMX: Optimize %ds, %es reload
  KVM: VMX: Fix %ds/%es clobber
  KVM: x86 emulator: convert bsf/bsr instructions to emulate_2op_SrcV_nobyte()
  KVM: VMX: unlike vmcs on fail path
  KVM: PPC: Emulator: clean up SPR reads and writes
  KVM: PPC: Emulator: clean up instruction parsing
  kvm/powerpc: Add new ioctl to retreive server MMU infos
  kvm/book3s: Make kernel emulated H_PUT_TCE available for "PR" KVM
  KVM: PPC: bookehv: Fix r8/r13 storing in level exception handler
  KVM: PPC: Book3S: Enable IRQs during exit handling
  KVM: PPC: Fix PR KVM on POWER7 bare metal
  KVM: PPC: Fix stbux emulation
  KVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields
  ...

parents b5f4035a 322728e5

Documentation/feature-removal-schedule.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -588,3 +588,10 @@ Why: Remount currently allows changing bound subsystems and
		replaced with conventional fsnotify.

		----------------------------

		What: KVM debugfs statistics
		When: 2013
		Why: KVM tracepoints provide mostly equivalent information in a much more
		flexible fashion.

		----------------------------

Documentation/virtual/kvm/api.txt

+274 −7

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/virtual/kvm/cpuid.txt

+5 −1

Original line number	Diff line number	Diff line
		@@ -10,11 +10,15 @@ a guest.
		KVM cpuid functions are:

		function: KVM_CPUID_SIGNATURE (0x40000000)
		returns : eax = 0,
		returns : eax = 0x40000001,
		ebx = 0x4b4d564b,
		ecx = 0x564b4d56,
		edx = 0x4d.
		Note that this value in ebx, ecx and edx corresponds to the string "KVMKVMKVM".
		The value in eax corresponds to the maximum cpuid function present in this leaf,
		and will be updated if more functions are added in the future.
		Note also that old hosts set eax value to 0x0. This should
		be interpreted as if the value was 0x40000001.
		This function queries the presence of KVM cpuid leafs.

Documentation/virtual/kvm/msr.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,10 @@ MSR_KVM_SYSTEM_TIME_NEW: 0x4b564d01
		\| \| time measures taken across
		0 \| 24 \| multiple cpus are guaranteed to
		\| \| be monotonic
		-------------------------------------------------------------
		\| \| guest vcpu has been paused by
		1 \| N/A \| the host
		\| \| See 4.70 in api.txt
		-------------------------------------------------------------

		Availability of this MSR must be checked via bit 3 in 0x4000001 cpuid

arch/alpha/include/asm/kvm_para.h

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		#include <asm-generic/kvm_para.h>

Admin message