From: David Gibson <david@gibson.dropbear.id.au>
To: pasic@linux.ibm.com, brijesh.singh@amd.com, pair@us.ibm.com,
dgilbert@redhat.com, qemu-devel@nongnu.org
Cc: andi.kleen@intel.com, qemu-ppc@nongnu.org,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Greg Kurz" <groug@kaod.org>,
frankja@linux.ibm.com, thuth@redhat.com,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
mdroth@linux.vnet.ibm.com, richard.henderson@linaro.org,
kvm@vger.kernel.org, "Daniel P. Berrangé" <berrange@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
david@redhat.com, "Cornelia Huck" <cohuck@redhat.com>,
mst@redhat.com, qemu-s390x@nongnu.org,
pragyansri.pathi@intel.com, jun.nakajima@intel.com,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v6 06/13] sev: Add Error ** to sev_kvm_init()
Date: Tue, 12 Jan 2021 15:45:01 +1100 [thread overview]
Message-ID: <20210112044508.427338-7-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20210112044508.427338-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>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
---
accel/kvm/kvm-all.c | 4 +++-
accel/kvm/sev-stub.c | 2 +-
include/sysemu/sev.h | 2 +-
target/i386/sev.c | 31 +++++++++++++++----------------
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 28ab126f70..c5b0750fd0 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2182,9 +2182,11 @@ static int kvm_init(MachineState *ms)
* encryption context.
*/
if (ms->cgs) {
+ Error *local_err = NULL;
/* FIXME handle mechanisms other than SEV */
- ret = sev_kvm_init(ms->cgs);
+ ret = sev_kvm_init(ms->cgs, &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 3d4787ae4a..512e205f7f 100644
--- a/accel/kvm/sev-stub.c
+++ b/accel/kvm/sev-stub.c
@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "sysemu/sev.h"
-int sev_kvm_init(ConfidentialGuestSupport *cgs)
+int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
{
/* 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 3b5b1aacf1..5c5a13c6ca 100644
--- a/include/sysemu/sev.h
+++ b/include/sysemu/sev.h
@@ -16,7 +16,7 @@
#include "sysemu/kvm.h"
-int sev_kvm_init(ConfidentialGuestSupport *cgs);
+int sev_kvm_init(ConfidentialGuestSupport *cgs, 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,
uint64_t gpa, Error **errp);
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 5399a136ad..e2b41ef342 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -662,7 +662,7 @@ sev_vm_state_change(void *opaque, int running, RunState state)
}
}
-int sev_kvm_init(ConfidentialGuestSupport *cgs)
+int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
{
SevGuestState *sev = SEV_GUEST(cgs);
char *devname;
@@ -684,14 +684,14 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs)
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;
}
@@ -700,20 +700,19 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs)
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;
@@ -723,14 +722,14 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs)
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.29.2
next prev parent reply other threads:[~2021-01-12 4:45 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 4:44 [PATCH v6 00/13] Generalize memory encryption models David Gibson
2021-01-12 4:44 ` [PATCH v6 01/13] qom: Allow optional sugar props David Gibson
2021-01-12 4:44 ` [PATCH v6 02/13] confidential guest support: Introduce new confidential guest support class David Gibson
2021-01-12 9:46 ` Daniel P. Berrangé
2021-01-13 2:09 ` David Gibson
2021-01-12 4:44 ` [PATCH v6 03/13] sev: Remove false abstraction of flash encryption David Gibson
2021-01-12 4:44 ` [PATCH v6 04/13] confidential guest support: Move side effect out of machine_set_memory_encryption() David Gibson
2021-01-12 4:45 ` [PATCH v6 05/13] confidential guest support: Rework the "memory-encryption" property David Gibson
[not found] ` <20210112115959.2c042dbb@bahia.lan>
2021-01-13 0:50 ` David Gibson
2021-01-13 12:03 ` Dr. David Alan Gilbert
2021-01-12 4:45 ` David Gibson [this message]
2021-01-12 4:45 ` [PATCH v6 07/13] confidential guest support: Introduce cgs "ready" flag David Gibson
2021-01-12 4:45 ` [PATCH v6 08/13] confidential guest support: Move SEV initialization into arch specific code David Gibson
2021-01-12 4:45 ` [PATCH v6 09/13] confidential guest support: Update documentation David Gibson
2021-01-12 4:45 ` [PATCH v6 10/13] spapr: Add PEF based confidential guest support David Gibson
2021-01-12 7:56 ` Christian Borntraeger
2021-01-12 8:36 ` David Gibson
2021-01-12 9:52 ` Daniel P. Berrangé
2021-01-12 9:56 ` Daniel P. Berrangé
2021-01-13 0:52 ` David Gibson
[not found] ` <20210112122750.5dcd995c@bahia.lan>
2021-01-13 0:56 ` David Gibson
2021-01-12 4:45 ` [PATCH v6 11/13] spapr: PEF: prevent migration David Gibson
2021-01-12 4:45 ` [PATCH v6 12/13] confidential guest support: Alter virtio default properties for protected guests David Gibson
2021-01-12 4:45 ` [PATCH v6 13/13] s390: Recognize confidential-guest-support option David Gibson
2021-01-12 8:15 ` Christian Borntraeger
2021-01-12 11:36 ` Cornelia Huck
2021-01-12 11:48 ` Christian Borntraeger
2021-01-12 11:49 ` Daniel P. Berrangé
2021-01-13 0:57 ` David Gibson
2021-01-13 6:57 ` Christian Borntraeger
2021-01-13 23:56 ` David Gibson
2021-01-12 9:54 ` Daniel P. Berrangé
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=20210112044508.427338-7-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=andi.kleen@intel.com \
--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=groug@kaod.org \
--cc=jun.nakajima@intel.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=pragyansri.pathi@intel.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--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).