summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kvm.c4
-rw-r--r--kvm_apicdef.h (renamed from apicdef.h)0
-rw-r--r--kvm_cache_regs.c2
-rw-r--r--kvm_coalesced_mmio.c2
-rw-r--r--kvm_i8259.c2
-rw-r--r--kvm_ioapic.c2
-rw-r--r--kvm_irq_comm.c2
-rw-r--r--kvm_lapic.c2
-rw-r--r--kvm_mdb.c2
-rw-r--r--kvm_subr.c2
-rw-r--r--kvm_vmx.c4
-rw-r--r--kvm_vmx.h (renamed from vmx.h)0
-rw-r--r--kvm_x86.c4
13 files changed, 14 insertions, 14 deletions
diff --git a/kvm.c b/kvm.c
index c6a7689..3fb2a1d 100644
--- a/kvm.c
+++ b/kvm.c
@@ -35,7 +35,7 @@
#include <sys/stream.h>
#include "kvm_bitops.h"
-#include "vmx.h"
+#include "kvm_vmx.h"
#include "msr-index.h"
#include "msr.h"
#include "irqflags.h"
@@ -44,7 +44,7 @@
#include "processor-flags.h"
#include "kvm_cpuid.h"
#include "hyperv.h"
-#include "apicdef.h"
+#include "kvm_apicdef.h"
#include "kvm_iodev.h"
#include "kvm.h"
#include "kvm_irq.h"
diff --git a/apicdef.h b/kvm_apicdef.h
index 058a077..058a077 100644
--- a/apicdef.h
+++ b/kvm_apicdef.h
diff --git a/kvm_cache_regs.c b/kvm_cache_regs.c
index a73fd60..9a61f36 100644
--- a/kvm_cache_regs.c
+++ b/kvm_cache_regs.c
@@ -12,7 +12,7 @@
#include "kvm_x86host.h"
#include "kvm_iodev.h"
#include "kvm.h"
-#include "apicdef.h"
+#include "kvm_apicdef.h"
#include "kvm_ioapic.h"
#include "kvm_lapic.h"
#include "kvm_irq.h"
diff --git a/kvm_coalesced_mmio.c b/kvm_coalesced_mmio.c
index 319d980..9768e6d 100644
--- a/kvm_coalesced_mmio.c
+++ b/kvm_coalesced_mmio.c
@@ -18,7 +18,7 @@
#include "kvm_x86host.h"
#include "kvm_iodev.h"
#include "kvm.h"
-#include "apicdef.h"
+#include "kvm_apicdef.h"
#include "kvm_ioapic.h"
#include "kvm_irq.h"
#include "kvm_iodev.h"
diff --git a/kvm_i8259.c b/kvm_i8259.c
index 04e1fe7..be716bb 100644
--- a/kvm_i8259.c
+++ b/kvm_i8259.c
@@ -38,7 +38,7 @@
#include "kvm_x86host.h"
#include "kvm_iodev.h"
#include "kvm.h"
-#include "apicdef.h"
+#include "kvm_apicdef.h"
#include "kvm_ioapic.h"
#include "kvm_lapic.h"
#include "kvm_irq.h"
diff --git a/kvm_ioapic.c b/kvm_ioapic.c
index ead53e6..ccca2a4 100644
--- a/kvm_ioapic.c
+++ b/kvm_ioapic.c
@@ -38,7 +38,7 @@
#include "kvm_x86host.h"
#include "kvm_iodev.h"
#include "kvm.h"
-#include "apicdef.h"
+#include "kvm_apicdef.h"
#include "kvm_ioapic.h"
#include "kvm_irq.h"
diff --git a/kvm_irq_comm.c b/kvm_irq_comm.c
index db9ea50..249c07e 100644
--- a/kvm_irq_comm.c
+++ b/kvm_irq_comm.c
@@ -32,7 +32,7 @@
#include "kvm_x86host.h"
#include "kvm_iodev.h"
#include "kvm.h"
-#include "apicdef.h"
+#include "kvm_apicdef.h"
#include "kvm_lapic.h"
#include "kvm_ioapic.h"
#include "kvm_irq.h"
diff --git a/kvm_lapic.c b/kvm_lapic.c
index a4cdbfd..db1ef1c 100644
--- a/kvm_lapic.c
+++ b/kvm_lapic.c
@@ -32,7 +32,7 @@
#include "kvm_x86host.h"
#include "kvm_iodev.h"
#include "kvm.h"
-#include "apicdef.h"
+#include "kvm_apicdef.h"
#include "kvm_ioapic.h"
#include "kvm_lapic.h"
#include "kvm_irq.h"
diff --git a/kvm_mdb.c b/kvm_mdb.c
index 16ae5a3..b7fd72b 100644
--- a/kvm_mdb.c
+++ b/kvm_mdb.c
@@ -23,7 +23,7 @@
#include <sys/mdb_modapi.h>
#include "msr.h"
-#include "vmx.h"
+#include "kvm_vmx.h"
#include "irqflags.h"
#include "kvm_iodev.h"
#include "kvm_host.h"
diff --git a/kvm_subr.c b/kvm_subr.c
index 316205a..3b8b49b 100644
--- a/kvm_subr.c
+++ b/kvm_subr.c
@@ -18,7 +18,7 @@
#include <sys/segments.h>
#include "msr.h"
-#include "vmx.h"
+#include "kvm_vmx.h"
#include "irqflags.h"
#include "kvm_iodev.h"
#include "kvm_host.h"
diff --git a/kvm_vmx.c b/kvm_vmx.c
index e3d3e89..69df17b 100644
--- a/kvm_vmx.c
+++ b/kvm_vmx.c
@@ -32,12 +32,12 @@
#include "kvm_x86host.h"
#include "kvm_iodev.h"
#include "kvm.h"
-#include "apicdef.h"
+#include "kvm_apicdef.h"
#include "kvm_ioapic.h"
#include "kvm_lapic.h"
#include "kvm_irq.h"
#include "kvm_mmu.h"
-#include "vmx.h"
+#include "kvm_vmx.h"
/*
* XXX
diff --git a/vmx.h b/kvm_vmx.h
index 26efee2..26efee2 100644
--- a/vmx.h
+++ b/kvm_vmx.h
diff --git a/kvm_x86.c b/kvm_x86.c
index cb686ce..1ff0d06 100644
--- a/kvm_x86.c
+++ b/kvm_x86.c
@@ -27,9 +27,9 @@
#include "kvm_bitops.h"
#include "msr-index.h"
#include "msr.h"
-#include "vmx.h"
+#include "kvm_vmx.h"
#include "processor-flags.h"
-#include "apicdef.h"
+#include "kvm_apicdef.h"
#include "kvm_types.h"
#include "kvm_host.h"
#include "kvm_iodev.h"