9 files changed, 18 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 04d8fb8..ab317af 100644
--- a/Makefile
+++ b/Makefile
@@ -16,25 +16,25 @@ CSTYLE=$(KERNEL_SOURCE)/usr/src/tools/scripts/cstyle
 
 all: kvm kvm.so
 
-kvm: kvm.c kvm_x86.c emulate.c kvm.h kvm_x86host.h msr.h bitops.h kvm_subr.c irq.c i8254.c lapic.c kvm_mmu.c
+kvm: kvm.c kvm_x86.c kvm_emulate.c kvm.h kvm_x86host.h msr.h bitops.h kvm_subr.c kvm_irq.c kvm_i8254.c kvm_lapic.c kvm_mmu.c
 	$(CC) $(CFLAGS) $(INCLUDEDIR) kvm.c
 	$(CC) $(CFLAGS) $(INCLUDEDIR) kvm_x86.c
-	$(CC) $(CFLAGS) $(INCLUDEDIR) emulate.c
+	$(CC) $(CFLAGS) $(INCLUDEDIR) kvm_emulate.c
 	$(CC) $(CFLAGS) $(INCLUDEDIR) kvm_subr.c
-	$(CC) $(CFLAGS) $(INCLUDEDIR) irq.c
-	$(CC) $(CFLAGS) $(INCLUDEDIR) i8254.c
-	$(CC) $(CFLAGS) $(INCLUDEDIR) lapic.c
+	$(CC) $(CFLAGS) $(INCLUDEDIR) kvm_irq.c
+	$(CC) $(CFLAGS) $(INCLUDEDIR) kvm_i8254.c
+	$(CC) $(CFLAGS) $(INCLUDEDIR) kvm_lapic.c
 	$(CC) $(CFLAGS) $(INCLUDEDIR) kvm_mmu.c
 	$(CTFCONVERT) -i -L VERSION kvm.o
 	$(CTFCONVERT) -i -L VERSION kvm_x86.o
-	$(CTFCONVERT) -i -L VERSION emulate.o
+	$(CTFCONVERT) -i -L VERSION kvm_emulate.o
 	$(CTFCONVERT) -i -L VERSION kvm_subr.o
-	$(CTFCONVERT) -i -L VERSION irq.o
-	$(CTFCONVERT) -i -L VERSION i8254.o
-	$(CTFCONVERT) -i -L VERSION lapic.o
+	$(CTFCONVERT) -i -L VERSION kvm_irq.o
+	$(CTFCONVERT) -i -L VERSION kvm_i8254.o
+	$(CTFCONVERT) -i -L VERSION kvm_lapic.o
 	$(CTFCONVERT) -i -L VERSION kvm_mmu.o
-	$(LD) -r -o kvm kvm.o kvm_x86.o emulate.o kvm_subr.o irq.o i8254.o lapic.o kvm_mmu.o
-	$(CTFMERGE) -L VERSION -o kvm kvm.o kvm_x86.o emulate.o kvm_subr.o irq.o i8254.o lapic.o kvm_mmu.o
+	$(LD) -r -o kvm kvm.o kvm_x86.o kvm_emulate.o kvm_subr.o kvm_irq.o kvm_i8254.o kvm_lapic.o kvm_mmu.o
+	$(CTFMERGE) -L VERSION -o kvm kvm.o kvm_x86.o kvm_emulate.o kvm_subr.o kvm_irq.o kvm_i8254.o kvm_lapic.o kvm_mmu.o
 
 kvm.so: kvm_mdb.c
 	gcc -m64 -shared \
@@ -47,8 +47,8 @@ install: kvm
 	@pfexec cp kvm.conf /usr/kernel/drv
 
 check:
-	@$(CSTYLE) kvm.c kvm_mdb.c emulate.c kvm_x86.c irq.c lapic.c i8254.c kvm_mmu.c
-	@./tools/xxxcheck kvm_x86.c kvm.c irq.c lapic.c i8254.c kvm_mmu.c
+	@$(CSTYLE) kvm.c kvm_mdb.c kvm_emulate.c kvm_x86.c kvm_irq.c kvm_lapic.c kvm_i8254.c kvm_mmu.c
+	@./tools/xxxcheck kvm_x86.c kvm.c kvm_irq.c kvm_lapic.c kvm_i8254.c kvm_mmu.c
 
 load: install
 	@echo "==> Loading kvm module"
diff --git a/irq.h b/irq.h
index f31aca2..e452918 100644
--- a/irq.h
+++ b/irq.h
@@ -30,7 +30,7 @@
 
 #include "iodev.h"
 #include "ioapic.h"
-#include "lapic.h"
+#include "kvm_lapic.h"
 #endif /*XXX*/
 
 #define PIC_NUM_PINS 16
diff --git a/emulate.c b/kvm_emulate.c
index e25c0c4..e25c0c4 100644
--- a/emulate.c
+++ b/kvm_emulate.c
diff --git a/i8254.c b/kvm_i8254.c
index d453f49..d453f49 100644
--- a/i8254.c
+++ b/kvm_i8254.c
diff --git a/i8254.h b/kvm_i8254.h
index b85d21d..5924d6b 100644
--- a/i8254.h
+++ b/kvm_i8254.h
@@ -1,5 +1,5 @@
-#ifndef __I8254_H
-#define __I8254_h
+#ifndef __KVM_I8254_H
+#define __KVM_I8254_H
 
 /* XXX Our header files suck */
 struct kvm;
diff --git a/irq.c b/kvm_irq.c
index 7d698b6..7d698b6 100644
--- a/irq.c
+++ b/kvm_irq.c
diff --git a/lapic.c b/kvm_lapic.c
index 74a968d..74a968d 100644
--- a/lapic.c
+++ b/kvm_lapic.c
diff --git a/lapic.h b/kvm_lapic.h
index 65d89d3..65d89d3 100644
--- a/lapic.h
+++ b/kvm_lapic.h
diff --git a/kvm_x86.c b/kvm_x86.c
index a2b02a4..f975e45 100644
--- a/kvm_x86.c
+++ b/kvm_x86.c
@@ -41,8 +41,8 @@
 #include "kvm.h"
 #include "ioapic.h"
 #include "irq.h"
-#include "i8254.h"
-#include "lapic.h"
+#include "kvm_i8254.h"
+#include "kvm_lapic.h"
 
 #undef DEBUG