From patchwork Thu Feb 15 14:20:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 772897 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp854321wre; Thu, 15 Feb 2024 06:21:59 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW2Bk+32ARFjBC6Zn6C8KlcA4AK7+aRq9phJ+QqTM8xydHtDc3mTxfGmsEu1Melo6WLHrt+aQxFGIHmYn4/DWRs X-Google-Smtp-Source: AGHT+IHNVsZFCdyEin+9hkJoKqUsiB68tk94Cravifz8jMVTC/gSHEpQ1EwY9uo6lYLXJElrXcSV X-Received: by 2002:a05:6214:d4f:b0:68f:27a7:2938 with SMTP id 15-20020a0562140d4f00b0068f27a72938mr1250636qvr.26.1708006919514; Thu, 15 Feb 2024 06:21:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708006919; cv=none; d=google.com; s=arc-20160816; b=IdDiCipw50txYtSSr0IuTjQWQiJD228/pcr2p1xc3YNDG0qQ4vFBhXoEhGdwhkDf4i o9SpaWdPdGupoWV+PlqHwN0sRed4udSPg6P3naFsQ63JbR8A+H9wuI44SkeM8E1Um0+R fp9P4fI1hpCnddyq2HIaBsOO1tO0hQVcHe4ihK8V2i6XHpl04X6k5+zaInspmPqEPdfB DuY5uWI3wVgKEbTg2h7nQRxDJXCS7+mbtHZFKIRYhS8fiKG29p5Rdzu6dkL1tANm0YzD EN8DXRMybaJ70D8afb4SmjxfQVo6nwJSyMtP5zEPm3ns7AOdKeclVhX8z2ESWQVKPkEs gN4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=ZLvepa7gcmUSWKB1EKhqFyqI1EusKlbmBcij87F8F7E=; fh=DMqkOfgEuEv+NK82oH8jB6Bnw2j32Ri8LBZL6rw6gdA=; b=RDBlreyjitrQRXJ0I5qSrYml6VodTaC3mRo+DjTuyGDvWRo5PvMVqsBkuXki3inS+7 WYdS9f2ykdBqnnjHgAInmEH28UwGbjpzYD8KWqNQuUFEbWVPANVKKINbChov+XKlqTIG uX9BNyUuvWCc+xp0jUR44trBIP4hlb796JCKOf89ZwUks1ubANppaZwMmloazvT68kGg 27GvD1RfhVcqPA2EEHmpHIJmyyRnxM5tMJl2Mkogsi2FBiH72j5oZcBZKBUl8SiafQbD 6yjft1En6RbBf+6HksnnOE26rQ2aJUqf9PC8i20gz4gxDmMBtlGmlM+cs8LRj1vlexon NzhA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QqtJ+lZq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 3-20020a0562140dc300b0068f144f0510si1593898qvt.459.2024.02.15.06.21.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2024 06:21:59 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QqtJ+lZq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1racbi-0005Yz-L5; Thu, 15 Feb 2024 09:20:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1racbe-0005Ww-CH for qemu-devel@nongnu.org; Thu, 15 Feb 2024 09:20:54 -0500 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1racbc-0000Dy-DW for qemu-devel@nongnu.org; Thu, 15 Feb 2024 09:20:54 -0500 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2d11d17dddeso10669191fa.3 for ; Thu, 15 Feb 2024 06:20:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708006849; x=1708611649; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZLvepa7gcmUSWKB1EKhqFyqI1EusKlbmBcij87F8F7E=; b=QqtJ+lZqk2Xhcu9yC88OaoqUcczOLiQenAiXnVxt/IHQnCyDYqjmHIe2zE5zNfd7LZ HhXxT9Nr8Y1Tiu0/qf4E3IMQygZ1Y+w9GCztTx7P35RTfyU9OeXo6fojqdBOyOqhlBDb o8lge0OU776UY9eTF0PpAsYG2FHk9HN1WirnistnJo+fzhkXAHY1ntojgIGPY/wphrbP ZHehF2D21XRiOrUsFUCgXcoPbxH3hSzsPdCuJd6UebsFNGcvLV1dsv5uX0eaadUvd1kC KqcpzhKez1hDx2BlC3R5Ofs4D8IhtxvIM0KCSjCMjhpvbhdXltY/YDPk1RHVTI5Zi+zm 3S4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708006849; x=1708611649; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZLvepa7gcmUSWKB1EKhqFyqI1EusKlbmBcij87F8F7E=; b=tNvcYvMnvR2VFb4upzV+ndSBL/C5a2WOB3UyiHA0huBftrBMscqvLtyh2/7UbDSIdG lRtxPLptdeSuBpdmmjKQrgfty+wDS94/ws/iLnVa3QXJu0geP2BhL7tj48ezKoctntTG H7U1nqIRYY8vRPEMs2NvTCObNJEWgPZ5/aZXp582bBc2NHIHTqKy4aBGZUiPn0BgRQWf rd11DL3NiNULwxApPSkvun319RglF6V294dolRlsoBU2r8EHHmG+058mqZqhk7AXX7WY qlM434oXNCy+egeReX3nL57BeNWl/v6KHBsDS/gALwlgi7/eKe2NhJiREZ3wWiit4DiD +Bdg== X-Gm-Message-State: AOJu0YxpjIDdsv6qk3v+qn3HtkIrszkn9chkZi9BAp3dyuOYP9EH9Fgx 7aYWFNyAEuEb54zAiqieaCoWJd8ydjWrkcPJy3HpTlu7E2Jd4aszlMdik3fcu+h4h/iMK9ITuWY 3u5k= X-Received: by 2002:a2e:a548:0:b0:2d0:c996:7c99 with SMTP id e8-20020a2ea548000000b002d0c9967c99mr1604340ljn.51.1708006849401; Thu, 15 Feb 2024 06:20:49 -0800 (PST) Received: from m1x-phil.lan ([176.187.193.50]) by smtp.gmail.com with ESMTPSA id m40-20020a05600c3b2800b00411c9c0ede4sm2228137wms.7.2024.02.15.06.20.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Feb 2024 06:20:48 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Eduardo Habkost , Richard Henderson , Paolo Bonzini , kvm@vger.kernel.org, Marcelo Tosatti , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH v2 2/3] hw/i386: Move SGX files within the kvm/ directory Date: Thu, 15 Feb 2024 15:20:34 +0100 Message-ID: <20240215142035.73331-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240215142035.73331-1-philmd@linaro.org> References: <20240215142035.73331-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::234; envelope-from=philmd@linaro.org; helo=mail-lj1-x234.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Per hw/i386/Kconfig: config SGX bool depends on KVM So move SGX related files under kvm/ for clarity. Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/{ => kvm}/sgx-epc.c | 0 hw/i386/{ => kvm}/sgx-stub.c | 0 hw/i386/{ => kvm}/sgx.c | 0 hw/i386/kvm/meson.build | 3 +++ hw/i386/meson.build | 2 -- 5 files changed, 3 insertions(+), 2 deletions(-) rename hw/i386/{ => kvm}/sgx-epc.c (100%) rename hw/i386/{ => kvm}/sgx-stub.c (100%) rename hw/i386/{ => kvm}/sgx.c (100%) diff --git a/hw/i386/sgx-epc.c b/hw/i386/kvm/sgx-epc.c similarity index 100% rename from hw/i386/sgx-epc.c rename to hw/i386/kvm/sgx-epc.c diff --git a/hw/i386/sgx-stub.c b/hw/i386/kvm/sgx-stub.c similarity index 100% rename from hw/i386/sgx-stub.c rename to hw/i386/kvm/sgx-stub.c diff --git a/hw/i386/sgx.c b/hw/i386/kvm/sgx.c similarity index 100% rename from hw/i386/sgx.c rename to hw/i386/kvm/sgx.c diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build index a4a2e23c06..c9c7adea77 100644 --- a/hw/i386/kvm/meson.build +++ b/hw/i386/kvm/meson.build @@ -13,6 +13,9 @@ i386_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files( 'xenstore_impl.c', )) +i386_ss.add(when: 'CONFIG_SGX', if_true: files('sgx-epc.c','sgx.c'), + if_false: files('sgx-stub.c')) + i386_ss.add_all(when: 'CONFIG_KVM', if_true: i386_kvm_ss) xen_stubs_ss = ss.source_set() diff --git a/hw/i386/meson.build b/hw/i386/meson.build index b9c1ca39cb..d7318b83e4 100644 --- a/hw/i386/meson.build +++ b/hw/i386/meson.build @@ -17,8 +17,6 @@ i386_ss.add(when: 'CONFIG_Q35', if_true: files('pc_q35.c')) i386_ss.add(when: 'CONFIG_VMMOUSE', if_true: files('vmmouse.c')) i386_ss.add(when: 'CONFIG_VMPORT', if_true: files('vmport.c')) i386_ss.add(when: 'CONFIG_VTD', if_true: files('intel_iommu.c')) -i386_ss.add(when: 'CONFIG_SGX', if_true: files('sgx-epc.c','sgx.c'), - if_false: files('sgx-stub.c')) i386_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-common.c')) i386_ss.add(when: 'CONFIG_PC', if_true: files(