From: David Gibson <david@gibson.dropbear.id.au>
To: qemu-devel@nongnu.org, brijesh.singh@amd.com,
frankja@linux.ibm.com, dgilbert@redhat.com, pair@us.ibm.com
Cc: qemu-ppc@nongnu.org, kvm@vger.kernel.org,
David Gibson <david@gibson.dropbear.id.au>,
mdroth@linux.vnet.ibm.com, cohuck@redhat.com,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Richard Henderson <rth@twiddle.net>,
Eduardo Habkost <ehabkost@redhat.com>
Subject: [RFC v2 16/18] guest memory protection: Add Error ** to GuestMemoryProtection::kvm_init
Date: Thu, 21 May 2020 13:43:02 +1000 [thread overview]
Message-ID: <20200521034304.340040-17-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20200521034304.340040-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>
---
accel/kvm/kvm-all.c | 4 +++-
include/exec/guest-memory-protection.h | 2 +-
target/i386/sev.c | 31 +++++++++++++-------------
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 1b10e94222..4011699736 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2079,9 +2079,11 @@ static int kvm_init(MachineState *ms)
if (ms->gmpo) {
GuestMemoryProtectionClass *gmpc =
GUEST_MEMORY_PROTECTION_GET_CLASS(ms->gmpo);
+ Error *local_err = NULL;
- ret = gmpc->kvm_init(ms->gmpo);
+ ret = gmpc->kvm_init(ms->gmpo, &local_err);
if (ret < 0) {
+ error_report_err(local_err);
goto err;
}
}
diff --git a/include/exec/guest-memory-protection.h b/include/exec/guest-memory-protection.h
index 7d959b4910..2a88475136 100644
--- a/include/exec/guest-memory-protection.h
+++ b/include/exec/guest-memory-protection.h
@@ -32,7 +32,7 @@ typedef struct GuestMemoryProtection GuestMemoryProtection;
typedef struct GuestMemoryProtectionClass {
InterfaceClass parent;
- int (*kvm_init)(GuestMemoryProtection *);
+ int (*kvm_init)(GuestMemoryProtection *, Error **);
int (*encrypt_data)(GuestMemoryProtection *, uint8_t *, uint64_t);
} GuestMemoryProtectionClass;
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 60e9d8c735..6a56ec203b 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -617,7 +617,7 @@ sev_vm_state_change(void *opaque, int running, RunState state)
}
}
-static int sev_kvm_init(GuestMemoryProtection *gmpo)
+static int sev_kvm_init(GuestMemoryProtection *gmpo, Error **errp)
{
SevGuestState *sev = SEV_GUEST(gmpo);
char *devname;
@@ -633,14 +633,14 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
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;
}
@@ -649,20 +649,19 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
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;
@@ -672,14 +671,14 @@ static int sev_kvm_init(GuestMemoryProtection *gmpo)
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.26.2
next prev parent reply other threads:[~2020-05-21 3:43 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 3:42 [RFC v2 00/18] Refactor configuration of guest memory protection David Gibson
2020-05-21 3:42 ` [RFC v2 01/18] target/i386: sev: Remove unused QSevGuestInfoClass David Gibson
2020-05-29 9:01 ` Philippe Mathieu-Daudé
2020-06-02 3:04 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 02/18] target/i386: sev: Move local structure definitions into .c file David Gibson
2020-05-29 9:03 ` Philippe Mathieu-Daudé
2020-06-02 3:05 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 03/18] target/i386: sev: Rename QSevGuestInfo David Gibson
2020-05-29 9:05 ` Philippe Mathieu-Daudé
2020-06-02 3:06 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 04/18] target/i386: sev: Embed SEVState in SevGuestState David Gibson
2020-05-29 9:09 ` Philippe Mathieu-Daudé
2020-06-04 3:15 ` David Gibson
2020-06-02 3:07 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 05/18] target/i386: sev: Partial cleanup to sev_state global David Gibson
2020-06-02 3:08 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 06/18] target/i386: sev: Remove redundant cbitpos and reduced_phys_bits fields David Gibson
2020-05-29 9:11 ` Philippe Mathieu-Daudé
2020-06-02 3:09 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 07/18] target/i386: sev: Remove redundant policy field David Gibson
2020-06-02 3:13 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 08/18] target/i386: sev: Remove redundant handle field David Gibson
2020-06-02 3:16 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 09/18] target/i386: sev: Unify SEVState and SevGuestState David Gibson
2020-05-29 9:13 ` Philippe Mathieu-Daudé
2020-06-02 3:18 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 10/18] guest memory protection: Add guest memory protection interface David Gibson
2020-05-25 10:27 ` Greg Kurz
2020-06-03 10:09 ` David Gibson
2020-06-02 1:44 ` Richard Henderson
2020-06-03 10:09 ` David Gibson
2020-05-21 3:42 ` [RFC v2 11/18] guest memory protection: Handle memory encrption via interface David Gibson
2020-05-25 10:26 ` Greg Kurz
2020-06-04 3:27 ` David Gibson
2020-06-02 3:21 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 12/18] guest memory protection: Perform KVM init " David Gibson
2020-06-02 3:39 ` Richard Henderson
2020-06-02 3:45 ` Richard Henderson
2020-05-21 3:42 ` [RFC v2 13/18] guest memory protection: Move side effect out of machine_set_memory_encryption() David Gibson
2020-06-02 3:41 ` Richard Henderson
2020-05-21 3:43 ` [RFC v2 14/18] guest memory protection: Rework the "memory-encryption" property David Gibson
2020-06-02 3:54 ` Richard Henderson
2020-06-04 5:56 ` David Gibson
2020-06-04 6:19 ` Thomas Huth
2020-06-04 6:25 ` David Gibson
2020-05-21 3:43 ` [RFC v2 15/18] guest memory protection: Decouple kvm_memcrypt_*() helpers from KVM David Gibson
2020-06-02 4:13 ` Richard Henderson
2020-06-03 10:18 ` David Gibson
2020-05-21 3:43 ` David Gibson [this message]
2020-05-29 9:16 ` [RFC v2 16/18] guest memory protection: Add Error ** to GuestMemoryProtection::kvm_init Philippe Mathieu-Daudé
2020-06-02 4:15 ` Richard Henderson
2020-05-21 3:43 ` [RFC v2 17/18] spapr: Added PEF based guest memory protection David Gibson
2020-05-25 11:14 ` Greg Kurz
2020-05-29 7:59 ` Ram Pai
2020-06-04 3:46 ` David Gibson
2020-05-21 3:43 ` [RFC v2 18/18] guest memory protection: Alter virtio default properties for protected guests David Gibson
2020-06-05 10:45 ` Cornelia Huck
2020-06-05 16:04 ` Halil Pasic
2020-06-06 20:21 ` Michael S. Tsirkin
2020-06-07 3:07 ` David Gibson
2020-06-09 10:16 ` Cornelia Huck
2020-06-09 15:40 ` Halil Pasic
2020-06-09 15:57 ` Cornelia Huck
2020-06-09 16:01 ` Michael S. Tsirkin
2020-06-10 4:45 ` David Gibson
2020-06-10 4:39 ` David Gibson
2020-06-10 8:48 ` Cornelia Huck
2020-06-10 10:07 ` David Gibson
2020-06-10 13:21 ` Halil Pasic
2020-05-29 22:19 ` [RFC v2 00/18] Refactor configuration of guest memory protection Sean Christopherson
2020-06-01 9:16 ` Dr. David Alan Gilbert
2020-06-04 3:11 ` David Gibson
2020-06-04 16:20 ` Sean Christopherson
2020-06-04 3:05 ` David Gibson
2020-06-04 4:39 ` Thiago Jung Bauermann
2020-06-04 6:21 ` David Gibson
2020-06-04 21:54 ` Thiago Jung Bauermann
2020-06-04 22:47 ` Paolo Bonzini
2020-06-04 23:30 ` Thiago Jung Bauermann
2020-06-04 23:41 ` Paolo Bonzini
2020-06-05 20:01 ` Thiago Jung Bauermann
2020-06-06 8:24 ` David Gibson
2020-06-08 15:10 ` Thiago Jung Bauermann
2020-06-04 6:44 ` David Gibson
2020-06-04 9:08 ` Greg Kurz
2020-06-06 8:45 ` David Gibson
2020-06-05 10:55 ` Cornelia Huck
2020-06-06 8:44 ` David Gibson
2020-06-09 10:11 ` Halil Pasic
2020-06-10 4:36 ` 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=20200521034304.340040-17-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=brijesh.singh@amd.com \
--cc=cohuck@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=pair@us.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
/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).