Received: by 2002:ac2:4c03:0:0:0:0:0 with SMTP id t3csp174876lfq; Fri, 11 Dec 2020 07:17:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJz33PoaenjwiXADp8AMOjryd2+LrkArO9tnM2hbHO0ZXLG7rr1yvei6m4Rca9mG02vQfU2p X-Received: by 2002:a25:bb8e:: with SMTP id y14mr19460672ybg.380.1607699832035; Fri, 11 Dec 2020 07:17:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607699832; cv=none; d=google.com; s=arc-20160816; b=fFI+vo5piY3JFweBCrg//EGsEUwTA1WxWJhO6IO5pNG94inmNlWhKSkHpVakmZndVF YtjV820hkh++R201fHV/xCWXciTNxpq74ChiqTio5/e8DgjUvcG9jesXKB8Xl5aK00G+ r37GJviw4L7zQGpPmOqib7lEMyrd+2WwLRnYY1GGHAGN8mQv8dHDhQrTFbk4ijImtWVM 9mSjUU5uZCWshC3NuWfEeds0C9iDa84yPVBJBCMjs31vixCZClZOPg6FIMyHHEhwKm3n ZYpPUkbp56XRHCk1i0ws+q7SM6LW331E2G0jAm+TkPzeI1b3CAPzd4M/Gq9S0HYRn4mg cChQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=2J3kL8IGh9IDQGWVgPZ932VlpQajMfZAK7g9LjJOP50=; b=o41BrYWC7ZRXOUaT22WxoR4jxNLW6H7sui/TtdRBwEZNRuExxS1Ou0hTr15MukE2H8 S6vSsXYZ1aBmzMat4Pv9WgH7XLSn7bemMLpFk8hxEZsNqwM6QhmdNayfPHhCYj5m8UpX jaqCZ9NLLKrA5ZTA8uUJ7S8o5lT4WLFEC65c+WXxL/8FrWEJoEk+4SzmZsGWmLeujbyh mX3DfgPKMSw67IK2isgJEE8D4IgX8yvsr7q8T8JWYL5/ba+rjE9Z4Yk30z+BECRj4c4c Cg6VHtC1avCWLJ0VUZuXyHTIW7VA2pB8igmm4jxIsMg0QsLjQvkp3BxBM6NuBJUIH2LK 1LCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v23si1605441uap.173.2020.12.11.07.17.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Dec 2020 07:17:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:47890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knkAR-0003PT-Cg for alex.bennee@linaro.org; Fri, 11 Dec 2020 10:17:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knk6a-0007ad-OJ; Fri, 11 Dec 2020 10:13:12 -0500 Received: from mail.csgraf.de ([188.138.100.120]:36590 helo=zulu616.server4you.de) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knk6W-0001v3-N4; Fri, 11 Dec 2020 10:13:12 -0500 Received: from localhost.localdomain (dynamic-077-007-081-179.77.7.pool.telefonica.de [77.7.81.179]) by csgraf.de (Postfix) with ESMTPSA id 2EAE9390053E; Fri, 11 Dec 2020 16:13:06 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Subject: [PATCH v5 08/11] arm: Add Hypervisor.framework build target Date: Fri, 11 Dec 2020 16:12:57 +0100 Message-Id: <20201211151300.85322-9-agraf@csgraf.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201211151300.85322-1-agraf@csgraf.de> References: <20201211151300.85322-1-agraf@csgraf.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=188.138.100.120; envelope-from=agraf@csgraf.de; helo=zulu616.server4you.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Richard Henderson , Cameron Esfahani , Roman Bolshakov , qemu-arm@nongnu.org, Marcel Apfelbaum , Frank Yang , Paolo Bonzini , Peter Collingbourne Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: cwbXX6DDOCqr Now that we have all logic in place that we need to handle Hypervisor.framework on Apple Silicon systems, let's add CONFIG_HVF for aarch64 as well so that we can build it. Signed-off-by: Alexander Graf Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov (x86 only) --- v1 -> v2: - Fix build on 32bit arm v3 -> v4: - Remove i386-softmmu target --- meson.build | 11 ++++++++++- target/arm/hvf/meson.build | 3 +++ target/arm/meson.build | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 target/arm/hvf/meson.build diff --git a/meson.build b/meson.build index 0c59bea475..9c84dde7b1 100644 --- a/meson.build +++ b/meson.build @@ -74,16 +74,25 @@ else endif accelerator_targets = { 'CONFIG_KVM': kvm_targets } + +if cpu in ['x86', 'x86_64'] + hvf_targets = ['x86_64-softmmu'] +elif cpu in ['aarch64'] + hvf_targets = ['aarch64-softmmu'] +else + hvf_targets = [] +endif + if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] # i368 emulator provides xenpv machine type for multiple architectures accelerator_targets += { 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'], + 'CONFIG_HVF': hvf_targets, } endif if cpu in ['x86', 'x86_64'] accelerator_targets += { 'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'], - 'CONFIG_HVF': ['x86_64-softmmu'], 'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'], } endif diff --git a/target/arm/hvf/meson.build b/target/arm/hvf/meson.build new file mode 100644 index 0000000000..855e6cce5a --- /dev/null +++ b/target/arm/hvf/meson.build @@ -0,0 +1,3 @@ +arm_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files( + 'hvf.c', +)) diff --git a/target/arm/meson.build b/target/arm/meson.build index f5de2a77b8..95bebae216 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -56,5 +56,7 @@ arm_softmmu_ss.add(files( 'psci.c', )) +subdir('hvf') + target_arch += {'arm': arm_ss} target_softmmu_arch += {'arm': arm_softmmu_ss} -- 2.24.3 (Apple Git-128)