From: David Gibson <david@gibson.dropbear.id.au> To: pasic@linux.ibm.com, dgilbert@redhat.com, pair@us.ibm.com, qemu-devel@nongnu.org, brijesh.singh@amd.com Cc: ehabkost@redhat.com, mtosatti@redhat.com, mst@redhat.com, jun.nakajima@intel.com, kvm@vger.kernel.org, "Richard Henderson" <richard.henderson@linaro.org>, qemu-s390x@nongnu.org, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, pbonzini@redhat.com, frankja@linux.ibm.com, andi.kleen@intel.com, cohuck@redhat.com, "Thomas Huth" <thuth@redhat.com>, borntraeger@de.ibm.com, mdroth@linux.vnet.ibm.com, "David Gibson" <david@gibson.dropbear.id.au>, "Daniel P. Berrangé" <berrange@redhat.com>, qemu-ppc@nongnu.org, "David Hildenbrand" <david@redhat.com>, "Greg Kurz" <groug@kaod.org>, pragyansri.pathi@intel.com, "Philippe Mathieu-Daudé" <philmd@redhat.com> Subject: [PULL v9 06/13] sev: Add Error ** to sev_kvm_init() Date: Mon, 8 Feb 2021 17:05:31 +1100 [thread overview] Message-ID: <20210208060538.39276-7-david@gibson.dropbear.id.au> (raw) In-Reply-To: <20210208060538.39276-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 88a6b8c19e..226e1556f9 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2185,9 +2185,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 fa962d533c..590cb31fa8 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
WARNING: multiple messages have this Message-ID (diff)
From: David Gibson <david@gibson.dropbear.id.au> To: pasic@linux.ibm.com, dgilbert@redhat.com, pair@us.ibm.com, qemu-devel@nongnu.org, brijesh.singh@amd.com Cc: mtosatti@redhat.com, kvm@vger.kernel.org, mst@redhat.com, frankja@linux.ibm.com, pragyansri.pathi@intel.com, "David Hildenbrand" <david@redhat.com>, mdroth@linux.vnet.ibm.com, borntraeger@de.ibm.com, andi.kleen@intel.com, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Thomas Huth" <thuth@redhat.com>, ehabkost@redhat.com, "Richard Henderson" <richard.henderson@linaro.org>, "Greg Kurz" <groug@kaod.org>, qemu-s390x@nongnu.org, jun.nakajima@intel.com, "David Gibson" <david@gibson.dropbear.id.au>, "Daniel P. Berrangé" <berrange@redhat.com>, cohuck@redhat.com, qemu-ppc@nongnu.org, pbonzini@redhat.com Subject: [PULL v9 06/13] sev: Add Error ** to sev_kvm_init() Date: Mon, 8 Feb 2021 17:05:31 +1100 [thread overview] Message-ID: <20210208060538.39276-7-david@gibson.dropbear.id.au> (raw) In-Reply-To: <20210208060538.39276-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 88a6b8c19e..226e1556f9 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2185,9 +2185,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 fa962d533c..590cb31fa8 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-02-08 6:06 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-08 6:05 [PULL v9 00/13] Cgs patches David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 01/13] qom: Allow optional sugar props David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 02/13] confidential guest support: Introduce new confidential guest support class David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 03/13] sev: Remove false abstraction of flash encryption David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 04/13] confidential guest support: Move side effect out of machine_set_memory_encryption() David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 05/13] confidential guest support: Rework the "memory-encryption" property David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` David Gibson [this message] 2021-02-08 6:05 ` [PULL v9 06/13] sev: Add Error ** to sev_kvm_init() David Gibson 2021-02-08 6:05 ` [PULL v9 07/13] confidential guest support: Introduce cgs "ready" flag David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 08/13] confidential guest support: Move SEV initialization into arch specific code David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 09/13] confidential guest support: Update documentation David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 10/13] spapr: Add PEF based confidential guest support David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 11/13] spapr: PEF: prevent migration David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 12/13] confidential guest support: Alter virtio default properties for protected guests David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 6:05 ` [PULL v9 13/13] s390: Recognize confidential-guest-support option David Gibson 2021-02-08 6:05 ` David Gibson 2021-02-08 13:00 ` [PULL v9 00/13] Cgs patches Peter Maydell 2021-02-08 13:00 ` Peter Maydell 2021-05-17 10:58 ` Philippe Mathieu-Daudé 2021-05-17 10:58 ` Philippe Mathieu-Daudé 2021-02-08 6:07 David Gibson 2021-02-08 6:07 ` [PULL v9 06/13] sev: Add Error ** to sev_kvm_init() David Gibson 2021-02-08 6:07 ` 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=20210208060538.39276-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.