Re: [PATCH 28/31] mips/kvm: Only use KVM_COALESCED_MMIO_PAGE_OFFSET with KVM_MIPSTE

2013-06-16 Thread Ralf Baechle
On Fri, Jun 07, 2013 at 04:03:32PM -0700, David Daney wrote:

 From: David Daney david.da...@cavium.com
 
 The forthcoming MIPSVZ code doesn't currently use this, so it must
 only be enabled for KVM_MIPSTE.
 
 Signed-off-by: David Daney david.da...@cavium.com
 ---
  arch/mips/include/asm/kvm_host.h | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/mips/include/asm/kvm_host.h 
 b/arch/mips/include/asm/kvm_host.h
 index 505b804..9f209e1 100644
 --- a/arch/mips/include/asm/kvm_host.h
 +++ b/arch/mips/include/asm/kvm_host.h
 @@ -25,7 +25,9 @@
  /* memory slots that does not exposed to userspace */
  #define KVM_PRIVATE_MEM_SLOTS0
  
 +#ifdef CONFIG_KVM_MIPSTE
  #define KVM_COALESCED_MMIO_PAGE_OFFSET 1
 +#endif

What if KVM_MIPSTE and KVM_MIPSVZ both get enabled?

  Ralf
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 28/31] mips/kvm: Only use KVM_COALESCED_MMIO_PAGE_OFFSET with KVM_MIPSTE

2013-06-07 Thread David Daney
From: David Daney david.da...@cavium.com

The forthcoming MIPSVZ code doesn't currently use this, so it must
only be enabled for KVM_MIPSTE.

Signed-off-by: David Daney david.da...@cavium.com
---
 arch/mips/include/asm/kvm_host.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index 505b804..9f209e1 100644
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -25,7 +25,9 @@
 /* memory slots that does not exposed to userspace */
 #define KVM_PRIVATE_MEM_SLOTS  0
 
+#ifdef CONFIG_KVM_MIPSTE
 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1
+#endif
 
 /* Don't support huge pages */
 #define KVM_HPAGE_GFN_SHIFT(x) 0
-- 
1.7.11.7

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html