aboutsummaryrefslogtreecommitdiff
path: root/target/mips/kvm.c
diff options
context:
space:
mode:
authorHuacai Chen <zltjiangshi@gmail.com>2020-06-24 18:45:28 +0800
committerAleksandar Markovic <aleksandar.qemu.devel@gmail.com>2020-06-27 19:35:39 +0200
commit719d109b7fe153b0ec4dfeba2f303f864555d819 (patch)
tree96e5791640ece620ab8b020bb951f2d1769924ca /target/mips/kvm.c
parent553cf5d7c47bee05a3dec9461c1f8430316d516b (diff)
hw/mips: Implement the kvm_type() hook in MachineClass
MIPS has two types of KVM: TE & VZ, and TE is the default type. Now we can't create a VZ guest in QEMU because it lacks the kvm_type() hook in MachineClass. This patch add the the kvm_type() hook to support both of the two types. [AM: Added "if defined" guards.] Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> Signed-off-by: Huacai Chen <chenhc@lemote.com> Co-developed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Message-Id: <1592995531-32600-2-git-send-email-chenhc@lemote.com>
Diffstat (limited to 'target/mips/kvm.c')
-rw-r--r--target/mips/kvm.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/target/mips/kvm.c b/target/mips/kvm.c
index 96cfa10cf2..72637a1e02 100644
--- a/target/mips/kvm.c
+++ b/target/mips/kvm.c
@@ -21,10 +21,12 @@
#include "qemu/main-loop.h"
#include "qemu/timer.h"
#include "sysemu/kvm.h"
+#include "sysemu/kvm_int.h"
#include "sysemu/runstate.h"
#include "sysemu/cpus.h"
#include "kvm_mips.h"
#include "exec/memattrs.h"
+#include "hw/boards.h"
#define DEBUG_KVM 0
@@ -1270,3 +1272,27 @@ int kvm_arch_msi_data_to_gsi(uint32_t data)
{
abort();
}
+
+int mips_kvm_type(MachineState *machine, const char *vm_type)
+{
+#if defined(KVM_CAP_MIPS_VZ) || defined(KVM_CAP_MIPS_TE)
+ int r;
+ KVMState *s = KVM_STATE(machine->accelerator);
+#endif
+
+#if defined(KVM_CAP_MIPS_VZ)
+ r = kvm_check_extension(s, KVM_CAP_MIPS_VZ);
+ if (r > 0) {
+ return KVM_VM_MIPS_VZ;
+ }
+#endif
+
+#if defined(KVM_CAP_MIPS_TE)
+ r = kvm_check_extension(s, KVM_CAP_MIPS_TE);
+ if (r > 0) {
+ return KVM_VM_MIPS_TE;
+ }
+#endif
+
+ return -1;
+}