netbsd: Adjust coding style of include path

Adjust the format of include path for NetBSD platform. * Add header search paths to the project file and remove the redundant relative paths * Sort the order of included headers Signed-off-by: Wenchao Wang <[email protected]>
intel · Jan 7, 2022 · 33a0980 · 33a0980
1 parent 2afe7f5
commit 33a0980
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 23 deletions.
diff --git a/include/netbsd/hax_types_netbsd.h b/include/netbsd/hax_types_netbsd.h
@@ -35,6 +35,8 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
+#include "hax_list.h"
+
 // Signed Types
 typedef int8_t  int8;
 typedef int16_t int16;
@@ -59,7 +61,6 @@ typedef uint64_t mword;
 #endif
 typedef mword HAX_VADDR_T;
 
-#include "../hax_list.h"
 struct hax_page {
     void *kva;
     struct vm_page *page;

diff --git a/platforms/netbsd/Makefile b/platforms/netbsd/Makefile
@@ -2,6 +2,9 @@ S?=	/usr/src/sys
 
 KMOD=	haxm
 
+CFLAGS+= -Wno-error=address-of-packed-member
+CPPFLAGS+= -I../../include -I../../core/include
+
 # toplevel
 SRCS+=	components.c
 SRCS+=	hax_entry.c

diff --git a/platforms/netbsd/components.c b/platforms/netbsd/components.c
@@ -34,8 +34,8 @@
 #include <sys/device.h>
 #include <sys/kmem.h>
 
-#include "../../core/include/hax_core_interface.h"
-#include "../../core/include/config.h"
+#include "config.h"
+#include "interface.h"
 
 extern struct cfdriver hax_vm_cd;
 extern struct cfdriver hax_vcpu_cd;

diff --git a/platforms/netbsd/hax_entry.c b/platforms/netbsd/hax_entry.c
@@ -35,10 +35,8 @@
 #include <sys/module.h>
 #include <sys/cpu.h>
 
-#include "../../core/include/config.h"
-#include "../../core/include/hax_core_interface.h"
-#include "../../include/hax.h"
-#include "../../include/hax_interface.h"
+#include "config.h"
+#include "interface.h"
 
 #define HAX_DEVICE_NAME "HAX"
 #define HAX_VM_DEVICE_NAME "hax_vm"

diff --git a/platforms/netbsd/hax_entry_hax.c b/platforms/netbsd/hax_entry_hax.c
@@ -38,11 +38,10 @@
 #include <machine/specialreg.h>
 #include <machine/cpufunc.h>
 
-#include "../../include/hax.h"
-#include "../../include/hax_interface.h"
-#include "../../include/hax_release_ver.h"
-#include "../../core/include/hax_core_interface.h"
-#include "../../core/include/config.h"
+#include "hax_release_ver.h"
+
+#include "config.h"
+#include "interface.h"
 
 dev_type_open(hax_open);
 dev_type_close(hax_close);

diff --git a/platforms/netbsd/hax_entry_vcpu.c b/platforms/netbsd/hax_entry_vcpu.c
@@ -35,7 +35,7 @@
 #include <sys/lwp.h>
 #include <sys/proc.h>
 
-#include "../../core/include/hax_core_interface.h"
+#include "interface.h"
 
 extern struct cfdriver hax_vcpu_cd;
 

diff --git a/platforms/netbsd/hax_entry_vm.c b/platforms/netbsd/hax_entry_vm.c
@@ -35,7 +35,7 @@
 #include <sys/lwp.h>
 #include <sys/proc.h>
 
-#include "../../core/include/hax_core_interface.h"
+#include "interface.h"
 
 extern struct cfdriver hax_vm_cd;
 

diff --git a/platforms/netbsd/hax_event.c b/platforms/netbsd/hax_event.c
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../../include/hax.h"
+#include "hax.h"
 
 int hax_notify_host_event(enum hax_notify_event event, uint32_t *param,
                           uint32_t size)

diff --git a/platforms/netbsd/hax_host_mem.c b/platforms/netbsd/hax_host_mem.c
@@ -36,8 +36,9 @@
 #include <uvm/uvm.h>
 #include <machine/pmap.h>
 
-#include "../../include/hax_host_mem.h"
-#include "../../core/include/paging.h"
+#include "hax_host_mem.h"
+
+#include "paging.h"
 
 int hax_pin_user_pages(uint64_t start_uva, uint64_t size, hax_memdesc_user *memdesc)
 {

diff --git a/platforms/netbsd/hax_mem_alloc.c b/platforms/netbsd/hax_mem_alloc.c
@@ -33,7 +33,7 @@
 #include <sys/kmem.h>
 #include <uvm/uvm.h>
 
-#include "../../include/hax.h"
+#include "hax.h"
 
 void * hax_vmalloc(uint32_t size, uint32_t flags)
 {

diff --git a/platforms/netbsd/hax_mm.c b/platforms/netbsd/hax_mm.c
@@ -33,7 +33,7 @@
 #include <sys/kmem.h>
 #include <uvm/uvm.h>
 
-#include "../../include/hax.h"
+#include "hax.h"
 
 struct hax_vcpu_mem_hinfo_t {
     struct uvm_object *uao;

diff --git a/platforms/netbsd/hax_wrapper.c b/platforms/netbsd/hax_wrapper.c
@@ -39,10 +39,8 @@
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 
-
-#include "../../include/hax.h"
-#include "../../core/include/hax_core_interface.h"
-#include "../../core/include/ia32.h"
+#include "ia32.h"
+#include "interface.h"
 
 static const char* kLogPrefix[] = {
     "haxm: ",