From: David Gibson <david@gibson.dropbear.id.au>
To: pair@us.ibm.com, pbonzini@redhat.com, frankja@linux.ibm.com,
brijesh.singh@amd.com, dgilbert@redhat.com,
qemu-devel@nongnu.org
Cc: "Eduardo Habkost" <ehabkost@redhat.com>,
qemu-ppc@nongnu.org, rth@twiddle.net, thuth@redhat.com,
berrange@redhat.com, mdroth@linux.vnet.ibm.com,
"Marcelo Tosatti" <mtosatti@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
david@redhat.com,
"Richard Henderson" <richard.henderson@linaro.org>,
borntraeger@de.ibm.com,
"David Gibson" <david@gibson.dropbear.id.au>,
cohuck@redhat.com, kvm@vger.kernel.org, qemu-s390x@nongnu.org,
pasic@linux.ibm.com, "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [for-6.0 v5 07/13] sev: Add Error ** to sev_kvm_init()
Date: Fri, 4 Dec 2020 16:44:09 +1100 [thread overview]
Message-ID: <20201204054415.579042-8-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20201204054415.579042-1-david@gibson.dropbear.id.au>
This allows failures to be reported richly and idiomatically.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/kvm/kvm-all.c | 4 +++-
accel/kvm/sev-stub.c | 5 +++--
include/sysemu/sev.h | 2 +-
target/i386/sev.c | 31 +++++++++++++++----------------
4 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index c6bd7b9d02..724e9294d0 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2183,9 +2183,11 @@ static int kvm_init(MachineState *ms)
* encryption context.
*/
if (ms->sgm) {
+ Error *local_err = NULL;
/* FIXME handle mechanisms other than SEV */
- ret = sev_kvm_init(ms->sgm);
+ ret = sev_kvm_init(ms->sgm, &local_err);
if (ret < 0) {
+ error_report_err(local_err);
goto err;
}
}
diff --git a/accel/kvm/sev-stub.c b/accel/kvm/sev-stub.c
index 3df3c88eeb..537c91d9f8 100644
--- a/accel/kvm/sev-stub.c
+++ b/accel/kvm/sev-stub.c
@@ -15,7 +15,8 @@
#include "qemu-common.h"
#include "sysemu/sev.h"
-int sev_kvm_init(SecurableGuestMemory *sgm)
+int sev_kvm_init(SecurableGuestMemory *sgm, Error **errp)
{
- return -1;
+ /* SEV can't be selected if it's not compiled */
+ g_assert_not_reached();
}
diff --git a/include/sysemu/sev.h b/include/sysemu/sev.h
index 36d038a36f..7aa35821f0 100644
--- a/include/sysemu/sev.h
+++ b/include/sysemu/sev.h
@@ -17,6 +17,6 @@
#include "sysemu/kvm.h"
#include "exec/securable-guest-memory.h"
-int sev_kvm_init(SecurableGuestMemory *sgm);
+int sev_kvm_init(SecurableGuestMemory *sgm, Error **errp);
#endif
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 7b8ce590f7..7333a60dc0 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -626,7 +626,7 @@ sev_vm_state_change(void *opaque, int running, RunState state)
}
}
-int sev_kvm_init(SecurableGuestMemory *sgm)
+int sev_kvm_init(SecurableGuestMemory *sgm, Error **errp)
{
SevGuestState *sev = SEV_GUEST(sgm);
char *devname;
@@ -648,14 +648,14 @@ int sev_kvm_init(SecurableGuestMemory *sgm)
host_cbitpos = ebx & 0x3f;
if (host_cbitpos != sev->cbitpos) {
- error_report("%s: cbitpos check failed, host '%d' requested '%d'",
- __func__, host_cbitpos, sev->cbitpos);
+ error_setg(errp, "%s: cbitpos check failed, host '%d' requested '%d'",
+ __func__, host_cbitpos, sev->cbitpos);
goto err;
}
if (sev->reduced_phys_bits < 1) {
- error_report("%s: reduced_phys_bits check failed, it should be >=1,"
- " requested '%d'", __func__, sev->reduced_phys_bits);
+ error_setg(errp, "%s: reduced_phys_bits check failed, it should be >=1,"
+ " requested '%d'", __func__, sev->reduced_phys_bits);
goto err;
}
@@ -664,20 +664,19 @@ int sev_kvm_init(SecurableGuestMemory *sgm)
devname = object_property_get_str(OBJECT(sev), "sev-device", NULL);
sev->sev_fd = open(devname, O_RDWR);
if (sev->sev_fd < 0) {
- error_report("%s: Failed to open %s '%s'", __func__,
- devname, strerror(errno));
- }
- g_free(devname);
- if (sev->sev_fd < 0) {
+ error_setg(errp, "%s: Failed to open %s '%s'", __func__,
+ devname, strerror(errno));
+ g_free(devname);
goto err;
}
+ g_free(devname);
ret = sev_platform_ioctl(sev->sev_fd, SEV_PLATFORM_STATUS, &status,
&fw_error);
if (ret) {
- error_report("%s: failed to get platform status ret=%d "
- "fw_error='%d: %s'", __func__, ret, fw_error,
- fw_error_to_str(fw_error));
+ error_setg(errp, "%s: failed to get platform status ret=%d "
+ "fw_error='%d: %s'", __func__, ret, fw_error,
+ fw_error_to_str(fw_error));
goto err;
}
sev->build_id = status.build;
@@ -687,14 +686,14 @@ int sev_kvm_init(SecurableGuestMemory *sgm)
trace_kvm_sev_init();
ret = sev_ioctl(sev->sev_fd, KVM_SEV_INIT, NULL, &fw_error);
if (ret) {
- error_report("%s: failed to initialize ret=%d fw_error=%d '%s'",
- __func__, ret, fw_error, fw_error_to_str(fw_error));
+ error_setg(errp, "%s: failed to initialize ret=%d fw_error=%d '%s'",
+ __func__, ret, fw_error, fw_error_to_str(fw_error));
goto err;
}
ret = sev_launch_start(sev);
if (ret) {
- error_report("%s: failed to create encryption context", __func__);
+ error_setg(errp, "%s: failed to create encryption context", __func__);
goto err;
}
--
2.28.0
next prev parent reply other threads:[~2020-12-04 5:46 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 5:44 [for-6.0 v5 00/13] Generalize memory encryption models David Gibson
2020-12-04 5:44 ` [for-6.0 v5 01/13] qom: Allow optional sugar props David Gibson
2020-12-04 12:57 ` Cornelia Huck
2020-12-14 21:25 ` Eduardo Habkost
2021-01-11 18:04 ` Philippe Mathieu-Daudé
2020-12-04 5:44 ` [for-6.0 v5 02/13] securable guest memory: Introduce new securable guest memory base class David Gibson
2020-12-04 5:44 ` [for-6.0 v5 03/13] securable guest memory: Handle memory encryption via interface David Gibson
2020-12-04 13:10 ` Cornelia Huck
2021-01-08 4:03 ` David Gibson
2021-01-12 3:49 ` David Gibson
2020-12-04 5:44 ` [for-6.0 v5 04/13] securable guest memory: Move side effect out of machine_set_memory_encryption() David Gibson
2020-12-04 5:44 ` [for-6.0 v5 05/13] securable guest memory: Rework the "memory-encryption" property David Gibson
2021-01-11 18:09 ` Philippe Mathieu-Daudé
2020-12-04 5:44 ` [for-6.0 v5 06/13] securable guest memory: Decouple kvm_memcrypt_*() helpers from KVM David Gibson
2021-01-11 18:13 ` Philippe Mathieu-Daudé
2021-01-12 3:03 ` David Gibson
2020-12-04 5:44 ` David Gibson [this message]
2020-12-14 16:50 ` [for-6.0 v5 07/13] sev: Add Error ** to sev_kvm_init() Cornelia Huck
2020-12-04 5:44 ` [for-6.0 v5 08/13] securable guest memory: Introduce sgm "ready" flag David Gibson
2020-12-14 17:00 ` Cornelia Huck
2020-12-17 5:38 ` David Gibson
2020-12-17 11:24 ` Cornelia Huck
2020-12-04 5:44 ` [for-6.0 v5 09/13] securable guest memory: Move SEV initialization into arch specific code David Gibson
2020-12-04 5:44 ` [for-6.0 v5 10/13] spapr: Add PEF based securable guest memory David Gibson
2021-01-05 23:34 ` Ram Pai
2021-01-08 0:34 ` David Gibson
2020-12-04 5:44 ` [for-6.0 v5 11/13] spapr: PEF: prevent migration David Gibson
2020-12-14 17:22 ` Cornelia Huck
2020-12-17 5:47 ` David Gibson
2020-12-17 11:38 ` Cornelia Huck
2020-12-17 14:15 ` Greg Kurz
2020-12-18 11:41 ` Cornelia Huck
2020-12-18 12:08 ` Dr. David Alan Gilbert
2021-01-04 7:15 ` Ram Pai
2021-01-04 12:46 ` [EXTERNAL] " Halil Pasic
2021-01-04 18:40 ` Ram Pai
2021-01-05 10:56 ` [EXTERNAL] " Halil Pasic
2021-01-05 20:41 ` Ram Pai
2021-01-11 16:59 ` Cornelia Huck
2021-01-11 19:58 ` Ram Pai
2021-01-12 8:19 ` Cornelia Huck
2021-01-12 18:55 ` Ram Pai
2021-01-13 8:06 ` Cornelia Huck
2021-01-15 18:55 ` Ram Pai
2021-01-19 8:19 ` Cornelia Huck
2021-01-19 9:59 ` Daniel P. Berrangé
2021-01-14 11:23 ` Daniel P. Berrangé
2021-01-13 12:42 ` Dr. David Alan Gilbert
2021-01-14 10:28 ` Christian Borntraeger
2021-01-14 10:36 ` Dr. David Alan Gilbert
2021-01-14 10:52 ` Christian Borntraeger
2021-01-14 11:05 ` Cornelia Huck
2021-01-14 11:45 ` Dr. David Alan Gilbert
2021-01-14 11:50 ` Christian Borntraeger
2021-01-14 12:20 ` Daniel P. Berrangé
2021-01-14 14:04 ` Cornelia Huck
2021-01-14 14:09 ` Christian Borntraeger
2021-01-14 14:15 ` Daniel P. Berrangé
2021-01-14 15:25 ` Christian Borntraeger
2021-01-14 15:33 ` Daniel P. Berrangé
2021-01-15 18:24 ` Ram Pai
2021-01-14 11:25 ` Daniel P. Berrangé
2021-01-14 23:51 ` David Gibson
2021-01-18 17:39 ` Dr. David Alan Gilbert
2021-01-19 8:28 ` Christian Borntraeger
2021-01-19 8:34 ` Cornelia Huck
2020-12-04 5:44 ` [for-6.0 v5 12/13] securable guest memory: Alter virtio default properties for protected guests David Gibson
2020-12-04 8:10 ` Christian Borntraeger
2020-12-04 8:17 ` Cornelia Huck
2020-12-04 8:29 ` Christian Borntraeger
2020-12-04 14:43 ` Halil Pasic
2020-12-08 1:54 ` David Gibson
2020-12-08 8:16 ` Christian Borntraeger
2020-12-08 10:28 ` Halil Pasic
2020-12-08 12:50 ` Cornelia Huck
2020-12-17 5:53 ` David Gibson
2020-12-04 17:04 ` Cornelia Huck
2020-12-04 5:44 ` [for-6.0 v5 13/13] s390: Recognize securable-guest-memory option David Gibson
2020-12-15 11:45 ` Cornelia Huck
2020-12-17 5:54 ` David Gibson
2020-12-04 8:06 ` [for-6.0 v5 00/13] Generalize memory encryption models Christian Borntraeger
2020-12-04 13:02 ` Cornelia Huck
2020-12-04 13:07 ` Dr. David Alan Gilbert
2020-12-04 13:12 ` Cornelia Huck
2020-12-08 2:57 ` David Gibson
2020-12-08 12:43 ` Cornelia Huck
2020-12-17 6:21 ` David Gibson
2020-12-17 11:43 ` Cornelia Huck
2020-12-04 13:25 ` Daniel P. Berrangé
2020-12-04 13:51 ` Halil Pasic
2020-12-08 2:54 ` David Gibson
2020-12-04 9:50 ` Daniel P. Berrangé
2021-01-12 3:02 ` David Gibson
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=20201204054415.579042-8-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=berrange@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=brijesh.singh@amd.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pair@us.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/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).