target/i386/sev: Rename sev_i386.h -> sev.h

SEV is a x86 specific feature, and the "sev_i386.h" header
is already in target/i386/. Rename it as "sev.h" to simplify.

Patch created mechanically using:

  $ git mv target/i386/sev_i386.h target/i386/sev.h
  $ sed -i s/sev_i386.h/sev.h/ $(git grep -l sev_i386.h)

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20211007161716.453984-15-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 0c7c054e3a047fc94c83a7e7f74180abe5be8f4a..76de7e2265e24703593987df95453ef91462082d 100644 (file)
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -47,7 +47,7 @@
 #include "hw/i386/fw_cfg.h"
 #include "hw/intc/i8259.h"
 #include "hw/rtc/mc146818rtc.h"
-#include "target/i386/sev_i386.h"
+#include "target/i386/sev.h"
 
 #include "hw/acpi/cpu_hotplug.h"
 #include "hw/irq.h"

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index b54b98551e9c2df328c5fad24f65d2acc7f47752..8289dc87bd52ed57d82aef15e3c5697186c3c0cb 100644 (file)
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -26,7 +26,7 @@
 #include "sysemu/reset.h"
 #include "sysemu/hvf.h"
 #include "kvm/kvm_i386.h"
-#include "sev_i386.h"
+#include "sev.h"
 #include "qapi/error.h"
 #include "qapi/qapi-visit-machine.h"
 #include "qapi/qmp/qerror.h"

diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index f25837f63f41eaee2fa3d9a8506fcf0036f8e9ae..a5f6ff63c81c702f41fa6a56ea8afe2019f313f9 100644 (file)
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -28,7 +28,7 @@
 #include "sysemu/kvm_int.h"
 #include "sysemu/runstate.h"
 #include "kvm_i386.h"
-#include "sev_i386.h"
+#include "sev.h"
 #include "hyperv.h"
 #include "hyperv-proto.h"
 

diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index ea836678f51318921b17ccbd34bcbdc664791fb8..109e4e61c0afc89a0029661d6720768e3473d957 100644 (file)
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -32,7 +32,7 @@
 #include "sysemu/kvm.h"
 #include "sysemu/sev.h"
 #include "qapi/error.h"
-#include "sev_i386.h"
+#include "sev.h"
 #include "qapi/qapi-commands-misc-target.h"
 #include "qapi/qapi-commands-misc.h"
 #include "hw/i386/pc.h"

diff --git a/target/i386/sev-stub.c b/target/i386/sev-stub.c
index 170e9f50fee97d0bde6b4b2a8fe7796623ad96e5..7e8b6f9a259dfee2dc87859552aa88f99dbcbfa4 100644 (file)
--- a/target/i386/sev-stub.c
+++ b/target/i386/sev-stub.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "sev_i386.h"
+#include "sev.h"
 
 bool sev_enabled(void)
 {

diff --git a/target/i386/sev-sysemu-stub.c b/target/i386/sev-sysemu-stub.c
index d556b4f091f81726e16e4d725f481585e312b9b9..8082781febf97a3fff481ca82d2bc4fbcfb10c88 100644 (file)
--- a/target/i386/sev-sysemu-stub.c
+++ b/target/i386/sev-sysemu-stub.c
@@ -14,7 +14,7 @@
 #include "qemu/osdep.h"
 #include "qapi/qapi-commands-misc-target.h"
 #include "qapi/error.h"
-#include "sev_i386.h"
+#include "sev.h"
 
 SevInfo *sev_get_info(void)
 {

diff --git a/target/i386/sev.c b/target/i386/sev.c
index 5cbbcf0bb939156bddd7eee27882478daad35696..e43bbf3a17d9f564f641f0928d250e0fc7c5557d 100644 (file)
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -25,7 +25,7 @@
 #include "qemu/uuid.h"
 #include "crypto/hash.h"
 #include "sysemu/kvm.h"
-#include "sev_i386.h"
+#include "sev.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/runstate.h"
 #include "trace.h"

diff --git a/target/i386/sev.h b/target/i386/sev.h
new file mode 100644 (file)
index 0000000..d83428f
--- /dev/null
+++ b/target/i386/sev.h
@@ -0,0 +1,48 @@
+/*
+ * QEMU Secure Encrypted Virutualization (SEV) support
+ *
+ * Copyright: Advanced Micro Devices, 2016-2018
+ *
+ * Authors:
+ *  Brijesh Singh <brijesh.singh@amd.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef QEMU_SEV_I386_H
+#define QEMU_SEV_I386_H
+
+#include "sysemu/sev.h"
+#include "qapi/qapi-types-misc-target.h"
+
+#define SEV_POLICY_NODBG        0x1
+#define SEV_POLICY_NOKS         0x2
+#define SEV_POLICY_ES           0x4
+#define SEV_POLICY_NOSEND       0x8
+#define SEV_POLICY_DOMAIN       0x10
+#define SEV_POLICY_SEV          0x20
+
+typedef struct SevKernelLoaderContext {
+    char *setup_data;
+    size_t setup_size;
+    char *kernel_data;
+    size_t kernel_size;
+    char *initrd_data;
+    size_t initrd_size;
+    char *cmdline_data;
+    size_t cmdline_size;
+} SevKernelLoaderContext;
+
+extern bool sev_es_enabled(void);
+extern SevInfo *sev_get_info(void);
+extern uint32_t sev_get_cbit_position(void);
+extern uint32_t sev_get_reduced_phys_bits(void);
+extern char *sev_get_launch_measurement(void);
+extern SevCapability *sev_get_capabilities(Error **errp);
+extern SevAttestationReport *
+sev_get_attestation_report(const char *mnonce, Error **errp);
+extern bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **errp);
+
+#endif

diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h
deleted file mode 100644 (file)
index d83428f..0000000
--- a/target/i386/sev_i386.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * QEMU Secure Encrypted Virutualization (SEV) support
- *
- * Copyright: Advanced Micro Devices, 2016-2018
- *
- * Authors:
- *  Brijesh Singh <brijesh.singh@amd.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#ifndef QEMU_SEV_I386_H
-#define QEMU_SEV_I386_H
-
-#include "sysemu/sev.h"
-#include "qapi/qapi-types-misc-target.h"
-
-#define SEV_POLICY_NODBG        0x1
-#define SEV_POLICY_NOKS         0x2
-#define SEV_POLICY_ES           0x4
-#define SEV_POLICY_NOSEND       0x8
-#define SEV_POLICY_DOMAIN       0x10
-#define SEV_POLICY_SEV          0x20
-
-typedef struct SevKernelLoaderContext {
-    char *setup_data;
-    size_t setup_size;
-    char *kernel_data;
-    size_t kernel_size;
-    char *initrd_data;
-    size_t initrd_size;
-    char *cmdline_data;
-    size_t cmdline_size;
-} SevKernelLoaderContext;
-
-extern bool sev_es_enabled(void);
-extern SevInfo *sev_get_info(void);
-extern uint32_t sev_get_cbit_position(void);
-extern uint32_t sev_get_reduced_phys_bits(void);
-extern char *sev_get_launch_measurement(void);
-extern SevCapability *sev_get_capabilities(Error **errp);
-extern SevAttestationReport *
-sev_get_attestation_report(const char *mnonce, Error **errp);
-extern bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **errp);
-
-#endif