linux-mips
[Top] [All Lists]

[PATCH 30/31] mips/kvm: Enable MIPSVZ in Kconfig/Makefile

To: linux-mips@linux-mips.org, ralf@linux-mips.org, kvm@vger.kernel.org, Sanjay Lal <sanjayl@kymasys.com>
Subject: [PATCH 30/31] mips/kvm: Enable MIPSVZ in Kconfig/Makefile
From: David Daney <ddaney.cavm@gmail.com>
Date: Fri, 7 Jun 2013 16:03:34 -0700
Cc: linux-kernel@vger.kernel.org, David Daney <david.daney@cavium.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=fP+VQz4k9Zjtk9l8ILsJwE+i52mAT4qhfYLkgIMqpGM=; b=sLvCkmCOsLs9shpSiboRobxWTMnrGu9u/oGX0iBNBA2freBFv4au7w9OF7/5+e1FmP 3QYhD8CayiDrV7TgaZ80a5gmHvN81MyUWKnEpFrV5PNpn0FybqKJw4NcHeqymU63Jecr 7rERoLTqSibQwR5JDK5RZmU9Yl9ti/uM3fcihionoiD1InlL3QszTFGpwJEyyf26sHmu 9UqmzhyBIWttGDP3BDudXyc1ZeeBzB2vnxiF1wLBOIxoD3/eAhx54LOmL0gUdbRpZlEP piGoALURMm7dTUc9k1sxqPyUb2lYYE24qjYiSHxZ+80nd5uLXJf+05cy+A7kHHcuCMV8 45CA==
In-reply-to: <1370646215-6543-1-git-send-email-ddaney.cavm@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1370646215-6543-1-git-send-email-ddaney.cavm@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
From: David Daney <david.daney@cavium.com>

Also let CPU_CAVIUM_OCTEON select KVM.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 arch/mips/Kconfig      | 1 +
 arch/mips/kvm/Kconfig  | 9 +++++++++
 arch/mips/kvm/Makefile | 1 +
 3 files changed, 11 insertions(+)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7a58ab9..16e3d22 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1426,6 +1426,7 @@ config CPU_CAVIUM_OCTEON
        select LIBFDT
        select USE_OF
        select USB_EHCI_BIG_ENDIAN_MMIO
+       select HAVE_KVM
        help
          The Cavium Octeon processor is a highly integrated chip containing
          many ethernet hardware widgets for networking tasks. The processor
diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig
index 95c0d22..32a5016 100644
--- a/arch/mips/kvm/Kconfig
+++ b/arch/mips/kvm/Kconfig
@@ -48,6 +48,15 @@ config KVM_MIPS_DEBUG_COP0_COUNTERS
 
          If unsure, say N.
 
+config KVM_MIPSVZ
+       bool "Kernel-based Virtual Machine (KVM) using hardware MIPS-VZ support"
+       depends on HAVE_KVM
+       select KVM
+       ---help---
+         Support for hosting Guest kernels on hardware with the
+         MIPS-VZ hardware module.
+
+
 source drivers/vhost/Kconfig
 
 endif # VIRTUALIZATION
diff --git a/arch/mips/kvm/Makefile b/arch/mips/kvm/Makefile
index 3377197..595358f 100644
--- a/arch/mips/kvm/Makefile
+++ b/arch/mips/kvm/Makefile
@@ -13,3 +13,4 @@ kvm_mipste-objs               := kvm_mips_emul.o kvm_locore.o 
kvm_mips_int.o \
 
 obj-$(CONFIG_KVM)              += $(common-objs) kvm_mips.o
 obj-$(CONFIG_KVM_MIPSTE)       += kvm_mipste.o
+obj-$(CONFIG_KVM_MIPSVZ)       += kvm_mipsvz.o kvm_mipsvz_guest.o
-- 
1.7.11.7


<Prev in Thread] Current Thread [Next in Thread>