Received: by 2002:ac2:51c9:0:0:0:0:0 with SMTP id u9csp1829171lfm; Wed, 19 May 2021 13:25:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuClph0kGnWx/0hL3+2TKgNoJfpqhDa//WIJkknlh+8EzSxIvPbPrMp3zZjT0XXP3fPOar X-Received: by 2002:a05:6602:2d07:: with SMTP id c7mr1550021iow.176.1621455959362; Wed, 19 May 2021 13:25:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621455959; cv=none; d=google.com; s=arc-20160816; b=EHUnTWmpEA39HaRoqafhlU2cqqf+myBQZbiDaK7A7oEtkspT2KfSdRZvgqVPfNrXe3 xyTpxixjmT6BaIDIcn2M16dxyODmVs/xwEYShYwDvysvZaFwdTDcg6ZCPTb2BKaY7jRu jy58kKzFqTouObyw5P3JMNYNKCs1r1MG4eEe6KcCpA1+q2sXflkCfB8uadE4u3kAQBor MLbe/QvzUGuDp7UQzQFrZQaoT0YSc0LvaObJWsa5AvPQzliQO8z5AaIktZCmqusZyqUj T1ra4uGKysEwb4vt0zLpckag079XlZhLTp1IkKvmb0Rbu/QS9NzYBujL94XLKnFsUka9 s2Tw== 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=VnCCFuHA68L1IT2V6O5u/jRYTe4kMm9yQQ7qveI4YNA=; b=uOhTUAt6YaGSbV3KClN9NvVHjfW9iY3kZFahi8rHenQxDEcZYXksTOmGrKovjFddqn LwiKfeqniSh+N+uy0oNbGNaTcXPNsU/8F19o16pEfxmu6s8gUUtRdZeFr7N2RVMTXDS4 NOZVY+h8q3llM6lHU6WmSh5o5F/r9lI+ivBSqmOQIKX1SD5RtLI7pht32WGFJjEJtesH t0NCkvidGksa/8wDjJliosrf5haiwdNznrfew1foBRJYKqeezDJ3oKIDEYj6q78ybHlk RZcQhmFPnNwFqovCStNqkEA8fsCddh/QgfKARjrHtUUlFb7WGvLl1Zisomqafvz3YhI7 OapA== 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 j3si666850ilo.104.2021.05.19.13.25.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 May 2021 13:25:59 -0700 (PDT) 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]:57876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljSlS-000265-J4 for alex.bennee@linaro.org; Wed, 19 May 2021 16:25:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljSit-0004ca-Ce; Wed, 19 May 2021 16:23:19 -0400 Received: from mail.csgraf.de ([85.25.223.15]:48106 helo=zulu616.server4you.de) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljSic-0003CZ-OX; Wed, 19 May 2021 16:23:19 -0400 Received: from localhost.localdomain (dynamic-095-114-039-201.95.114.pool.telefonica.de [95.114.39.201]) by csgraf.de (Postfix) with ESMTPSA id 54AA360803D8; Wed, 19 May 2021 22:22:56 +0200 (CEST) From: Alexander Graf To: QEMU Developers Subject: [PATCH v8 02/19] hvf: Move vcpu thread functions into common directory Date: Wed, 19 May 2021 22:22:36 +0200 Message-Id: <20210519202253.76782-3-agraf@csgraf.de> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210519202253.76782-1-agraf@csgraf.de> References: <20210519202253.76782-1-agraf@csgraf.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=85.25.223.15; 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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Cameron Esfahani , Roman Bolshakov , qemu-arm , Marcel Apfelbaum , Frank Yang , Paolo Bonzini , Peter Collingbourne Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: MC1+bfKaD1Je Until now, Hypervisor.framework has only been available on x86_64 systems. With Apple Silicon shipping now, it extends its reach to aarch64. To prepare for support for multiple architectures, let's start moving common code out into its own accel directory. This patch moves the vCPU thread loop over. Signed-off-by: Alexander Graf --- {target/i386 => accel}/hvf/hvf-accel-ops.c | 0 {target/i386 => accel}/hvf/hvf-accel-ops.h | 0 accel/hvf/meson.build | 1 + target/i386/hvf/meson.build | 1 - target/i386/hvf/x86hvf.c | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) rename {target/i386 => accel}/hvf/hvf-accel-ops.c (100%) rename {target/i386 => accel}/hvf/hvf-accel-ops.h (100%) diff --git a/target/i386/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c similarity index 100% rename from target/i386/hvf/hvf-accel-ops.c rename to accel/hvf/hvf-accel-ops.c diff --git a/target/i386/hvf/hvf-accel-ops.h b/accel/hvf/hvf-accel-ops.h similarity index 100% rename from target/i386/hvf/hvf-accel-ops.h rename to accel/hvf/hvf-accel-ops.h diff --git a/accel/hvf/meson.build b/accel/hvf/meson.build index 227b11cd71..fc52cb7843 100644 --- a/accel/hvf/meson.build +++ b/accel/hvf/meson.build @@ -1,6 +1,7 @@ hvf_ss = ss.source_set() hvf_ss.add(files( 'hvf-all.c', + 'hvf-accel-ops.c', )) specific_ss.add_all(when: 'CONFIG_HVF', if_true: hvf_ss) diff --git a/target/i386/hvf/meson.build b/target/i386/hvf/meson.build index d253d5fd10..f6d4c394d3 100644 --- a/target/i386/hvf/meson.build +++ b/target/i386/hvf/meson.build @@ -1,6 +1,5 @@ i386_softmmu_ss.add(when: [hvf, 'CONFIG_HVF'], if_true: files( 'hvf.c', - 'hvf-accel-ops.c', 'x86.c', 'x86_cpuid.c', 'x86_decode.c', diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 0d7533742e..2b99f3eaa2 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -32,7 +32,7 @@ #include #include -#include "hvf-accel-ops.h" +#include "accel/hvf/hvf-accel-ops.h" void hvf_set_segment(struct CPUState *cpu, struct vmx_segment *vmx_seg, SegmentCache *qseg, bool is_tr) -- 2.30.1 (Apple Git-130)