ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/i386: sev: provide proper error reporting for query-sev-capabilities 

The query-sev-capabilities was reporting errors through error_report;
change it to use Error** so that the cause of the failure is clearer.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-06-30 11:35:46 -04:00
parent e1e43813e7
commit e4f6278557
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/i386/monitor.c
View File

@ -726,13 +726,5 @@ SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp)
SevCapability *qmp_query_sev_capabilities(Error **errp) SevCapability *qmp_query_sev_capabilities(Error **errp)
{ {
SevCapability *data; return sev_get_capabilities(errp);
data = sev_get_capabilities();
if (!data) {
error_setg(errp, "SEV feature is not available");
return NULL;
}
return data;
} }

3
target/i386/sev-stub.c
View File

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

18
target/i386/sev.c
View File

@ -399,7 +399,7 @@ sev_get_info(void)
static int static int
sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain, sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain,
size_t *cert_chain_len) size_t *cert_chain_len, Error **errp)
{ {
guchar *pdh_data = NULL; guchar *pdh_data = NULL;
guchar *cert_chain_data = NULL; guchar *cert_chain_data = NULL;
@ -410,8 +410,8 @@ sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain,
r = sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err); r = sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err);
if (r < 0) { if (r < 0) {
if (err != SEV_RET_INVALID_LEN) { if (err != SEV_RET_INVALID_LEN) {
error_report("failed to export PDH cert ret=%d fw_err=%d (%s)", error_setg(errp, "failed to export PDH cert ret=%d fw_err=%d (%s)",
r, err, fw_error_to_str(err)); r, err, fw_error_to_str(err));
return 1; return 1;
} }
} }
@ -423,8 +423,8 @@ sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain,
r = sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err); r = sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err);
if (r < 0) { if (r < 0) {
error_report("failed to export PDH cert ret=%d fw_err=%d (%s)", error_setg(errp, "failed to export PDH cert ret=%d fw_err=%d (%s)",
r, err, fw_error_to_str(err)); r, err, fw_error_to_str(err));
goto e_free; goto e_free;
} }
@ -441,7 +441,7 @@ e_free:
} }
SevCapability * SevCapability *
sev_get_capabilities(void) sev_get_capabilities(Error **errp)
{ {
SevCapability *cap = NULL; SevCapability *cap = NULL;
guchar *pdh_data = NULL; guchar *pdh_data = NULL;
@ -452,13 +452,13 @@ sev_get_capabilities(void)
fd = open(DEFAULT_SEV_DEVICE, O_RDWR); fd = open(DEFAULT_SEV_DEVICE, O_RDWR);
if (fd < 0) { if (fd < 0) {
error_report("%s: Failed to open %s '%s'", __func__, error_setg_errno(errp, errno, "Failed to open %s",
DEFAULT_SEV_DEVICE, strerror(errno)); DEFAULT_SEV_DEVICE);
return NULL; return NULL;
} }
if (sev_get_pdh_info(fd, &pdh_data, &pdh_len, if (sev_get_pdh_info(fd, &pdh_data, &pdh_len,
&cert_chain_data, &cert_chain_len)) { &cert_chain_data, &cert_chain_len, errp)) {
goto out; goto out;
} }

2
target/i386/sev_i386.h
View File

@ -34,6 +34,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(void); extern SevCapability *sev_get_capabilities(Error **errp);
#endif #endif