[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 15/23] target/i386/sev: Declare system-specific functions in '
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v4 15/23] target/i386/sev: Declare system-specific functions in 'sev.h' |
Date: |
Thu, 7 Oct 2021 18:17:08 +0200 |
"sysemu/sev.h" is only used from x86-specific files. Let's move it
to include/hw/i386, and merge it with target/i386/sev.h.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/sysemu/sev.h | 28 ----------------------------
target/i386/sev.h | 12 +++++++++++-
hw/i386/pc_sysfw.c | 2 +-
target/i386/kvm/kvm.c | 1 -
target/i386/kvm/sev-stub.c | 2 +-
target/i386/monitor.c | 1 -
6 files changed, 13 insertions(+), 33 deletions(-)
delete mode 100644 include/sysemu/sev.h
diff --git a/include/sysemu/sev.h b/include/sysemu/sev.h
deleted file mode 100644
index 94d821d737c..00000000000
--- a/include/sysemu/sev.h
+++ /dev/null
@@ -1,28 +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_H
-#define QEMU_SEV_H
-
-#include "sysemu/kvm.h"
-
-bool sev_enabled(void);
-int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp);
-int sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp);
-int sev_inject_launch_secret(const char *hdr, const char *secret,
- uint64_t gpa, Error **errp);
-
-int sev_es_save_reset_vector(void *flash_ptr, uint64_t flash_size);
-void sev_es_set_reset_vector(CPUState *cpu);
-
-#endif
diff --git a/target/i386/sev.h b/target/i386/sev.h
index d83428fa265..c96072bf78d 100644
--- a/target/i386/sev.h
+++ b/target/i386/sev.h
@@ -14,7 +14,7 @@
#ifndef QEMU_SEV_I386_H
#define QEMU_SEV_I386_H
-#include "sysemu/sev.h"
+#include "exec/confidential-guest-support.h"
#include "qapi/qapi-types-misc-target.h"
#define SEV_POLICY_NODBG 0x1
@@ -35,6 +35,7 @@ typedef struct SevKernelLoaderContext {
size_t cmdline_size;
} SevKernelLoaderContext;
+bool sev_enabled(void);
extern bool sev_es_enabled(void);
extern SevInfo *sev_get_info(void);
extern uint32_t sev_get_cbit_position(void);
@@ -45,4 +46,13 @@ extern SevAttestationReport *
sev_get_attestation_report(const char *mnonce, Error **errp);
extern bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error
**errp);
+int sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp);
+int sev_inject_launch_secret(const char *hdr, const char *secret,
+ uint64_t gpa, Error **errp);
+
+int sev_es_save_reset_vector(void *flash_ptr, uint64_t flash_size);
+void sev_es_set_reset_vector(CPUState *cpu);
+
+int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp);
+
#endif
diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index 68d6b1f783e..c8b17af9535 100644
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -37,7 +37,7 @@
#include "hw/qdev-properties.h"
#include "hw/block/flash.h"
#include "sysemu/kvm.h"
-#include "sysemu/sev.h"
+#include "sev.h"
#define FLASH_SECTOR_SIZE 4096
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index a5f6ff63c81..0eb7a0340cf 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -44,7 +44,6 @@
#include "hw/i386/intel_iommu.h"
#include "hw/i386/x86-iommu.h"
#include "hw/i386/e820_memory_layout.h"
-#include "sysemu/sev.h"
#include "hw/pci/pci.h"
#include "hw/pci/msi.h"
diff --git a/target/i386/kvm/sev-stub.c b/target/i386/kvm/sev-stub.c
index 9587d1b2a31..6080c007a2e 100644
--- a/target/i386/kvm/sev-stub.c
+++ b/target/i386/kvm/sev-stub.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "sysemu/sev.h"
+#include "sev.h"
int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
{
diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index 109e4e61c0a..935a8ee8ca4 100644
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -30,7 +30,6 @@
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/kvm.h"
-#include "sysemu/sev.h"
#include "qapi/error.h"
#include "sev.h"
#include "qapi/qapi-commands-misc-target.h"
--
2.31.1
- [PATCH v4 08/23] target/i386/sev_i386.h: Remove unused headers, (continued)
- [PATCH v4 08/23] target/i386/sev_i386.h: Remove unused headers, Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 09/23] target/i386/sev: Remove sev_get_me_mask(), Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 10/23] target/i386/sev: Mark unreachable code with g_assert_not_reached(), Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 11/23] target/i386/sev: sev_get_attestation_report use g_autofree, Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 12/23] target/i386/sev: Use g_autofree in sev_launch_get_measure(), Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 13/23] target/i386/sev: Restrict SEV to system emulation, Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 14/23] target/i386/sev: Rename sev_i386.h -> sev.h, Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 15/23] target/i386/sev: Declare system-specific functions in 'sev.h',
Philippe Mathieu-Daudé <=
- [PATCH v4 16/23] target/i386/sev: Remove stubs by using code elision, Philippe Mathieu-Daudé, 2021/10/07
- Re: [PATCH v4 16/23] target/i386/sev: Remove stubs by using code elision, Eric Blake, 2021/10/07
[PATCH v4 17/23] target/i386/sev: Move qmp_query_sev_attestation_report() to sev.c, Philippe Mathieu-Daudé, 2021/10/07
[PATCH v4 18/23] target/i386/sev: Move qmp_sev_inject_launch_secret() to sev.c, Philippe Mathieu-Daudé, 2021/10/07
[PATCH v4 19/23] target/i386/sev: Move qmp_query_sev_capabilities() to sev.c, Philippe Mathieu-Daudé, 2021/10/07