summaryrefslogtreecommitdiff
path: root/src/cpu/kvm
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu/kvm')
-rw-r--r--src/cpu/kvm/base.cc5
-rw-r--r--src/cpu/kvm/perfevent.cc2
-rw-r--r--src/cpu/kvm/timer.cc8
-rw-r--r--src/cpu/kvm/vm.cc5
-rw-r--r--src/cpu/kvm/x86_cpu.cc7
5 files changed, 15 insertions, 12 deletions
diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc
index ddf80dbaa..723feda44 100644
--- a/src/cpu/kvm/base.cc
+++ b/src/cpu/kvm/base.cc
@@ -37,6 +37,8 @@
* Authors: Andreas Sandberg
*/
+#include "cpu/kvm/base.hh"
+
#include <linux/kvm.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
@@ -48,7 +50,6 @@
#include "arch/mmapped_ipr.hh"
#include "arch/utility.hh"
-#include "cpu/kvm/base.hh"
#include "debug/Checkpoint.hh"
#include "debug/Drain.hh"
#include "debug/Kvm.hh"
@@ -58,8 +59,6 @@
#include "sim/process.hh"
#include "sim/system.hh"
-#include <signal.h>
-
/* Used by some KVM macros */
#define PAGE_SIZE pageSize
diff --git a/src/cpu/kvm/perfevent.cc b/src/cpu/kvm/perfevent.cc
index acc2af04b..5738b8eca 100644
--- a/src/cpu/kvm/perfevent.cc
+++ b/src/cpu/kvm/perfevent.cc
@@ -37,11 +37,11 @@
* Authors: Andreas Sandberg
*/
+#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/syscall.h>
#include <sys/types.h>
-#include <fcntl.h>
#include <syscall.h>
#include <unistd.h>
diff --git a/src/cpu/kvm/timer.cc b/src/cpu/kvm/timer.cc
index cb48046f7..03b31bd3f 100644
--- a/src/cpu/kvm/timer.cc
+++ b/src/cpu/kvm/timer.cc
@@ -37,15 +37,17 @@
* Authors: Andreas Sandberg
*/
+#include "cpu/kvm/timer.hh"
+
+#include <sys/syscall.h>
+#include <unistd.h>
+
#include <algorithm>
#include <csignal>
#include <ctime>
-#include <unistd.h>
-#include <sys/syscall.h>
#include "base/misc.hh"
#include "base/trace.hh"
-#include "cpu/kvm/timer.hh"
#include "debug/KvmTimer.hh"
/* According to timer_create(2), the value SIGEV_THREAD_ID can be used
diff --git a/src/cpu/kvm/vm.cc b/src/cpu/kvm/vm.cc
index 39bce32f4..d3ab8c45a 100644
--- a/src/cpu/kvm/vm.cc
+++ b/src/cpu/kvm/vm.cc
@@ -38,17 +38,18 @@
* Authors: Andreas Sandberg
*/
+#include "cpu/kvm/vm.hh"
+
+#include <fcntl.h>
#include <linux/kvm.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <fcntl.h>
#include <unistd.h>
#include <cerrno>
#include <memory>
-#include "cpu/kvm/vm.hh"
#include "debug/Kvm.hh"
#include "params/KvmVM.hh"
#include "sim/system.hh"
diff --git a/src/cpu/kvm/x86_cpu.cc b/src/cpu/kvm/x86_cpu.cc
index f8f66af2f..bdbdadf71 100644
--- a/src/cpu/kvm/x86_cpu.cc
+++ b/src/cpu/kvm/x86_cpu.cc
@@ -28,18 +28,19 @@
* Authors: Andreas Sandberg
*/
+#include "cpu/kvm/x86_cpu.hh"
+
#include <linux/kvm.h>
#include <algorithm>
#include <cerrno>
#include <memory>
-#include "arch/x86/regs/msr.hh"
+#include "arch/registers.hh"
#include "arch/x86/cpuid.hh"
+#include "arch/x86/regs/msr.hh"
#include "arch/x86/utility.hh"
-#include "arch/registers.hh"
#include "cpu/kvm/base.hh"
-#include "cpu/kvm/x86_cpu.hh"
#include "debug/Drain.hh"
#include "debug/Kvm.hh"
#include "debug/KvmContext.hh"