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: Prefix QMP errors with 'SEV' 

Multiple errors might be reported to the monitor,
better to prefix the SEV ones so we can distinct them.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20211007161716.453984-6-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2021-10-07 18:16:58 +02:00 committed by Paolo Bonzini
parent 773ab6cb16
commit 2c7233eb10
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/i386/monitor.c
View File

@ -717,7 +717,7 @@ SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp)
data = sev_get_launch_measurement(); data = sev_get_launch_measurement();
if (!data) { if (!data) {
error_setg(errp, "Measurement is not available"); error_setg(errp, "SEV launch measurement is not available");
return NULL; return NULL;
} }

20
target/i386/sev.c
View File

@ -440,7 +440,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_setg(errp, "failed to export PDH cert ret=%d fw_err=%d (%s)", error_setg(errp, "SEV: 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;
} }
@ -453,7 +454,7 @@ 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_setg(errp, "failed to export PDH cert ret=%d fw_err=%d (%s)", error_setg(errp, "SEV: 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;
} }
@ -491,7 +492,7 @@ sev_get_capabilities(Error **errp)
fd = open(DEFAULT_SEV_DEVICE, O_RDWR); fd = open(DEFAULT_SEV_DEVICE, O_RDWR);
if (fd < 0) { if (fd < 0) {
error_setg_errno(errp, errno, "Failed to open %s", error_setg_errno(errp, errno, "SEV: Failed to open %s",
DEFAULT_SEV_DEVICE); DEFAULT_SEV_DEVICE);
return NULL; return NULL;
} }
@ -557,8 +558,9 @@ sev_get_attestation_report(const char *mnonce, Error **errp)
&input, &err); &input, &err);
if (ret < 0) { if (ret < 0) {
if (err != SEV_RET_INVALID_LEN) { if (err != SEV_RET_INVALID_LEN) {
error_setg(errp, "failed to query the attestation report length " error_setg(errp, "SEV: Failed to query the attestation report"
"ret=%d fw_err=%d (%s)", ret, err, fw_error_to_str(err)); " length ret=%d fw_err=%d (%s)",
ret, err, fw_error_to_str(err));
g_free(buf); g_free(buf);
return NULL; return NULL;
} }
@ -572,7 +574,7 @@ sev_get_attestation_report(const char *mnonce, Error **errp)
ret = sev_ioctl(sev->sev_fd, KVM_SEV_GET_ATTESTATION_REPORT, ret = sev_ioctl(sev->sev_fd, KVM_SEV_GET_ATTESTATION_REPORT,
&input, &err); &input, &err);
if (ret) { if (ret) {
error_setg_errno(errp, errno, "Failed to get attestation report" error_setg_errno(errp, errno, "SEV: Failed to get attestation report"
" ret=%d fw_err=%d (%s)", ret, err, fw_error_to_str(err)); " ret=%d fw_err=%d (%s)", ret, err, fw_error_to_str(err));
goto e_free_data; goto e_free_data;
} }
@ -596,7 +598,7 @@ sev_read_file_base64(const char *filename, guchar **data, gsize *len)
GError *error = NULL; GError *error = NULL;
if (!g_file_get_contents(filename, &base64, &sz, &error)) { if (!g_file_get_contents(filename, &base64, &sz, &error)) {
error_report("failed to read '%s' (%s)", filename, error->message); error_report("SEV: Failed to read '%s' (%s)", filename, error->message);
g_error_free(error); g_error_free(error);
return -1; return -1;
} }
@ -911,7 +913,7 @@ sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp)
if (sev_check_state(sev_guest, SEV_STATE_LAUNCH_UPDATE)) { if (sev_check_state(sev_guest, SEV_STATE_LAUNCH_UPDATE)) {
int ret = sev_launch_update_data(sev_guest, ptr, len); int ret = sev_launch_update_data(sev_guest, ptr, len);
if (ret < 0) { if (ret < 0) {
error_setg(errp, "failed to encrypt pflash rom"); error_setg(errp, "SEV: Failed to encrypt pflash rom");
return ret; return ret;
} }
} }
@ -930,7 +932,7 @@ int sev_inject_launch_secret(const char *packet_hdr, const char *secret,
MemoryRegion *mr = NULL; MemoryRegion *mr = NULL;
if (!sev_guest) { if (!sev_guest) {
error_setg(errp, "SEV: SEV not enabled."); error_setg(errp, "SEV not enabled for guest");
return 1; return 1;
} }