From d63670d23e60f00210635ca7c62bce27bec55f1b Mon Sep 17 00:00:00 2001 From: Tom Lendacky Date: Wed, 20 Apr 2022 09:14:14 -0500 Subject: [PATCH] virt: sevguest: Rename the sevguest dir and files to sev-guest Rename the drivers/virt/coco/sevguest directory and files to sev-guest so as to match the driver name. [ bp: Rename Documentation/virt/coco/sevguest.rst too, as reported by sfr: https://lore.kernel.org/r/20220427101059.3bf55262@canb.auug.org.au ] Signed-off-by: Tom Lendacky Signed-off-by: Borislav Petkov Link: https://lore.kernel.org/r/2f5c9cb16e3a67599c8e3170f6c72c8712c47d53.1650464054.git.thomas.lendacky@amd.com --- Documentation/virt/coco/{sevguest.rst => sev-guest.rst} | 0 Documentation/virt/index.rst | 2 +- drivers/virt/Kconfig | 2 +- drivers/virt/Makefile | 2 +- drivers/virt/coco/{sevguest => sev-guest}/Kconfig | 2 +- drivers/virt/coco/{sevguest => sev-guest}/Makefile | 2 +- .../coco/{sevguest/sevguest.c => sev-guest/sev-guest.c} | 8 ++++---- .../coco/{sevguest/sevguest.h => sev-guest/sev-guest.h} | 0 8 files changed, 9 insertions(+), 9 deletions(-) rename Documentation/virt/coco/{sevguest.rst => sev-guest.rst} (100%) rename drivers/virt/coco/{sevguest => sev-guest}/Kconfig (87%) rename drivers/virt/coco/{sevguest => sev-guest}/Makefile (50%) rename drivers/virt/coco/{sevguest/sevguest.c => sev-guest/sev-guest.c} (98%) rename drivers/virt/coco/{sevguest/sevguest.h => sev-guest/sev-guest.h} (100%) diff --git a/Documentation/virt/coco/sevguest.rst b/Documentation/virt/coco/sev-guest.rst similarity index 100% rename from Documentation/virt/coco/sevguest.rst rename to Documentation/virt/coco/sev-guest.rst diff --git a/Documentation/virt/index.rst b/Documentation/virt/index.rst index 40ad0d20032e..492f0920b988 100644 --- a/Documentation/virt/index.rst +++ b/Documentation/virt/index.rst @@ -13,7 +13,7 @@ Linux Virtualization Support guest-halt-polling ne_overview acrn/index - coco/sevguest + coco/sev-guest .. only:: html and subproject diff --git a/drivers/virt/Kconfig b/drivers/virt/Kconfig index 7d3273cfab27..0c1bba7c5c66 100644 --- a/drivers/virt/Kconfig +++ b/drivers/virt/Kconfig @@ -48,6 +48,6 @@ source "drivers/virt/nitro_enclaves/Kconfig" source "drivers/virt/acrn/Kconfig" -source "drivers/virt/coco/sevguest/Kconfig" +source "drivers/virt/coco/sev-guest/Kconfig" endif diff --git a/drivers/virt/Makefile b/drivers/virt/Makefile index 7b87a7ba1972..b2e6e864ebbe 100644 --- a/drivers/virt/Makefile +++ b/drivers/virt/Makefile @@ -9,4 +9,4 @@ obj-y += vboxguest/ obj-$(CONFIG_NITRO_ENCLAVES) += nitro_enclaves/ obj-$(CONFIG_ACRN_HSM) += acrn/ -obj-$(CONFIG_SEV_GUEST) += coco/sevguest/ +obj-$(CONFIG_SEV_GUEST) += coco/sev-guest/ diff --git a/drivers/virt/coco/sevguest/Kconfig b/drivers/virt/coco/sev-guest/Kconfig similarity index 87% rename from drivers/virt/coco/sevguest/Kconfig rename to drivers/virt/coco/sev-guest/Kconfig index 74ca1fe09437..f9db0799ae67 100644 --- a/drivers/virt/coco/sevguest/Kconfig +++ b/drivers/virt/coco/sev-guest/Kconfig @@ -11,4 +11,4 @@ config SEV_GUEST userspace interface to communicate with the PSP to request the attestation report and more. - If you choose 'M' here, this module will be called sevguest. + If you choose 'M' here, this module will be called sev-guest. diff --git a/drivers/virt/coco/sevguest/Makefile b/drivers/virt/coco/sev-guest/Makefile similarity index 50% rename from drivers/virt/coco/sevguest/Makefile rename to drivers/virt/coco/sev-guest/Makefile index b1ffb2b4177b..63d67c27723a 100644 --- a/drivers/virt/coco/sevguest/Makefile +++ b/drivers/virt/coco/sev-guest/Makefile @@ -1,2 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_SEV_GUEST) += sevguest.o +obj-$(CONFIG_SEV_GUEST) += sev-guest.o diff --git a/drivers/virt/coco/sevguest/sevguest.c b/drivers/virt/coco/sev-guest/sev-guest.c similarity index 98% rename from drivers/virt/coco/sevguest/sevguest.c rename to drivers/virt/coco/sev-guest/sev-guest.c index 18c3231a816d..90ce16b6e05f 100644 --- a/drivers/virt/coco/sevguest/sevguest.c +++ b/drivers/virt/coco/sev-guest/sev-guest.c @@ -25,7 +25,7 @@ #include #include -#include "sevguest.h" +#include "sev-guest.h" #define DEVICE_NAME "sev-guest" #define AAD_LEN 48 @@ -724,9 +724,9 @@ static int __exit sev_guest_remove(struct platform_device *pdev) } /* - * This driver is a common SEV guest interface driver and meant to support - * any SEV guest API. As such, even though it has been introduced along with - * the SEV-SNP support, it is named "sev-guest". + * This driver is meant to be a common SEV guest interface driver and to + * support any SEV guest API. As such, even though it has been introduced + * with the SEV-SNP support, it is named "sev-guest". */ static struct platform_driver sev_guest_driver = { .remove = __exit_p(sev_guest_remove), diff --git a/drivers/virt/coco/sevguest/sevguest.h b/drivers/virt/coco/sev-guest/sev-guest.h similarity index 100% rename from drivers/virt/coco/sevguest/sevguest.h rename to drivers/virt/coco/sev-guest/sev-guest.h