sev/i386: Fix error reporting
PATCH v2 1/1 sev/i386: Fix error reporting
c9f5aaa6bce8 ("sev: Add Error ** to sev_kvm_init()") converted error_report() to error_setg(), however it missed one error_report() and other 2 changes added error_report() after conversion. The result is the caller - kvm_init() - crashes in error_report_err as local_err is NULL.
Follow the pattern and use error_setg instead of error_report. Remove the __func__ anti-pattern.
Fixes 9681f8677f26 ("sev/i386: Require in-kernel irqchip support for SEV-ES guests")
Fixes 6b98e96f1842 ("sev/i386: Add initial support for SEV-ES")
Fixes c9f5aaa6bce8 ("sev: Add Error ** to sev_kvm_init()")
Signed-off-by Alexey Kardashevskiy <[email protected]>
---
Changes:
v2:
* removed __func__ from afftected lines
--- target/i386/sev.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
target/i386/sev.c +3 -6
@@ -922,7 +922,7 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp) ret =ram_block_discard_disable (true);if (ret) { -error_report ("%s: cannot disable RAM discard" , __func__); +error_setg (errp,"Cannot disable RAM discard" );return -1 ; }
@@ -968,15 +968,12 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)if (sev_es_enabled ()) {if (!kvm_kernel_irqchip_allowed ()) { -error_report ("%s: SEV-ES guests require in-kernel irqchip support" , - __func__); +error_setg (errp,"SEV-ES guests require in-kernel irqchip support" ); goto err; }if (!(status.flags &SEV_STATUS_FLAGS_CONFIG_ES )) { -error_report ("%s: guest policy requires SEV-ES, but " -"host SEV-ES support unavailable" , - __func__); +error_setg (errp,"Guest policy requires SEV-ES, but host SEV-ES support unavailable" ); goto err; } cmd =KVM_SEV_ES_INIT ;
Signature · 1 line
2.39.1