Adjust coding style of include path by wcwang · Pull Request #429 · intel/haxm (original) (raw)

This repository was archived by the owner on Jan 28, 2023. It is now read-only.

Conversation9 Commits4 Checks0 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

Adjust the format of include path for all platforms according to the coding style. In the #include directive, only the header file name (or prefixed with the name of the subdirectory under the include path) is reserved.

• Add header search paths to the project file and remove the redundant relative paths in headers, implementation and resource files
• Update the #include directives for Windows, macOS, Linux and NetBSD platforms

Adjust the format of include path for Windows platform according to the coding style.

• Add header search paths to the project file and remove the redundant relative paths
• Include headers in the following order:
  • Related header
  • System headers
  • Public platform-independent headers
  • Public platform-dependent headers
  • Private platform-independent headers
  • Private platform-dependent headers
• Unify the naming style for header files
• Move the IOCTL definitions to the Windows interface header file

Signed-off-by: Wenchao Wang wenchao.wang@intel.com

Adjust the format of include path for macOS platform.

• Add header search paths to the project file and remove the redundant relative paths
• Sort the order of included headers
• Unify the name of platform-dependent header files and implementation files to be consistent with other platforms

Signed-off-by: Wenchao Wang wenchao.wang@intel.com

Did you test NetBSD? param.h and types.h must go first.

Did you test NetBSD? param.h and types.h must go first.

Thanks for your attention. We don't have NetBSD environment to verify it yet. Do you have time to test it on NetBSD? If possible, you may base on my patch and complement the Makefile part for header search path and I will cancel my patch then. Thanks a lot.

Please revert all reordering of kernel headers for NetBSD and add CPPFLAGS+= -I$(src)/../../include -I$(src)/../../core/include in the Makefile. Then I will build test it.

Adjust the format of include path for Linux 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 wenchao.wang@intel.com

Thanks for your reply. I have updated the patch for NetBSD. Could you help to build it? If there is any issue, please let me know. Thanks again.

@krytarowski, have you ever verified the build on NetBSD? May I merge this PR then? Thanks a lot.

@krytarowski, sorry for bothering you. As HAXM is approaching to release, if you do not have time to verify the build, could you review the updated patch? If the NetBSD code review passes, we can merge it first. Thanks a lot.

I had to do this on top of this pull-request in order to make it buildable.

diff --git a/platforms/netbsd/Makefile b/platforms/netbsd/Makefile
index 4b601de..8853550 100644
--- a/platforms/netbsd/Makefile
+++ b/platforms/netbsd/Makefile
@@ -2,7 +2,8 @@ S?=	/usr/src/sys
 
 KMOD=	haxm
 
-CPPFLAGS+= -I$(src)/../../include -I$(src)/../../core/include
+CFLAGS+=-Wno-error=address-of-packed-member
+CPPFLAGS+= -I../../include -I../../core/include
 
 # toplevel
 SRCS+=	components.c

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 wenchao.wang@intel.com

@krytarowski, thanks for your verification. I have updated the patch of NetBSD and will merge it later. Thanks.