| Message ID | 20211002125317.3418648-17-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: > Move qmp_query_sev_capabilities() from monitor.c to sev.c > and make sev_get_capabilities() static. We don't need the > stub anymore, remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > target/i386/sev_i386.h | 1 - > target/i386/monitor.c | 5 ----- > target/i386/sev-sysemu-stub.c | 4 ++-- > target/i386/sev.c | 8 ++++++-- > 4 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h > index 5f367f78eb7..8d9388d8c5c 100644 > --- a/target/i386/sev_i386.h > +++ b/target/i386/sev_i386.h > @@ -26,7 +26,6 @@ > > extern SevInfo *sev_get_info(void); > extern char *sev_get_launch_measurement(void); > -extern SevCapability *sev_get_capabilities(Error **errp); > > int sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp); > int sev_inject_launch_secret(const char *hdr, const char *secret, > diff --git a/target/i386/monitor.c b/target/i386/monitor.c > index 188203da6f2..da36522fa15 100644 > --- a/target/i386/monitor.c > +++ b/target/i386/monitor.c > @@ -728,11 +728,6 @@ SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp) > return info; > } > > -SevCapability *qmp_query_sev_capabilities(Error **errp) > -{ > - return sev_get_capabilities(errp); > -} > - > SGXInfo *qmp_query_sgx(Error **errp) > { > return sgx_get_info(errp); > diff --git a/target/i386/sev-sysemu-stub.c b/target/i386/sev-sysemu-stub.c > index 66b69540aa5..cc486a1afbe 100644 > --- a/target/i386/sev-sysemu-stub.c > +++ b/target/i386/sev-sysemu-stub.c > @@ -27,9 +27,9 @@ char *sev_get_launch_measurement(void) > return NULL; > } > > -SevCapability *sev_get_capabilities(Error **errp) > +SevCapability *qmp_query_sev_capabilities(Error **errp) > { > - error_setg(errp, "SEV is not available in this QEMU"); > + error_setg(errp, QERR_UNSUPPORTED); > return NULL; > } > > diff --git a/target/i386/sev.c b/target/i386/sev.c > index 2198d550be2..fce007d6749 100644 > --- a/target/i386/sev.c > +++ b/target/i386/sev.c > @@ -438,8 +438,7 @@ e_free: > return 1; > } > > -SevCapability * > -sev_get_capabilities(Error **errp) > +static SevCapability *sev_get_capabilities(Error **errp) > { > SevCapability *cap = NULL; > guchar *pdh_data = NULL; > @@ -489,6 +488,11 @@ out: > return cap; > } > > +SevCapability *qmp_query_sev_capabilities(Error **errp) > +{ > + return sev_get_capabilities(errp); > +} > + > static SevAttestationReport *sev_get_attestation_report(const char *mnonce, > Error **errp) > { > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h index 5f367f78eb7..8d9388d8c5c 100644 --- a/target/i386/sev_i386.h +++ b/target/i386/sev_i386.h @@ -26,7 +26,6 @@ extern SevInfo *sev_get_info(void); extern char *sev_get_launch_measurement(void); -extern SevCapability *sev_get_capabilities(Error **errp); int sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp); int sev_inject_launch_secret(const char *hdr, const char *secret, diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 188203da6f2..da36522fa15 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -728,11 +728,6 @@ SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp) return info; } -SevCapability *qmp_query_sev_capabilities(Error **errp) -{ - return sev_get_capabilities(errp); -} - SGXInfo *qmp_query_sgx(Error **errp) { return sgx_get_info(errp); diff --git a/target/i386/sev-sysemu-stub.c b/target/i386/sev-sysemu-stub.c index 66b69540aa5..cc486a1afbe 100644 --- a/target/i386/sev-sysemu-stub.c +++ b/target/i386/sev-sysemu-stub.c @@ -27,9 +27,9 @@ char *sev_get_launch_measurement(void) return NULL; } -SevCapability *sev_get_capabilities(Error **errp) +SevCapability *qmp_query_sev_capabilities(Error **errp) { - error_setg(errp, "SEV is not available in this QEMU"); + error_setg(errp, QERR_UNSUPPORTED); return NULL; } diff --git a/target/i386/sev.c b/target/i386/sev.c index 2198d550be2..fce007d6749 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -438,8 +438,7 @@ e_free: return 1; } -SevCapability * -sev_get_capabilities(Error **errp) +static SevCapability *sev_get_capabilities(Error **errp) { SevCapability *cap = NULL; guchar *pdh_data = NULL; @@ -489,6 +488,11 @@ out: return cap; } +SevCapability *qmp_query_sev_capabilities(Error **errp) +{ + return sev_get_capabilities(errp); +} + static SevAttestationReport *sev_get_attestation_report(const char *mnonce, Error **errp) {
Move qmp_query_sev_capabilities() from monitor.c to sev.c and make sev_get_capabilities() static. We don't need the stub anymore, remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- target/i386/sev_i386.h | 1 - target/i386/monitor.c | 5 ----- target/i386/sev-sysemu-stub.c | 4 ++-- target/i386/sev.c | 8 ++++++-- 4 files changed, 8 insertions(+), 10 deletions(-)