[COMMIT master] Merge branch 'upstream-merge'

From: Marcelo Tosatti mtosa...@redhat.com * upstream-merge: (108 commits) Add cpu model configuration support.. add close callback for tty-based char device Fix lost serial TX interrupts. Report receive overruns. tcg/ppc: Fix typo apc_pci: simplify using rwhandler apb_pci: minor

[COMMIT master] Merge commit 'v2.6.33'

From: Avi Kivity a...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com -- To unsubscribe from this list: send the line unsubscribe kvm-commits in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[COMMIT master] KVM: SVM: Check for nested intercepts on NMI injection

From: Joerg Roedel joerg.roe...@amd.com This patch implements the NMI intercept checking for nested svm. Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index b821b2f..7773cea 100644 ---

[COMMIT master] KVM: SVM: Reset MMU on nested_svm_vmrun for NPT too

From: Joerg Roedel joerg.roe...@amd.com Without resetting the MMU the gva_to_pga function will not work reliably when the vcpu is running in nested context. Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/svm.c

[COMMIT master] KVM: SVM: Restore tracing of nested vmcb address

From: Joerg Roedel joerg.roe...@amd.com A recent change broke tracing of the nested vmcb address. It was reported as 0 all the time. This patch fixes it. Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/svm.c

[COMMIT master] KVM: SVM: Coding style cleanup

From: Joerg Roedel joerg.roe...@amd.com This patch removes whitespace errors, fixes comment formats and most of checkpatch warnings. Now vim does not show c-space-errors anymore. Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Avi Kivity a...@redhat.com diff --git

[COMMIT master] KVM: SVM: Add kvm_nested_intercepts tracepoint

From: Joerg Roedel joerg.roe...@amd.com This patch adds a tracepoint to get information about the most important intercept bitmasks from the nested vmcb. Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/svm.c

[COMMIT master] KVM: SVM: Ignore write of hwcr.ignne

From: Joerg Roedel joerg.roe...@amd.com Hyper-V as a guest wants to write this bit. This patch ignores it. Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 2c24cb5..31d44c1 100644 ---

[COMMIT master] KVM: SVM: Clear exit_info for injected INTR exits

From: Joerg Roedel joerg.roe...@amd.com When injecting an vmexit.intr into the nested hypervisor there might be leftover values in the exit_info fields. Clear them to not confuse nested hypervisors. Signed-off-by: Joerg Roedel joerg.roe...@amd.com Signed-off-by: Avi Kivity a...@redhat.com diff

[COMMIT master] KVM: SVM: Handle nested selective_cr0 intercept correctly

From: Joerg Roedel joerg.roe...@amd.com If we have the following situation with nested svm: 1. Host KVM intercepts cr0 writes 2. Guest hypervisor intercepts only selective cr0 writes Then we get an cr0 write intercept which is handled on the host. But that intercepts may actually be a selective

[COMMIT master] KVM: update gfn_to_hva() to use gfn_to_hva_memslot()

From: Takuya Yoshikawa yoshikawa.tak...@oss.ntt.co.jp Marcelo introduced gfn_to_hva_memslot() when he implemented gfn_to_pfn_memslot(). Let's use this for gfn_to_hva() too. Note: also remove parentheses next to return as checkpatch said to do. Signed-off-by: Takuya Yoshikawa

[COMMIT master] KVM: x86: Don't set arch.cr0 in kvm_set_cr0

From: Joerg Roedel joerg.roe...@amd.com The vcpu-arch.cr0 variable is already set in the architecture specific set_cr0 callbacks. There is no need to set it in the common code. This allows the architecture code to keep the old arch.cr0 value if it wants. This is required for nested svm to decide

[COMMIT master] KVM: x86 emulator: Add decoding of 16bit second in memory argument

From: Gleb Natapov g...@redhat.com Add decoding of Ep type of argument used by callf/jmpf. Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index c9f604b..97a7403 100644 ---

[COMMIT master] KVM: Drop kvm_get_gdt() in favor of generic linux function

From: Gleb Natapov g...@redhat.com Linux now has native_store_gdt() to do the same. Use it instead of kvm local version. Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index

[COMMIT master] KVM: fix segment_base() error checking

From: Gleb Natapov g...@redhat.com fix segment_base() to properly check for null segment selector and avoid accessing NULL pointer if ldt selector in null. Signed-off-by: Gleb Natapov g...@redhat.com Signed-off-by: Avi Kivity a...@redhat.com diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c