From patchwork Thu Nov 15 01:33:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandro Sanchez X-Patchwork-Id: 10683417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B0E8914D6 for ; Thu, 15 Nov 2018 01:36:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 986492BD9E for ; Thu, 15 Nov 2018 01:36:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B18A2C0AF; Thu, 15 Nov 2018 01:36:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2E1AB2BD9E for ; Thu, 15 Nov 2018 01:36:43 +0000 (UTC) Received: from localhost ([::1]:35371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN6aI-0005ue-9m for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Nov 2018 20:36:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN6ZY-0005Z6-EV for qemu-devel@nongnu.org; Wed, 14 Nov 2018 20:35:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN6ZU-0006H7-Bi for qemu-devel@nongnu.org; Wed, 14 Nov 2018 20:35:56 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45542) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN6ZS-0006EM-Lo for qemu-devel@nongnu.org; Wed, 14 Nov 2018 20:35:52 -0500 Received: by mail-wr1-x444.google.com with SMTP id k15-v6so19329711wre.12 for ; Wed, 14 Nov 2018 17:35:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kryptoslogic.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y7htTNwD6YKTOXRlGp6It71MwE4G8+62DV6Aep6djek=; b=k7kqXvX+lmBRPI64fAY7lnQpHU/bXtvRNoyL0T9av4/04FNcvOsjQv5O5mlYCRPjOW x6ixkzpGiXkO87IREQZHv50/aI2XxgPJ8+1d11ASyEM1FEUwyHs8qKM3oyN5Pdb2ZwEA Or1mzJc4EqaHDRijGjMKVD/3baEz/0WdfCXFm6Bm6KcWT3T+ZnRttZ6jYyzhEB/eVXKK OqjCElEvxXArvS/Y141xIEi/5A/63S0Gfs0h3ZPU0OfzWaL9dAq6m7umgTCKY1czh7do Zuix+MRjtCL2MHG69obO0E/CcJ18wooV0EnFCBLxTOpbDmPnOIqr39Hx4A1Ts5MQasez xAdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y7htTNwD6YKTOXRlGp6It71MwE4G8+62DV6Aep6djek=; b=T71rN+mUTBnaOnBeP2D1gpKRqoZGw1yFT0lTb6eKPDtV3hgtGcSscjgjkJdetcnEGa xiE7h2CYB5fXDauv+uRWHw5ndOiiPjW5vAj9jl1dL05ibG8Int7dNJjXM1jiF3EzcFJ8 Rr4lPafIso1sXXlCkdXpn0uXSg0NKatPOIe/lJCtZ2Yp5imoj09E+IO48ojAyChXuW5R HzA7SQOiN5Tk+ekFHF7T4/8kuH/Qz3SUdBEt9xlenW/Bi1n4VxtAvGdsoOkLvsDTpkCu NClE8SgF19EDvtRmaf76Mqk9LiBS8wthoZsA0WOkbzy1Q/hAAsnrT+buZYAeFkixFJNr lvsg== X-Gm-Message-State: AGRZ1gKkF1ttnLi5uRyZSQWhIjRM8Xj3F7ZjprgNZuC2L01Sw3mpn6dV yQOq6pdZeLUd595DmDnD1P8Oo5PchHpq1Q== X-Google-Smtp-Source: AJdET5fyHQFloM843q5VJdaQIfXs8Qe/l8XDGykglvO+SqlZUjF6VmnWvVlar5AjoFJFuevdcgpDgQ== X-Received: by 2002:adf:b315:: with SMTP id j21-v6mr3991519wrd.46.1542245747593; Wed, 14 Nov 2018 17:35:47 -0800 (PST) Received: from localhost.localdomain (189.red-83-55-165.dynamicip.rima-tde.net. [83.55.165.189]) by smtp.gmail.com with ESMTPSA id h16-v6sm23030600wrb.73.2018.11.14.17.35.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 17:35:46 -0800 (PST) From: Alexandro Sanchez Bach To: qemu-devel@nongnu.org Date: Wed, 14 Nov 2018 17:33:30 -0800 Message-Id: <20181115013331.65820-1-asanchez@kryptoslogic.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <87y39vd7jn.fsf@linaro.org> References: <87y39vd7jn.fsf@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH] hax: Support for Linux hosts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandro Sanchez Bach , Eduardo Habkost , yu.ning@intel.com, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 | 4 +++- target/i386/hax-i386.h | 6 +++--- target/i386/{hax-darwin.c => hax-posix.c} | 0 target/i386/{hax-darwin.h => hax-posix.h} | 0 4 files changed, 6 insertions(+), 4 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..070e701856 100644 --- a/target/i386/Makefile.objs +++ b/target/i386/Makefile.objs @@ -12,8 +12,10 @@ 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_POSIX +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_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..f13fa4638f 100644 --- a/target/i386/hax-i386.h +++ b/target/i386/hax-i386.h @@ -16,7 +16,7 @@ #include "cpu.h" #include "sysemu/hax.h" -#ifdef CONFIG_DARWIN +#ifdef CONFIG_POSIX typedef int hax_fd; #endif @@ -82,8 +82,8 @@ hax_fd hax_mod_open(void); void hax_memory_init(void); -#ifdef CONFIG_DARWIN -#include "target/i386/hax-darwin.h" +#ifdef CONFIG_POSIX +#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