From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMuqm-0005hM-Df for qemu-devel@nongnu.org; Wed, 14 Nov 2018 08:05:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMuqi-000791-AE for qemu-devel@nongnu.org; Wed, 14 Nov 2018 08:04:56 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:55271) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gMuqi-00077w-4G for qemu-devel@nongnu.org; Wed, 14 Nov 2018 08:04:52 -0500 Received: by mail-wm1-x344.google.com with SMTP id r63-v6so15438749wma.4 for ; Wed, 14 Nov 2018 05:04:51 -0800 (PST) From: Alexandro Sanchez Bach Date: Wed, 14 Nov 2018 05:04:28 -0800 Message-Id: <20181114130428.32326-1-asanchez@kryptoslogic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] hax: Support for Linux hosts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: yu.ning@intel.com, Alexandro Sanchez Bach , Paolo Bonzini , Richard Henderson , Eduardo Habkost 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 --- 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 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 + #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 #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 -- 2.19.1