[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/23] target/i386/sev: sev_get_attestation_report use g_autof
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v4 11/23] target/i386/sev: sev_get_attestation_report use g_autofree |
Date: |
Thu, 7 Oct 2021 18:17:04 +0200 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Removes a whole bunch of g_free's and a goto.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Connor Kuehl <ckuehl@redhat.com>
Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>
Message-Id: <20210603113017.34922-1-dgilbert@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
target/i386/sev.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 9e3f2ec8dd3..3a30ba6d94a 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -521,8 +521,8 @@ sev_get_attestation_report(const char *mnonce, Error **errp)
struct kvm_sev_attestation_report input = {};
SevAttestationReport *report = NULL;
SevGuestState *sev = sev_guest;
- guchar *data;
- guchar *buf;
+ g_autofree guchar *data = NULL;
+ g_autofree guchar *buf = NULL;
gsize len;
int err = 0, ret;
@@ -542,7 +542,6 @@ sev_get_attestation_report(const char *mnonce, Error **errp)
if (len != sizeof(input.mnonce)) {
error_setg(errp, "SEV: mnonce must be %zu bytes (got %" G_GSIZE_FORMAT
")",
sizeof(input.mnonce), len);
- g_free(buf);
return NULL;
}
@@ -554,7 +553,6 @@ sev_get_attestation_report(const char *mnonce, Error **errp)
error_setg(errp, "SEV: Failed to query the attestation report"
" length ret=%d fw_err=%d (%s)",
ret, err, fw_error_to_str(err));
- g_free(buf);
return NULL;
}
}
@@ -569,7 +567,7 @@ sev_get_attestation_report(const char *mnonce, Error **errp)
if (ret) {
error_setg_errno(errp, errno, "SEV: Failed to get attestation report"
" ret=%d fw_err=%d (%s)", ret, err, fw_error_to_str(err));
- goto e_free_data;
+ return NULL;
}
report = g_new0(SevAttestationReport, 1);
@@ -577,9 +575,6 @@ sev_get_attestation_report(const char *mnonce, Error **errp)
trace_kvm_sev_attestation_report(mnonce, report->data);
-e_free_data:
- g_free(data);
- g_free(buf);
return report;
}
--
2.31.1
- [PATCH v4 03/23] target/i386/kvm: Introduce i386_softmmu_kvm Meson source set, (continued)
- [PATCH v4 03/23] target/i386/kvm: Introduce i386_softmmu_kvm Meson source set, Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 02/23] qapi/misc-target: Group SEV QAPI definitions, Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 04/23] target/i386/kvm: Restrict SEV stubs to x86 architecture, Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 05/23] target/i386/sev: Prefix QMP errors with 'SEV', Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 06/23] target/i386/monitor: Return QMP error when SEV is not enabled for guest, Philippe Mathieu-Daudé, 2021/10/07
- [PATCH v4 07/23] target/i386/cpu: Add missing 'qapi/error.h' header, Philippe Mathieu-Daudé, 2021/10/07
- [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é <=
- [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é, 2021/10/07
- [PATCH v4 16/23] target/i386/sev: Remove stubs by using code elision, Philippe Mathieu-Daudé, 2021/10/07