SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/i386/sev: Move qmp_query_sev_capabilities() to sev.c

Browse Source 
Move qmp_query_sev_capabilities() from monitor.c to sev.c
and make sev_get_capabilities() static. We don't need the
stub anymore, remove it.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20211007161716.453984-20-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2021-10-07 18:17:12 +02:00 committed by Paolo Bonzini
parent 11a6ed0e77
commit 8371df2902
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/i386/monitor.c
View File

@ -727,11 +727,6 @@ SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp)
return info; return info;
} }
SevCapability *qmp_query_sev_capabilities(Error **errp)
{
return sev_get_capabilities(errp);
}
SGXInfo *qmp_query_sgx(Error **errp) SGXInfo *qmp_query_sgx(Error **errp)
{ {
return sgx_get_info(errp); return sgx_get_info(errp);

2
target/i386/sev-sysemu-stub.c
View File

@ -27,7 +27,7 @@ char *sev_get_launch_measurement(void)
return NULL; return NULL;
} }
SevCapability *sev_get_capabilities(Error **errp) SevCapability *qmp_query_sev_capabilities(Error **errp)
{ {
error_setg(errp, "SEV is not available in this QEMU"); error_setg(errp, "SEV is not available in this QEMU");
return NULL; return NULL;

8
target/i386/sev.c
View File

@ -466,8 +466,7 @@ e_free:
return 1; return 1;
} }
SevCapability * static SevCapability *sev_get_capabilities(Error **errp)
sev_get_capabilities(Error **errp)
{ {
SevCapability *cap = NULL; SevCapability *cap = NULL;
guchar *pdh_data = NULL; guchar *pdh_data = NULL;
@ -517,6 +516,11 @@ out:
return cap; return cap;
} }
SevCapability *qmp_query_sev_capabilities(Error **errp)
{
return sev_get_capabilities(errp);
}
static SevAttestationReport *sev_get_attestation_report(const char *mnonce, static SevAttestationReport *sev_get_attestation_report(const char *mnonce,
Error **errp) Error **errp)
{ {

1
target/i386/sev.h
View File

@ -51,7 +51,6 @@ extern SevInfo *sev_get_info(void);
extern uint32_t sev_get_cbit_position(void); extern uint32_t sev_get_cbit_position(void);
extern uint32_t sev_get_reduced_phys_bits(void); extern uint32_t sev_get_reduced_phys_bits(void);
extern char *sev_get_launch_measurement(void); extern char *sev_get_launch_measurement(void);
extern SevCapability *sev_get_capabilities(Error **errp);
extern bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, 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_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp);