From 82096aeceb97079cf7dde82e6401f526d0fb96ac Mon Sep 17 00:00:00 2001
From: Robert Mustacchi <rm@joyent.com>
Date: Fri, 1 Jul 2011 16:06:51 -0700
Subject: HVM-466 Finish hdrchk cleanup

---
 Makefile             | 44 ++++++++++++++++++++++++++++----------------
 kvm_coalesced_mmio.h |  2 ++
 kvm_emulate.h        |  3 +++
 kvm_lapic.h          |  2 ++
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index e5483a0..749fa38 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,8 @@ CFLAGS += -D_KERNEL -D_MACHDEP -Dx86 -DDEBUG -c -g -DCONFIG_SOLARIS -O2 -fident
 INCLUDEDIR= -I $(KERNEL_SOURCE)/usr/src/uts/intel -I $(KERNEL_SOURCE)/usr/src/uts/i86pc -I $(KERNEL_SOURCE)/usr/src/uts/common
 CSTYLE=$(KERNEL_SOURCE)/usr/src/tools/scripts/cstyle
 HDRCHK=tools/hdrchk
+HDRCHK_USRFLAG="gcc"
+HDRCHK_SYSFLAG="gcc -D_KERNEL"
 
 all: kvm kvm.so
 
@@ -39,7 +41,30 @@ HEADERS=			\
 	kvm_tss.h		\
 	kvm_types.h		\
 	kvm_vmx.h		\
-	kvm_x86.h		\
+	kvm_x86host.h		\
+	kvm_x86impl.h		\
+	kvm_x86.h		
+
+HDRCHK_USRHDRS= 		\
+	kvm.h			\
+	kvm_types.h		\
+	kvm_x86.h
+
+HDRCHK_SYSHDRS=			\
+	kvm_bitops.h		\
+	kvm_cache_regs.h	\
+	kvm_cpuid.h		\
+	kvm_host.h		\
+	kvm_impl.h		\
+	kvm_ioapic.h		\
+	kvm_iodev.h		\
+	kvm_irq.h		\
+	kvm_msidef.h		\
+	kvm_mmu.h		\
+	kvm_timer.h		\
+	kvm_tss.h		\
+	kvm_types.h		\
+	kvm_vmx.h		\
 	kvm_x86host.h		\
 	kvm_x86impl.h
 
@@ -90,21 +115,8 @@ install: kvm
 check:
 	@$(CSTYLE) kvm.c kvm_mdb.c kvm_emulate.c kvm_x86.c kvm_irq.c kvm_lapic.c kvm_i8254.c kvm_mmu.c kvm_iodev.c kvm_ioapic.c kvm_vmx.c kvm_i8259.c kvm_coalesced_mmio.c kvm_irq_comm.c kvm_cache_regs.c kvm_bitops.c $(HEADERS)
 	@./tools/xxxcheck kvm_x86.c kvm.c kvm_irq.c kvm_lapic.c kvm_i8254.c kvm_mmu.c kvm_iodev.c kvm_ioapic.c kvm_vmx.c kvm_i8259.c kvm_coalesced_mmio.c kvm_irq_comm.c kvm_cache_regs.c kvm_bitops.c
-	@$(HDRCHK) gcc kvm.h			
-	@$(HDRCHK) gcc kvm_bitops.h		
-	@$(HDRCHK) gcc kvm_cpuid.h		
-	@$(HDRCHK) gcc kvm_impl.h		
-	@$(HDRCHK) gcc kvm_iodev.h		
-	@$(HDRCHK) gcc kvm_msidef.h		
-	@$(HDRCHK) gcc kvm_mmu.h		
-	@$(HDRCHK) gcc kvm_timer.h		
-	@$(HDRCHK) gcc kvm_tss.h		
-	@$(HDRCHK) gcc kvm_types.h		
-	@$(HDRCHK) gcc kvm_vmx.h		
-	@$(HDRCHK) gcc kvm_x86.h		
-	@$(HDRCHK) gcc kvm_x86host.h		
-
-
+	@$(HDRCHK) $(HDRCHK_USRFLAG) $(HDRCHK_USRHDRS)
+	@$(HDRCHK) $(HDRCHK_SYSFLAG) $(HDRCHK_SYSHDRS)
 
 load: install
 	@echo "==> Loading kvm module"
diff --git a/kvm_coalesced_mmio.h b/kvm_coalesced_mmio.h
index b7899af..a82221a 100644
--- a/kvm_coalesced_mmio.h
+++ b/kvm_coalesced_mmio.h
@@ -9,6 +9,8 @@
  *  Author: Laurent Vivier <Laurent.Vivier@bull.net>
  *
  */
+#include <sys/mutex.h>
+
 #include "kvm_iodev.h"
 
 #define	KVM_COALESCED_MMIO_ZONE_MAX 100
diff --git a/kvm_emulate.h b/kvm_emulate.h
index 8a215a5..84237b7 100644
--- a/kvm_emulate.h
+++ b/kvm_emulate.h
@@ -11,6 +11,9 @@
 #ifndef _ASM_X86_KVM_X86_EMULATE_H
 #define	_ASM_X86_KVM_X86_EMULATE_H
 
+#include <sys/stdint.h>
+
+struct kvm_vcpu;
 struct x86_emulate_ctxt;
 #ifdef _KERNEL
 /*
diff --git a/kvm_lapic.h b/kvm_lapic.h
index c88f513..5884d66 100644
--- a/kvm_lapic.h
+++ b/kvm_lapic.h
@@ -1,6 +1,8 @@
 #ifndef __KVM_X86_LAPIC_H
 #define	__KVM_X86_LAPIC_H
 
+#include <vm/page.h>
+
 #include "kvm_iodev.h"
 #include "kvm_timer.h"
 
-- 
cgit v1.2.3