| Message ID | 20170922154014.29350-8-f4bug@amsat.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | remove i386/pc dependency from non-PC world (part 1) | expand |
On 22 September 2017 at 16:39, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > applied using ./scripts/clean-includes > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/sysemu/hax.h | 1 - > target/i386/hax-darwin.h | 3 --- > target/i386/hax-windows.h | 2 -- > target/i386/hax-darwin.c | 8 ++------ > 4 files changed, 2 insertions(+), 12 deletions(-) I suspect the includes in hax-windows.h could be trimmed a bit more (since we're guaranteed that if CONFIG_WIN32 then we've included sysemu/os-win32.h), but this is fine as it stands. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h index 232a68ab1b..f252399623 100644 --- a/include/sysemu/hax.h +++ b/include/sysemu/hax.h @@ -22,7 +22,6 @@ #ifndef QEMU_HAX_H #define QEMU_HAX_H -#include "config-host.h" #include "qemu-common.h" int hax_sync_vcpus(void); diff --git a/target/i386/hax-darwin.h b/target/i386/hax-darwin.h index 0c0968b77d..fb8e25a096 100644 --- a/target/i386/hax-darwin.h +++ b/target/i386/hax-darwin.h @@ -15,10 +15,7 @@ #ifndef TARGET_I386_HAX_DARWIN_H #define TARGET_I386_HAX_DARWIN_H -#include <sys/types.h> #include <sys/ioctl.h> -#include <sys/mman.h> -#include <stdarg.h> #define HAX_INVALID_FD (-1) static inline int hax_invalid_fd(hax_fd fd) diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h index 1d8f68de91..f7c3e99246 100644 --- a/target/i386/hax-windows.h +++ b/target/i386/hax-windows.h @@ -24,8 +24,6 @@ #include <memory.h> #include <malloc.h> #include <winioctl.h> -#include <string.h> -#include <stdio.h> #include <windef.h> #define HAX_INVALID_FD INVALID_HANDLE_VALUE diff --git a/target/i386/hax-darwin.c b/target/i386/hax-darwin.c index 1c5bbd0a2d..ee9417454c 100644 --- a/target/i386/hax-darwin.c +++ b/target/i386/hax-darwin.c @@ -11,13 +11,9 @@ */ /* HAX module interface - darwin version */ -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <errno.h> -#include <sys/ioctl.h> - #include "qemu/osdep.h" +#include <sys/ioctl.h> + #include "target/i386/hax-i386.h" hax_fd hax_mod_open(void)
applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/sysemu/hax.h | 1 - target/i386/hax-darwin.h | 3 --- target/i386/hax-windows.h | 2 -- target/i386/hax-darwin.c | 8 ++------ 4 files changed, 2 insertions(+), 12 deletions(-)