Received: by 2002:a19:ee0a:0:0:0:0:0 with SMTP id g10csp4709560lfb; Sun, 29 Nov 2020 19:07:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJwNu2iiUzoBpOHa0623DJRKV5+2R5N9RqjtW1fCRuslVizmSOfnqdLsOCzoZPFWfy7Awuyg X-Received: by 2002:a25:2845:: with SMTP id o66mr30150071ybo.260.1606705663216; Sun, 29 Nov 2020 19:07:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606705663; cv=none; d=google.com; s=arc-20160816; b=Q75kaVDZiH55eWC9+YeC07DgpZ90jG0D7F1z9c7hWjJ9bWZSg6QP+Q2xbLGhp6cWto enCAlo317/dm6pa09h8EKUy981GjznAUFouijSRsQ9Ikk4mp2j4edG78L/bqIkJ8udJN 1q4JmevLTjw8vQu4i+iiWyavGEMOrqyCUTjwtm6R6EVMxpZYjsS3KcmcNOdJjym+Ri/A Rjn9zmu2uB0/TuxUiQKV89f1XuV/cl75mjyJGL28RIR4cuLApFd84IKbL5E9z0Lfn2SJ j2Vu9hGzPlMC90QMz3egsmbr/oI7PQOBP3TBPOWgjW83RYSvTHMKLSMC6+zGvXY1OOqo mAGw== 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=YDqE0MBcc8PZfYHaDGLV7yLXNek5+eOAkxBoEvRMKBw=; b=BzKNBOVOuUmJForp8tkyS9ScmHy/YoUO+q73Cdi6s268S10UgDJglttJxCaWmeueuM HeK8jHWGFRS/+4e/e9ShEKXBWwf8XJ7nb4sN7YFTvoRdOnf1czKvb2Y2ofvXKxYk9sBf hmF2KEh/zUaDVITGjMoO+3Iqd6cxzjkVJtF9WrG21Rms7iGDwTgY0BSw4iaPtKs5EcdU nXAOW2wqUljGJMAMnwBks8niaNzZY7MDR3wFBxudcAIYPII/Z1RnDZ+S7GnkcfP5Q12U V6prSr5pXkQ79RLEbpofL/nzWtk9A+Sxtj5zQ3Y7oU6rBc6T4ehH/i+i4prlS9R0onk4 eMZA== 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 l188si16181914ybb.88.2020.11.29.19.07.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Nov 2020 19:07:43 -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]:60702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjZXS-00089t-I1 for alex.bennee@linaro.org; Sun, 29 Nov 2020 22:07:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjZXI-00086S-29; Sun, 29 Nov 2020 22:07:32 -0500 Received: from mail.csgraf.de ([188.138.100.120]:35290 helo=zulu616.server4you.de) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjZXD-00076d-Ko; Sun, 29 Nov 2020 22:07:31 -0500 Received: from localhost.localdomain (dynamic-077-009-091-089.77.9.pool.telefonica.de [77.9.91.89]) by csgraf.de (Postfix) with ESMTPSA id 0E1B73900384; Mon, 30 Nov 2020 04:07:25 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Subject: [PATCH v2 1/8] hvf: Add hypervisor entitlement to output binaries Date: Mon, 30 Nov 2020 04:07:16 +0100 Message-Id: <20201130030723.78326-2-agraf@csgraf.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201130030723.78326-1-agraf@csgraf.de> References: <20201130030723.78326-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 Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: s7OGg81zpU1p 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 --- v1 -> v2: - Make safe to ctrl-C --- accel/hvf/entitlements.plist | 8 ++++++++ meson.build | 30 ++++++++++++++++++++++++++---- scripts/entitlement.sh | 13 +++++++++++++ 3 files changed, 47 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 5062407c70..2a7ff5560c 100644 --- a/meson.build +++ b/meson.build @@ -1844,9 +1844,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), @@ -1854,7 +1859,24 @@ 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 + exe_full = meson.current_build_dir() / exe['name'] + 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'] + '-unsigned', + 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)