From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::343; helo=mail-wm1-x343.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5DDC7211B81A7 for ; Wed, 16 Jan 2019 13:22:32 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id f188so3575991wmf.5 for ; Wed, 16 Jan 2019 13:22:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0R72tN1VSaB3kI7K5vSfequ++HPRsGDdRzl6rEtlYtE=; b=NpVTf4YAJ6xweJx2h6ipgln8setAGmG5nMHf8w9gvOvIIWS5UcnFcKWMYo2uKshxva QYy+yAQwCVq1VlHMIu/Kh886C9Foi/d+RM/Ix/ZRh00uXdJ5TiJVEr8aCc1fNs6WWDpm VxiMJ+KdM7kgvxXYtlbfiFTMr9LfeJj80fNww= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0R72tN1VSaB3kI7K5vSfequ++HPRsGDdRzl6rEtlYtE=; b=nmzu3NapeJo9drNo5X8A3prglH7ipWPJ4Mu8NuZ1Jx4eb+5TjYYdi4l9P0YNV+2jBT LT7QBnNYOShYRf+y+TgwQV3KU7q5X+0AHC9w62wfiKzu5DgjxokdBSbXUzC/N/im0vSV Bu+hFSrGb7Sm1kfoHlJziZfscPWh8ShQeZwnyDlgdQRQKsI7RR3B2uqTCjvL9BP1fkLV kkNF+bNY9BZxA7mPCoTaPKiyHhrkAB7F4/akJ6r5Vy6ixyktLZw0RPBcC3ll47MAsKXf uNPvTlhMFHmPQxRJz++YeNo0E81Y3cfIzkawyPloeIdMMz8GWUzBrc1LYXs18bSeQiHy KGTw== X-Gm-Message-State: AJcUukcuLN6GKHCHPX7hvh6gMffl+LrdhsVpeBivHjv1px0CGe/o8iIK 1tXEY7CXB9bM4tCT8T5nPG9tkq98sozp0g== X-Google-Smtp-Source: ALg8bN5wDxgn/TvcBvupyXDTSwyPqE8VZ/I6BhIwqtLUEc0mNgKj2R6q1t4SERxYYrkTku3ucsHT1A== X-Received: by 2002:a1c:4d12:: with SMTP id o18mr9421128wmh.92.1547673750663; Wed, 16 Jan 2019 13:22:30 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:28df:207d:542c:1451]) by smtp.gmail.com with ESMTPSA id l14sm162789095wrp.55.2019.01.16.13.22.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 13:22:29 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: Ard Biesheuvel , Michael D Kinney , Liming Gao , Ting Ye , Gang Wei , Jian Wang , Chao Zhang , Jiewen Yao , Hao Wu , Star Zeng , Achin Gupta , Jagadeesh Ujja Date: Wed, 16 Jan 2019 22:22:20 +0100 Message-Id: <20190116212221.7460-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116212221.7460-1-ard.biesheuvel@linaro.org> References: <20190116212221.7460-1-ard.biesheuvel@linaro.org> Subject: [PATCH 3/4] MdeModulePkg/VarCheckLib: permit use by MM_STANDALONE modules X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2019 21:22:32 -0000 Permit VarCheckLib and VarCheckUefiLib to be used by MM_STANDALONE modules. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf | 4 ++-- MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLibNullClass.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf b/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf index 128c44d695e1..8873fd51a02a 100644 --- a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf +++ b/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf @@ -19,9 +19,9 @@ [Defines] BASE_NAME = VarCheckUefiLib MODULE_UNI_FILE = VarCheckUefiLib.uni FILE_GUID = AC24A4C7-F845-4665-90E5-6431D6E28DC0 - MODULE_TYPE = DXE_RUNTIME_DRIVER + MODULE_TYPE = BASE VERSION_STRING = 1.0 - LIBRARY_CLASS = NULL|DXE_RUNTIME_DRIVER DXE_SMM_DRIVER + LIBRARY_CLASS = NULL|DXE_RUNTIME_DRIVER DXE_SMM_DRIVER MM_STANDALONE CONSTRUCTOR = VarCheckUefiLibNullClassConstructor # diff --git a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLibNullClass.c b/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLibNullClass.c index 80dc6341adcf..5e419831e8cc 100644 --- a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLibNullClass.c +++ b/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLibNullClass.c @@ -12,6 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ +#include + #include #include #include @@ -927,15 +929,14 @@ VariablePropertySetUefiDefined ( @retval EFI_SUCCESS The constructor executed correctly. **/ -EFI_STATUS +RETURN_STATUS EFIAPI VarCheckUefiLibNullClassConstructor ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable + VOID ) { VariablePropertySetUefiDefined (); VarCheckLibRegisterSetVariableCheckHandler (SetVariableCheckHandlerUefiDefined); - return EFI_SUCCESS; + return RETURN_SUCCESS; } -- 2.17.1