From 9ccd81441811ed75ac1e5ca46a982f240387a221 Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Tue, 1 Jun 2021 16:13:40 -0300 Subject: [PATCH] cpu-kvm: Fix missing includes "struct kvm_*" are declared in linux/kvm.h, and were not being included nor forward declared in the header file were it was being used. Change-Id: I511bad19882450f8ecdd6b5efb687026d0fd94ca Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/46321 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/cpu/kvm/base.hh | 7 +++++++ src/cpu/kvm/vm.hh | 5 +++++ src/cpu/kvm/x86_cpu.hh | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/src/cpu/kvm/base.hh b/src/cpu/kvm/base.hh index a19152b1d6..070985d96a 100644 --- a/src/cpu/kvm/base.hh +++ b/src/cpu/kvm/base.hh @@ -55,6 +55,13 @@ /** Signal to use to trigger exits from KVM */ #define KVM_KICK_SIGNAL SIGRTMIN +struct kvm_coalesced_mmio_ring; +struct kvm_fpu; +struct kvm_interrupt; +struct kvm_regs; +struct kvm_run; +struct kvm_sregs; + // forward declarations class ThreadContext; struct BaseKvmCPUParams; diff --git a/src/cpu/kvm/vm.hh b/src/cpu/kvm/vm.hh index 340e6f5c4f..d033bb6e3a 100644 --- a/src/cpu/kvm/vm.hh +++ b/src/cpu/kvm/vm.hh @@ -44,6 +44,11 @@ #include "base/addr_range.hh" #include "sim/sim_object.hh" +struct kvm_cpuid_entry2; +struct kvm_cpuid2; +struct kvm_msr_list; +struct kvm_vcpu_init; + // forward declarations struct KvmVMParams; class BaseKvmCPU; diff --git a/src/cpu/kvm/x86_cpu.hh b/src/cpu/kvm/x86_cpu.hh index a114a8a09f..19743f4be4 100644 --- a/src/cpu/kvm/x86_cpu.hh +++ b/src/cpu/kvm/x86_cpu.hh @@ -29,10 +29,19 @@ #ifndef __CPU_KVM_X86_CPU_HH__ #define __CPU_KVM_X86_CPU_HH__ +#include + #include "cpu/kvm/base.hh" #include "cpu/kvm/vm.hh" #include "params/X86KvmCPU.hh" +struct kvm_debugregs; +struct kvm_msr_entry; +struct kvm_msrs; +struct kvm_vcpu_events; +struct kvm_xcrs; +struct kvm_xsave; + /** * x86 implementation of a KVM-based hardware virtualized CPU. */