Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69def9f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (202 commits)
  MAINTAINERS: update KVM entry
  KVM: correct error-handling code
  KVM: fix compile warnings on s390
  KVM: VMX: Check cpl before emulating debug register access
  KVM: fix misreporting of coalesced interrupts by kvm tracer
  KVM: x86: drop duplicate kvm_flush_remote_tlb calls
  KVM: VMX: call vmx_load_host_state() only if msr is cached
  KVM: VMX: Conditionally reload debug register 6
  KVM: Use thread debug register storage instead of kvm specific data
  KVM guest: do not batch pte updates from interrupt context
  KVM: Fix coalesced interrupt reporting in IOAPIC
  KVM guest: fix bogus wallclock physical address calculation
  KVM: VMX: Fix cr8 exiting control clobbering by EPT
  KVM: Optimize kvm_mmu_unprotect_page_virt() for tdp
  KVM: Document KVM_CAP_IRQCHIP
  KVM: Protect update_cr8_intercept() when running without an apic
  KVM: VMX: Fix EPT with WP bit change during paging
  KVM: Use kvm_{read,write}_guest_virt() to read and write segment descriptors
  KVM: x86 emulator: Add adc and sbb missing decoder flags
  KVM: Add missing #include
  ...
parents 353f6dd2 8e616fc8

Documentation/ioctl/ioctl-number.txt

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ Code Seq# Include File Comments 
0xAD	00	Netfilter device	in development:

					<mailto:rusty@rustcorp.com.au>	

0xAE	all	linux/kvm.h		Kernel-based Virtual Machine

					<mailto:kvm-devel@lists.sourceforge.net>

					<mailto:kvm@vger.kernel.org>

0xB0	all	RATIO devices		in development:

					<mailto:vgo@ratio.de>

0xB1	00-1F	PPPoX			<mailto:mostrows@styx.uwaterloo.ca>

Documentation/kernel-parameters.txt

+39 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ parameter is applicable: 
	ISAPNP	ISA PnP code is enabled.

	ISDN	Appropriate ISDN support is enabled.

	JOY	Appropriate joystick support is enabled.

	KVM	Kernel Virtual Machine support is enabled.

	LIBATA  Libata driver is enabled

	LP	Printer support is enabled.

	LOOP	Loopback device support is enabled.
@@ -1098,6 +1099,44 @@ and is between 256 and 4096 characters. It is defined in the file 
	kstack=N	[X86] Print N words from the kernel stack

			in oops dumps.



	kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.

			Default is 0 (don't ignore, but inject #GP)



	kvm.oos_shadow=	[KVM] Disable out-of-sync shadow paging.

			Default is 1 (enabled)



	kvm-amd.nested=	[KVM,AMD] Allow nested virtualization in KVM/SVM.

			Default is 0 (off)



	kvm-amd.npt=	[KVM,AMD] Disable nested paging (virtualized MMU)

			for all guests.

			Default is 1 (enabled) if in 64bit or 32bit-PAE mode



	kvm-intel.bypass_guest_pf=

			[KVM,Intel] Disables bypassing of guest page faults

			on Intel chips. Default is 1 (enabled)



	kvm-intel.ept=	[KVM,Intel] Disable extended page tables

			(virtualized MMU) support on capable Intel chips.

			Default is 1 (enabled)



	kvm-intel.emulate_invalid_guest_state=

			[KVM,Intel] Enable emulation of invalid guest states

			Default is 0 (disabled)



	kvm-intel.flexpriority=

			[KVM,Intel] Disable FlexPriority feature (TPR shadow).

			Default is 1 (enabled)



	kvm-intel.unrestricted_guest=

			[KVM,Intel] Disable unrestricted guest feature

			(virtualized real and unpaged mode) on capable

			Intel chips. Default is 1 (enabled)



	kvm-intel.vpid=	[KVM,Intel] Disable Virtual Processor Identification

			feature (tagged TLBs) on capable Intel chips.

			Default is 1 (enabled)



	l2cr=		[PPC]



	l3cr=		[PPC]

Documentation/kvm/api.txt

0 → 100644
+759 −0

File added.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2926,6 +2926,7 @@ F: include/linux/sunrpc/ 


KERNEL VIRTUAL MACHINE (KVM)

M:	Avi Kivity <avi@redhat.com>

M:	Marcelo Tosatti <mtosatti@redhat.com>

L:	kvm@vger.kernel.org

W:	http://kvm.qumranet.com

S:	Supported

arch/ia64/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ struct kvm_vm_data { 
#define KVM_REQ_PTC_G		32

#define KVM_REQ_RESUME		33



#define KVM_PAGES_PER_HPAGE	1

#define KVM_NR_PAGE_SIZES	1

#define KVM_PAGES_PER_HPAGE(x)	1



struct kvm;

struct kvm_vcpu;
@@ -465,7 +466,6 @@ struct kvm_arch { 
	unsigned long	metaphysical_rr4;

	unsigned long	vmm_init_rr;



	int		online_vcpus;

	int		is_sn2;



	struct kvm_ioapic *vioapic;