| Message ID | 20211002125317.3418648-11-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/i386/sev: Housekeeping SEV + measured Linux SEV guest | expand |
On 02/10/21 14:53, Philippe Mathieu-Daudé wrote: > 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> > 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 c88cd808410..aefbef4bb63 100644 > --- a/target/i386/sev.c > +++ b/target/i386/sev.c > @@ -493,8 +493,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; > > @@ -514,7 +514,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; > } > > @@ -525,7 +524,6 @@ sev_get_attestation_report(const char *mnonce, Error **errp) > if (err != SEV_RET_INVALID_LEN) { > error_setg(errp, "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; > } > } > @@ -540,7 +538,7 @@ sev_get_attestation_report(const char *mnonce, Error **errp) > if (ret) { > error_setg_errno(errp, errno, "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); > @@ -548,9 +546,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; > } > > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/target/i386/sev.c b/target/i386/sev.c index c88cd808410..aefbef4bb63 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -493,8 +493,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; @@ -514,7 +514,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; } @@ -525,7 +524,6 @@ sev_get_attestation_report(const char *mnonce, Error **errp) if (err != SEV_RET_INVALID_LEN) { error_setg(errp, "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; } } @@ -540,7 +538,7 @@ sev_get_attestation_report(const char *mnonce, Error **errp) if (ret) { error_setg_errno(errp, errno, "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); @@ -548,9 +546,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; }