target/i386/sev: Move qmp_query_sev() & hmp_info_sev() to sev.c
Move qmp_query_sev() & hmp_info_sev()() from monitor.c to sev.c and make sev_get_info() static. We don't need the stub anymore, remove it. Add a stub for hmp_info_sev(). Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20211007161716.453984-22-philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
0875a7038b
commit
aa3950182f
@ -31,7 +31,6 @@
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "sysemu/kvm.h"
|
||||
#include "qapi/error.h"
|
||||
#include "sev.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
#include "qapi/qapi-commands-misc.h"
|
||||
#include "hw/i386/pc.h"
|
||||
@ -676,40 +675,6 @@ void hmp_info_io_apic(Monitor *mon, const QDict *qdict)
|
||||
"removed soon. Please use 'info pic' instead.\n");
|
||||
}
|
||||
|
||||
SevInfo *qmp_query_sev(Error **errp)
|
||||
{
|
||||
SevInfo *info;
|
||||
|
||||
info = sev_get_info();
|
||||
if (!info) {
|
||||
error_setg(errp, "SEV feature is not available");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return info;
|
||||
}
|
||||
|
||||
void hmp_info_sev(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
SevInfo *info = sev_get_info();
|
||||
|
||||
if (info && info->enabled) {
|
||||
monitor_printf(mon, "handle: %d\n", info->handle);
|
||||
monitor_printf(mon, "state: %s\n", SevState_str(info->state));
|
||||
monitor_printf(mon, "build: %d\n", info->build_id);
|
||||
monitor_printf(mon, "api version: %d.%d\n",
|
||||
info->api_major, info->api_minor);
|
||||
monitor_printf(mon, "debug: %s\n",
|
||||
info->policy & SEV_POLICY_NODBG ? "off" : "on");
|
||||
monitor_printf(mon, "key-sharing: %s\n",
|
||||
info->policy & SEV_POLICY_NOKS ? "off" : "on");
|
||||
} else {
|
||||
monitor_printf(mon, "SEV is not enabled\n");
|
||||
}
|
||||
|
||||
qapi_free_SevInfo(info);
|
||||
}
|
||||
|
||||
SGXInfo *qmp_query_sgx(Error **errp)
|
||||
{
|
||||
return sgx_get_info(errp);
|
||||
|
@ -12,13 +12,16 @@
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "monitor/hmp.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "qapi/error.h"
|
||||
#include "sev.h"
|
||||
|
||||
SevInfo *sev_get_info(void)
|
||||
SevInfo *qmp_query_sev(Error **errp)
|
||||
{
|
||||
error_setg(errp, "SEV is not available in this QEMU");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -60,3 +63,8 @@ SevAttestationReport *qmp_query_sev_attestation_report(const char *mnonce,
|
||||
error_setg(errp, "SEV is not available in this QEMU");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void hmp_info_sev(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
monitor_printf(mon, "SEV is not available in this QEMU\n");
|
||||
}
|
||||
|
@ -32,6 +32,7 @@
|
||||
#include "migration/blocker.h"
|
||||
#include "qom/object.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "monitor/hmp.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "exec/confidential-guest-support.h"
|
||||
@ -402,8 +403,7 @@ sev_get_reduced_phys_bits(void)
|
||||
return sev_guest ? sev_guest->reduced_phys_bits : 0;
|
||||
}
|
||||
|
||||
SevInfo *
|
||||
sev_get_info(void)
|
||||
static SevInfo *sev_get_info(void)
|
||||
{
|
||||
SevInfo *info;
|
||||
|
||||
@ -422,6 +422,40 @@ sev_get_info(void)
|
||||
return info;
|
||||
}
|
||||
|
||||
SevInfo *qmp_query_sev(Error **errp)
|
||||
{
|
||||
SevInfo *info;
|
||||
|
||||
info = sev_get_info();
|
||||
if (!info) {
|
||||
error_setg(errp, "SEV feature is not available");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return info;
|
||||
}
|
||||
|
||||
void hmp_info_sev(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
SevInfo *info = sev_get_info();
|
||||
|
||||
if (info && info->enabled) {
|
||||
monitor_printf(mon, "handle: %d\n", info->handle);
|
||||
monitor_printf(mon, "state: %s\n", SevState_str(info->state));
|
||||
monitor_printf(mon, "build: %d\n", info->build_id);
|
||||
monitor_printf(mon, "api version: %d.%d\n",
|
||||
info->api_major, info->api_minor);
|
||||
monitor_printf(mon, "debug: %s\n",
|
||||
info->policy & SEV_POLICY_NODBG ? "off" : "on");
|
||||
monitor_printf(mon, "key-sharing: %s\n",
|
||||
info->policy & SEV_POLICY_NOKS ? "off" : "on");
|
||||
} else {
|
||||
monitor_printf(mon, "SEV is not enabled\n");
|
||||
}
|
||||
|
||||
qapi_free_SevInfo(info);
|
||||
}
|
||||
|
||||
static int
|
||||
sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain,
|
||||
size_t *cert_chain_len, Error **errp)
|
||||
|
@ -19,7 +19,6 @@
|
||||
#endif
|
||||
|
||||
#include "exec/confidential-guest-support.h"
|
||||
#include "qapi/qapi-types-misc-target.h"
|
||||
|
||||
#define SEV_POLICY_NODBG 0x1
|
||||
#define SEV_POLICY_NOKS 0x2
|
||||
@ -47,7 +46,6 @@ bool sev_es_enabled(void);
|
||||
#define sev_es_enabled() 0
|
||||
#endif
|
||||
|
||||
extern SevInfo *sev_get_info(void);
|
||||
extern uint32_t sev_get_cbit_position(void);
|
||||
extern uint32_t sev_get_reduced_phys_bits(void);
|
||||
extern bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **errp);
|
||||
|
Loading…
Reference in New Issue
Block a user