From: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: aleksandar.qemu.devel@gmail.com
Subject: [PULL 1/6] hw/mips: Implement the kvm_type() hook in MachineClass
Date: Sat, 27 Jun 2020 21:51:38 +0200 [thread overview]
Message-ID: <1593287503-25197-2-git-send-email-aleksandar.qemu.devel@gmail.com> (raw)
In-Reply-To: <1593287503-25197-1-git-send-email-aleksandar.qemu.devel@gmail.com>
From: Huacai Chen <zltjiangshi@gmail.com>
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>
---
target/mips/kvm_mips.h | 11 +++++++++++
target/mips/kvm.c | 26 ++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/target/mips/kvm_mips.h b/target/mips/kvm_mips.h
index 1e40147..171d53d 100644
--- a/target/mips/kvm_mips.h
+++ b/target/mips/kvm_mips.h
@@ -12,6 +12,8 @@
#ifndef KVM_MIPS_H
#define KVM_MIPS_H
+#include "cpu.h"
+
/**
* kvm_mips_reset_vcpu:
* @cpu: MIPSCPU
@@ -23,4 +25,13 @@ void kvm_mips_reset_vcpu(MIPSCPU *cpu);
int kvm_mips_set_interrupt(MIPSCPU *cpu, int irq, int level);
int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level);
+#ifdef CONFIG_KVM
+int mips_kvm_type(MachineState *machine, const char *vm_type);
+#else
+static inline int mips_kvm_type(MachineState *machine, const char *vm_type)
+{
+ return 0;
+}
+#endif
+
#endif /* KVM_MIPS_H */
diff --git a/target/mips/kvm.c b/target/mips/kvm.c
index 96cfa10..72637a1 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;
+}
--
2.7.4
next prev parent reply other threads:[~2020-06-27 19:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-27 19:51 [PULL 0/6] MIPS + TCG Continuous Benchmarking queue for June 27th, 2020 Aleksandar Markovic
2020-06-27 19:51 ` Aleksandar Markovic [this message]
2020-06-27 19:51 ` [PULL 2/6] hw/intc: Add Loongson LIOINTC support Aleksandar Markovic
2020-06-27 19:51 ` [PULL 3/6] MAINTAINERS: Add Loongson-3 maintainer and reviewer Aleksandar Markovic
2020-06-29 8:09 ` Philippe Mathieu-Daudé
2020-06-29 9:56 ` Aleksandar Markovic
2020-07-01 10:19 ` Philippe Mathieu-Daudé
2020-06-27 19:51 ` [PULL 4/6] scripts/performance: Add topN_perf.py script Aleksandar Markovic
2020-06-27 19:51 ` [PULL 5/6] scripts/performance: Add topN_callgrind.py script Aleksandar Markovic
2020-06-27 19:51 ` [PULL 6/6] MAINTAINERS: Add 'Performance Tools and Tests' subsection Aleksandar Markovic
2020-06-29 8:13 ` Philippe Mathieu-Daudé
2020-06-29 10:28 ` Aleksandar Markovic
2020-07-01 10:32 ` Philippe Mathieu-Daudé
2020-07-01 10:49 ` Philippe Mathieu-Daudé
2020-06-28 13:38 ` [PULL 0/6] MIPS + TCG Continuous Benchmarking queue for June 27th, 2020 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1593287503-25197-2-git-send-email-aleksandar.qemu.devel@gmail.com \
--to=aleksandar.qemu.devel@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).