From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4DA8C433F5 for ; Wed, 8 Sep 2021 08:32:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C2AF6109F for ; Wed, 8 Sep 2021 08:32:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3C2AF6109F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:38862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNt0F-0006oY-2T for qemu-devel@archiver.kernel.org; Wed, 08 Sep 2021 04:32:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNste-0002y6-67 for qemu-devel@nongnu.org; Wed, 08 Sep 2021 04:25:30 -0400 Received: from mga14.intel.com ([192.55.52.115]:13016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNstb-0003pF-H5 for qemu-devel@nongnu.org; Wed, 08 Sep 2021 04:25:29 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10100"; a="220102712" X-IronPort-AV: E=Sophos;i="5.85,277,1624345200"; d="scan'208";a="220102712" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2021 01:25:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,277,1624345200"; d="scan'208";a="538450937" Received: from icx-2s.bj.intel.com ([10.240.192.119]) by FMSMGA003.fm.intel.com with ESMTP; 08 Sep 2021 01:25:23 -0700 From: Yang Zhong To: qemu-devel@nongnu.org Subject: [PATCH 7/7] pc: Cleanup the SGX definitions Date: Wed, 8 Sep 2021 16:19:37 +0800 Message-Id: <20210908081937.77254-8-yang.zhong@intel.com> X-Mailer: git-send-email 2.29.2.334.gfaefdd61ec In-Reply-To: <20210908081937.77254-1-yang.zhong@intel.com> References: <20210908081937.77254-1-yang.zhong@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=192.55.52.115; envelope-from=yang.zhong@intel.com; helo=mga14.intel.com X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, pbonzini@redhat.com, eblake@redhat.com, seanjc@google.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This patch only cleanup sgx definitions in the the pc.h file. Signed-off-by: Yang Zhong --- include/hw/i386/pc.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a5ae380b4b..4c77489961 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -195,17 +195,18 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, const CPUArchIdList *apic_ids, GArray *entry); +/* sgx.c */ +void pc_machine_init_sgx_epc(PCMachineState *pcms); +/* hostmem-epc.c */ +void sgx_memory_backend_reset(HostMemoryBackend *backend, int fd, + Error **errp); + extern GlobalProperty pc_compat_6_1[]; extern const size_t pc_compat_6_1_len; extern GlobalProperty pc_compat_6_0[]; extern const size_t pc_compat_6_0_len; -/* sgx-epc.c */ -void pc_machine_init_sgx_epc(PCMachineState *pcms); -void sgx_memory_backend_reset(HostMemoryBackend *backend, int fd, - Error **errp); - extern GlobalProperty pc_compat_5_2[]; extern const size_t pc_compat_5_2_len;