# HG changeset patch
# User Hollis Blanchard <[EMAIL PROTECTED]>
# Date 1200434310 21600
# Node ID 7fa5947a2da8c0c7424ebdcfaebcae624d6cf015
# Parent ee0c227fe3f6632f4b1b5fde3f7e05c8ea0a4378
Signed-off-by: Hollis Blanchard <[EMAIL PROTECTED]>
Signed-off-by: Christian Ehrhardt <[EMAIL PROTECTED]>
---
2 files changed, 7 insertions(+)
arch/x86/kvm/Kconfig | 5 +++++
virt/kvm/kvm_main.c | 2 ++
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -33,9 +33,13 @@ config KVM
If unsure, say N.
+config KVM_HAS_PIO
+ bool
+
config KVM_INTEL
tristate "KVM for Intel processors support"
depends on KVM
+ select KVM_HAS_PIO
---help---
Provides support for KVM on Intel processors equipped with the VT
extensions.
@@ -43,6 +47,7 @@ config KVM_AMD
config KVM_AMD
tristate "KVM for AMD processors support"
depends on KVM
+ select KVM_HAS_PIO
---help---
Provides support for KVM on AMD processors equipped with the AMD-V
(SVM) extensions.
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -677,8 +677,10 @@ static int kvm_vcpu_fault(struct vm_area
if (vmf->pgoff == 0)
page = virt_to_page(vcpu->run);
+#ifdef CONFIG_KVM_HAS_PIO
else if (vmf->pgoff == KVM_PIO_PAGE_OFFSET)
page = virt_to_page(vcpu->arch.pio_data);
+#endif /* CONFIG_KVM_HAS_PIO */
else
return VM_FAULT_SIGBUS;
get_page(page);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel
