Received: by 2002:ac2:4c03:0:0:0:0:0 with SMTP id t3csp171241lfq; Fri, 11 Dec 2020 07:13:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9kfSrZ7z9ODvYakN6nPn9YJz6GREnSmolrMyDixVEdcIhi672Qgxgqsv06EhXJSdKHJgh X-Received: by 2002:a25:bb8f:: with SMTP id y15mr20171011ybg.451.1607699608341; Fri, 11 Dec 2020 07:13:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607699608; cv=none; d=google.com; s=arc-20160816; b=o4GBvlW3O00alBtabo9g4JHvfZAFamsvyKKpslXRvhUGqqmoSUM6DYATPPnafsM+YK P3xWtKyO8Yz2JyUNalR0mOyf5D4YIgA+fELBtHlySBCVWMt/WkX+TinIe+6flXETIXOb Y6P0wT2Aal3zXaarSKiklyglbmlz9lEL8hXfU0OnWQLwtXkHFlp91kpyRr+4G3QPNy2E koYGA+Km3gRHw3V3VOE0ar53qaPx1f8nc4/VAnacd8t82dVF7nFYJLY4IgdpMn7MCjUL +DiOc9pNi0OVOfGC+AygvxttQUOEoJCcCQctwcrVN1Fu2njZuSmfzCTrgq6uNvZjmbvO vUhg== 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=lPdcHEXOg5ztz9wqVb0CVFJDgv8Z2THyEnDofnvLaz8=; b=kKeyiak2bj/2hmcNIhW/yzCtft6ZdWRFPsPRllUK+g4J8RokRQH6nOA/jaafcju+6n Nkul5M0gMgBVy/S46m2Uf2Tbtpsb+0XukHFs0UQYsEhAzR2DhyKU2hcKCQq3pwk1zSah DV4A0LAbp+fkvLh7mvby4D4tuqyF+PQSWbrJDR7LfritR9GHm01S1XW7HMDRD6vznTjx Wc2YKwAXPWuQ4EmD4k7V0ik/dSUsouIvaCQ78sA0HjB0FINNc7fYnocbRL0/leqVcpL+ IAImZsLzLg8aDqsThSo+Y8dHCbpdjmrV2wBfOa1hChpXKY8uV5E9Udz1d3s5tOd49jlF OTKA== 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 e9si8182904ybr.430.2020.12.11.07.13.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Dec 2020 07:13:28 -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]:37724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knk6p-0007SJ-O1 for alex.bennee@linaro.org; Fri, 11 Dec 2020 10:13:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knk6V-0007Rg-Ma; Fri, 11 Dec 2020 10:13:07 -0500 Received: from mail.csgraf.de ([188.138.100.120]:36482 helo=zulu616.server4you.de) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knk6S-0001sY-LC; Fri, 11 Dec 2020 10:13:07 -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 4AF5739003C7; Fri, 11 Dec 2020 16:13:02 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Subject: [PATCH v5 01/11] hvf: Add hypervisor entitlement to output binaries Date: Fri, 11 Dec 2020 16:12:50 +0100 Message-Id: <20201211151300.85322-2-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: KfZUGI+sxPOI In macOS 11, QEMU only gets access to Hypervisor.framework if it has the respective entitlement. Add an entitlement template and automatically self sign and apply the entitlement in the build. Signed-off-by: Alexander Graf Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov --- v1 -> v2: - Make safe to ctrl-C v3 -> v4: - Remove unused exe_full variable - Reuse exe_name variable --- accel/hvf/entitlements.plist | 8 ++++++++ meson.build | 29 +++++++++++++++++++++++++---- scripts/entitlement.sh | 13 +++++++++++++ 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 accel/hvf/entitlements.plist create mode 100755 scripts/entitlement.sh diff --git a/accel/hvf/entitlements.plist b/accel/hvf/entitlements.plist new file mode 100644 index 0000000000..154f3308ef --- /dev/null +++ b/accel/hvf/entitlements.plist @@ -0,0 +1,8 @@ + + + + + com.apple.security.hypervisor + + + diff --git a/meson.build b/meson.build index 9ea05ab49f..0c59bea475 100644 --- a/meson.build +++ b/meson.build @@ -1849,9 +1849,14 @@ foreach target : target_dirs }] endif foreach exe: execs - emulators += {exe['name']: - executable(exe['name'], exe['sources'], - install: true, + exe_name = exe['name'] + exe_sign = 'CONFIG_HVF' in config_target + if exe_sign + exe_name += '-unsigned' + endif + + emulator = executable(exe_name, exe['sources'], + install: not exe_sign, c_args: c_args, dependencies: arch_deps + deps + exe['dependencies'], objects: lib.extract_all_objects(recursive: true), @@ -1859,7 +1864,23 @@ foreach target : target_dirs link_depends: [block_syms, qemu_syms] + exe.get('link_depends', []), link_args: link_args, gui_app: exe['gui']) - } + + if exe_sign + emulators += {exe['name'] : custom_target(exe['name'], + install: true, + install_dir: get_option('bindir'), + depends: emulator, + output: exe['name'], + command: [ + meson.current_source_dir() / 'scripts/entitlement.sh', + meson.current_build_dir() / exe_name, + meson.current_build_dir() / exe['name'], + meson.current_source_dir() / 'accel/hvf/entitlements.plist' + ]) + } + else + emulators += {exe['name']: emulator} + endif if 'CONFIG_TRACE_SYSTEMTAP' in config_host foreach stp: [ diff --git a/scripts/entitlement.sh b/scripts/entitlement.sh new file mode 100755 index 0000000000..c540fa6435 --- /dev/null +++ b/scripts/entitlement.sh @@ -0,0 +1,13 @@ +#!/bin/sh -e +# +# Helper script for the build process to apply entitlements + +SRC="$1" +DST="$2" +ENTITLEMENT="$3" + +trap 'rm "$DST.tmp"' exit +cp -af "$SRC" "$DST.tmp" +codesign --entitlements "$ENTITLEMENT" --force -s - "$DST.tmp" +mv "$DST.tmp" "$DST" +trap '' exit -- 2.24.3 (Apple Git-128)