Alexandro Sanchez Bach <asanc...@kryptoslogic.com> writes:
> Intel HAXM supports now 32-bit and 64-bit Linux hosts. This patch includes
> the corresponding userland changes.
>
> Since the Darwin userland backend is POSIX-compliant, the hax-darwin.{c,h}
> files have been renamed to hax-posix.{c,h}. This prefix is consistent with
> the naming used in the rest of QEMU.
>
> Signed-off-by: Alexandro Sanchez Bach <asanc...@kryptoslogic.com>
> ---
> target/i386/Makefile.objs | 5 ++++-
> target/i386/hax-i386.h | 10 +++++++++-
> target/i386/{hax-darwin.c => hax-posix.c} | 0
> target/i386/{hax-darwin.h => hax-posix.h} | 0
> 4 files changed, 13 insertions(+), 2 deletions(-)
> rename target/i386/{hax-darwin.c => hax-posix.c} (100%)
> rename target/i386/{hax-darwin.h => hax-posix.h} (100%)
>
> diff --git a/target/i386/Makefile.objs b/target/i386/Makefile.objs
> index 04678f5503..be36d31d23 100644
> --- a/target/i386/Makefile.objs
> +++ b/target/i386/Makefile.objs
> @@ -12,8 +12,11 @@ obj-$(call lnot,$(CONFIG_SEV)) += sev-stub.o
> ifdef CONFIG_WIN32
> obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-windows.o
> endif
> +ifdef CONFIG_LINUX
> +obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-posix.o
> +endif
> ifdef CONFIG_DARWIN
> -obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-darwin.o
> +obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-posix.o
This is starting to get repetitive, perhaps:
obj-$(CONFIG_HAX) += hax-all.o hax-mem.o
ifneq ($(CONFIG_LINUX)$(CONFIG_DARWIN),)
obj-$(CONFIG_HAX) += hax-posix.o
endif
ifdef CONFIG_WIN32
obj-$(CONFIG_HAX) += hax-windows.o
endif
Would be better?
> obj-$(CONFIG_HVF) += hvf/
> endif
> obj-$(CONFIG_WHPX) += whpx-all.o
> diff --git a/target/i386/hax-i386.h b/target/i386/hax-i386.h
> index 6abc156f88..f87a64c9df 100644
> --- a/target/i386/hax-i386.h
> +++ b/target/i386/hax-i386.h
> @@ -20,6 +20,10 @@
> typedef int hax_fd;
> #endif
>
> +#ifdef CONFIG_LINUX
> +typedef int hax_fd;
> +#endif
Again this could be merged with the other POSIX like above.
> +
> #ifdef CONFIG_WIN32
> typedef HANDLE hax_fd;
> #endif
> @@ -83,7 +87,11 @@ void hax_memory_init(void);
>
>
> #ifdef CONFIG_DARWIN
> -#include "target/i386/hax-darwin.h"
> +#include "target/i386/hax-posix.h"
> +#endif
> +
> +#ifdef CONFIG_LINUX
> +#include "target/i386/hax-posix.h"
> #endif
And here.
In fact looking at my config-host.mak we have a CONFIG_POSIX so you
could use that.
>
> #ifdef CONFIG_WIN32
> diff --git a/target/i386/hax-darwin.c b/target/i386/hax-posix.c
> similarity index 100%
> rename from target/i386/hax-darwin.c
> rename to target/i386/hax-posix.c
> diff --git a/target/i386/hax-darwin.h b/target/i386/hax-posix.h
> similarity index 100%
> rename from target/i386/hax-darwin.h
> rename to target/i386/hax-posix.h
--
Alex Bennée
