[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GRUB PATCH RFC 02/22] i386/msr: Rename grub_msr_read() and grub_msr_wri
From: |
Krystian Hebel |
Subject: |
[GRUB PATCH RFC 02/22] i386/msr: Rename grub_msr_read() and grub_msr_write() |
Date: |
Tue, 10 Nov 2020 15:44:40 +0100 |
From: Norbert Kaminski <norbert.kaminski@3mdeb.com>
to grub_rdmsr() and grub_wrmsr() respectively. New names are more
obvious than older ones.
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Norbert Kaminski <norbert.kaminski@3mdeb.com>
---
grub-core/commands/i386/rdmsr.c | 2 +-
grub-core/commands/i386/wrmsr.c | 2 +-
include/grub/i386/msr.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/grub-core/commands/i386/rdmsr.c b/grub-core/commands/i386/rdmsr.c
index fa4622f9e8a1..89ece7657f27 100644
--- a/grub-core/commands/i386/rdmsr.c
+++ b/grub-core/commands/i386/rdmsr.c
@@ -76,7 +76,7 @@ grub_cmd_msr_read (grub_extcmd_context_t ctxt, int argc, char
**argv)
if (*ptr != '\0')
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid argument"));
- value = grub_msr_read (addr);
+ value = grub_rdmsr (addr);
if (ctxt->state[0].set)
{
diff --git a/grub-core/commands/i386/wrmsr.c b/grub-core/commands/i386/wrmsr.c
index 9b7abba7cf27..e3e9f2ee3244 100644
--- a/grub-core/commands/i386/wrmsr.c
+++ b/grub-core/commands/i386/wrmsr.c
@@ -76,7 +76,7 @@ grub_cmd_msr_write (grub_command_t cmd __attribute__
((unused)), int argc, char
if (*ptr != '\0')
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid argument"));
- grub_msr_write (addr, value);
+ grub_wrmsr (addr, value);
return GRUB_ERR_NONE;
}
diff --git a/include/grub/i386/msr.h b/include/grub/i386/msr.h
index 7b52b5d61229..4fba1b8e0d04 100644
--- a/include/grub/i386/msr.h
+++ b/include/grub/i386/msr.h
@@ -25,7 +25,7 @@
*/
static inline grub_uint64_t
-grub_msr_read (grub_uint32_t msr_id)
+grub_rdmsr (grub_uint32_t msr_id)
{
grub_uint32_t low, high;
@@ -35,7 +35,7 @@ grub_msr_read (grub_uint32_t msr_id)
}
static inline void
-grub_msr_write(grub_uint32_t msr_id, grub_uint64_t msr_value)
+grub_wrmsr (grub_uint32_t msr_id, grub_uint64_t msr_value)
{
grub_uint32_t low = msr_value, high = msr_value >> 32;
--
2.17.1
- [GRUB RFC PATCH 00/22] i386: Intel TXT and AMD SKINIT secure launcher, Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 01/22] i386/msr: Merge rdmsr.h and wrmsr.h into msr.h, Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 03/22] i386/msr: Extract and improve MSR support detection code, Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 02/22] i386/msr: Rename grub_msr_read() and grub_msr_write(),
Krystian Hebel <=
- [GRUB PATCH RFC 04/22] i386/memory: Rename PAGE_SHIFT to GRUB_PAGE_SHIFT, Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 06/22] mmap: Add grub_mmap_get_lowest() and grub_mmap_get_highest(), Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 05/22] i386/memory: Rename PAGE_SIZE to GRUB_PAGE_SIZE and make it global, Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 07/22] i386/tpm: Rename tpm module to tpm_verifier, Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 08/22] i386/tpm: Add TPM TIS and CRB driver, Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 09/22] efi: Make shim_lock GUID and protocol type public, Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 12/22] i386/efi: Report UEFI Secure Boot status to the Linux kernel, Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 10/22] efi: Return grub_efi_status_t from grub_efi_get_variable(), Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 11/22] efi: Add a function to read EFI variables with attributes, Krystian Hebel, 2020/11/10
- [GRUB PATCH RFC 15/22] i386/txt: Add Intel TXT core implementation, Krystian Hebel, 2020/11/10