On 12/21/22 01:17, Philippe Mathieu-Daudé wrote:
> From: Paolo Bonzini<pbonzini at redhat.com>
>
> This support was limited to the Malta board, drop it.
> I do not have a machine that can run VZ KVM, so I am assuming
> that it works for -M malta as well.
>
> Signed-off-by: Paolo Bonzini<pbonzini at redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé<philmd at linaro.org>
> ---
> Since Paolo's v1:
>
> - Remove cpu_mips_kvm_um_phys_to_kseg0() declaration in "cpu.h"
> - Remove unused KVM_KSEG0_BASE/KVM_KSEG2_BASE definitions
> - Use USEG_LIMIT/KSEG0_BASE instead of magic values
>
> /* Check where the kernel has been linked */
> - if (!(kernel_entry & 0x80000000ll)) {
> - error_report("CONFIG_KVM_GUEST kernels are not supported");
> + if (kernel_entry <= USEG_LIMIT) {
> + error_report("Trap-and-Emul kernels (Linux CONFIG_KVM_GUEST)"
> + " are not supported");
>
> - env->CP0_EBase = (cs->cpu_index & 0x3FF) | (int32_t)0x80000000;
> + env->CP0_EBase = KSEG0_BASE | (cs->cpu_index & 0x3FF);
> ---
> docs/about/deprecated.rst | 9 -------
> docs/about/removed-features.rst | 9 +++++++
> hw/mips/malta.c | 46 +++++----------------------------
> target/mips/cpu.c | 7 +----
> target/mips/cpu.h | 3 ---
> target/mips/internal.h | 3 ---
> target/mips/kvm.c | 11 +-------
> target/mips/sysemu/addr.c | 17 ------------
> target/mips/sysemu/physaddr.c | 13 ----------
> 9 files changed, 18 insertions(+), 100 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson at linaro.org>
r~