From patchwork Mon Aug 28 01:56:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?UTF-8?q?Sergio=20Andr=C3=A9s=20G=C3=B3mez=20Del=20Real?= X-Patchwork-Id: 9924039 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5475660380 for ; Mon, 28 Aug 2017 01:59:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 448342850F for ; Mon, 28 Aug 2017 01:59:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37AAE28646; Mon, 28 Aug 2017 01:59:01 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 DBA222850F for ; Mon, 28 Aug 2017 01:59:00 +0000 (UTC) Received: from localhost ([::1]:36497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dm9KO-0004vc-39 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 27 Aug 2017 21:59:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dm9J0-0004tc-5B for qemu-devel@nongnu.org; Sun, 27 Aug 2017 21:57:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dm9Iz-000133-ET for qemu-devel@nongnu.org; Sun, 27 Aug 2017 21:57:34 -0400 Received: from mail-vk0-x243.google.com ([2607:f8b0:400c:c05::243]:37141) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dm9Iz-00012j-9r for qemu-devel@nongnu.org; Sun, 27 Aug 2017 21:57:33 -0400 Received: by mail-vk0-x243.google.com with SMTP id z187so1877434vkd.4 for ; Sun, 27 Aug 2017 18:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xDlDbWu0zXLCsA6gj1jo7zWQAbGCqKCPKriTqserxJ4=; b=lCjcByzft0hfsgPL+hHY7I202vsRbuyOjjPIZwQdnE2JOECLyWHFuxyO4qzETIin6Y V8P3MK2SH9u1ggyEAWfCWX2NshxBoMYefZo/G8v7qrpUTxizyZ4C6AuYgZMHtlPKhGCr uUiHoSKlcwHRyeODulRD1D+TDqqe7KUUToXUI7738YXRfoB56aFyZogkrv7yZ3DFU4uT ByQETjpAFxWrTWQt72UqkYxQVZMjN/70MKDdc955nq/G9FPOXeDoy6IyT3Eti6iVcupL zYL5VFQaT2rKXMAG2SB/ybHIo4IvJp8Y2+1UKicURQasKh7Y4gnh2KM/qoI1fQ1XuNcF OP8w== 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; bh=xDlDbWu0zXLCsA6gj1jo7zWQAbGCqKCPKriTqserxJ4=; b=JnBTrvqTArvwx7vWKtH3vu/Gxk3UvqrWP0FQYQDqUy6CfgEIrShNSYzGBSEjxUyRpL KyAAK//ECLDpYA5Nowp9Iuleh0q1I5vup8CoVRvIZaEj3gV231CGpRMP64d4zqHJrNrU a7VKg1IEoLbvDDPYc7doHkTalyfQdGJxIEiT5s0PQIKYEC6Xm8iZ5h4frA+M8acBmLaV d3BhR6x/mxWamXPqyJ6//vQYOYnMN3A5wEvV0JQ6n92NE0ZLxdok4SIfz/tcMgfNvVp+ CRI9gVV0Km+I71V7dqWS+HMFsC/IKFj/7PvVr20n/viNUySPsucNJ6h+dX3VUeeopdoj OsOw== X-Gm-Message-State: AHYfb5gSqth+/p1QTVcHaOoKJmZ7stjitYIfoNrQB2iu/hSKxL+QgfKI 6SGZIfoV6oakCGz1 X-Received: by 10.31.207.69 with SMTP id f66mr3737715vkg.145.1503885452472; Sun, 27 Aug 2017 18:57:32 -0700 (PDT) Received: from localhost.localdomain ([191.109.6.191]) by smtp.gmail.com with ESMTPSA id y12sm2696824uad.22.2017.08.27.18.57.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Aug 2017 18:57:32 -0700 (PDT) From: Sergio Andres Gomez Del Real X-Google-Original-From: Sergio Andres Gomez Del Real To: qemu-devel@nongnu.org Date: Sun, 27 Aug 2017 20:56:46 -0500 Message-Id: <20170828015654.2530-7-Sergio.G.DelReal@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170828015654.2530-1-Sergio.G.DelReal@gmail.com> References: <20170828015654.2530-1-Sergio.G.DelReal@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c05::243 Subject: [Qemu-devel] [PATCH 06/14] hvf: add compilation rules to Makefile.objs 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: Sergio Andres Gomez Del Real Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This commit adds to target/i386/Makefile.objs the necessary rules so that the new files for hvf are compiled by the build system. It also adds handling of the -enable-hvf argument in the main function in vl.c. Signed-off-by: Sergio Andres Gomez Del Real --- target/i386/Makefile.objs | 1 + vl.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/target/i386/Makefile.objs b/target/i386/Makefile.objs index 6a26e9d9f0..0bef89c099 100644 --- a/target/i386/Makefile.objs +++ b/target/i386/Makefile.objs @@ -12,4 +12,5 @@ obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-windows.o endif ifdef CONFIG_DARWIN obj-$(CONFIG_HAX) += hax-all.o hax-mem.o hax-darwin.o +obj-$(CONFIG_HVF) += hvf-utils/ hvf-all.o endif diff --git a/vl.c b/vl.c index 8e247cc2a2..de7d2a3858 100644 --- a/vl.c +++ b/vl.c @@ -3751,6 +3751,13 @@ int main(int argc, char **argv, char **envp) olist = qemu_find_opts("machine"); qemu_opts_parse_noisily(olist, "accel=hax", false); break; +#if defined(__APPLE__) + case QEMU_OPTION_enable_hvf: + olist = qemu_find_opts("machine"); + qemu_opts_parse_noisily(olist, "accel=hvf", false); + hvf_disable(0); + break; +#endif case QEMU_OPTION_M: case QEMU_OPTION_machine: olist = qemu_find_opts("machine");