From: Srikanth Aithal <srikanth.aithal@amd.com>
To: <qemu-devel@nongnu.org>, <pbonzini@redhat.com>, <mtosatti@redhat.com>
Cc: <nikunj@amd.com>, Srikanth Aithal <srikanth.aithal@amd.com>
Subject: [PATCH] target/i386/sev: Fix a segfault in sev_kvm_init
Date: Thu, 4 Jan 2024 16:18:20 +0530 [thread overview]
Message-ID: <20240104104820.14422-1-srikanth.aithal@amd.com> (raw)
Propogate error code using errp in sev_kvm_init.
Before fix:
qemu-system-x86_64: sev_kvm_init: guest policy requires SEV-ES,
but host SEV-ES support unavailable
27747 Segmentation fault (core dumped)
After fix:
qemu-system-x86_64: sev_kvm_init: guest policy requires SEV-ES,
but host SEV-ES support unavailable
qemu-system-x86_64: failed to initialize kvm: Operation not permitted
While at it, also fix two more locations.
Reviewed-by: Nikunj A Dadhania <nikunj@amd.com>
Signed-off-by: Srikanth Aithal <srikanth.aithal@amd.com>
---
target/i386/sev.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 9a71246682..c0a4d5e535 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -922,7 +922,8 @@ 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, "%s: cannot disable "
+ "RAM discard", __func__);
return -1;
}
@@ -979,13 +980,13 @@ 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, "%s: SEV-ES guests require in-kernel "
+ "irqchip support", __func__);
goto err;
}
if (!(status.flags & SEV_STATUS_FLAGS_CONFIG_ES)) {
- error_report("%s: guest policy requires SEV-ES, but "
+ error_setg(errp, "%s: guest policy requires SEV-ES, but "
"host SEV-ES support unavailable",
__func__);
goto err;
--
2.34.1
next reply other threads:[~2024-01-04 13:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-04 10:48 Srikanth Aithal [this message]
2024-01-04 13:48 ` [PATCH] target/i386/sev: Fix a segfault in sev_kvm_init Philippe Mathieu-Daudé
2024-01-04 16:27 ` Zhao Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240104104820.14422-1-srikanth.aithal@amd.com \
--to=srikanth.aithal@amd.com \
--cc=mtosatti@redhat.com \
--cc=nikunj@amd.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).