From 8789f2662c6ddacc5472a803d253b94d93c6e9f0 Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Fri, 31 Jul 2020 18:08:34 -0400

Subject: [PATCH 2/4] target/i386: sev: provide proper error reporting for

 query-sev-capabilities

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Paolo Bonzini <pbonzini@redhat.com>

Message-id: <20200731180835.86786-2-pbonzini@redhat.com>

Patchwork-id: 98123

O-Subject: [RHEL-8.3.0 qemu-kvm PATCH 1/2] target/i386: sev: provide proper error reporting for query-sev-capabilities

Bugzilla: 1689341

RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

The query-sev-capabilities was reporting errors through error_report;

change it to use Error** so that the cause of the failure is clearer.

Reviewed-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Cherry picked from commit e4f6278557148151e77260b872b41bcd7ceb4737

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/i386/monitor.c  | 10 +---------

 target/i386/sev-stub.c |  3 ++-

 target/i386/sev.c      | 18 +++++++++---------

 target/i386/sev_i386.h |  2 +-

 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/target/i386/monitor.c b/target/i386/monitor.c

index 9fb4d641d5..cfd8075e4f 100644

--- a/target/i386/monitor.c

+++ b/target/i386/monitor.c

@@ -727,13 +727,5 @@ SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp)

 SevCapability *qmp_query_sev_capabilities(Error **errp)

 {

-    SevCapability *data;

-

-    data = sev_get_capabilities();

-    if (!data) {

-        error_setg(errp, "SEV feature is not available");

-        return NULL;

-    }

-

-    return data;

+    return sev_get_capabilities(errp);

 }

diff --git a/target/i386/sev-stub.c b/target/i386/sev-stub.c

index e5ee13309c..88e3f39a1e 100644

--- a/target/i386/sev-stub.c

+++ b/target/i386/sev-stub.c

@@ -44,7 +44,8 @@ char *sev_get_launch_measurement(void)

     return NULL;

 }

-SevCapability *sev_get_capabilities(void)

+SevCapability *sev_get_capabilities(Error **errp)

 {

+    error_setg(errp, "SEV is not available in this QEMU");

     return NULL;

 }

diff --git a/target/i386/sev.c b/target/i386/sev.c

index 024bb24e51..054f2d846a 100644

--- a/target/i386/sev.c

+++ b/target/i386/sev.c

@@ -453,7 +453,7 @@ sev_get_info(void)

 static int

 sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain,

-                 size_t *cert_chain_len)

+                 size_t *cert_chain_len, Error **errp)

 {

     guchar *pdh_data = NULL;

     guchar *cert_chain_data = NULL;

@@ -464,8 +464,8 @@ sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain,

     r = sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err;;

     if (r < 0) {

         if (err != SEV_RET_INVALID_LEN) {

-            error_report("failed to export PDH cert ret=%d fw_err=%d (%s)",

-                         r, err, fw_error_to_str(err));

+            error_setg(errp, "failed to export PDH cert ret=%d fw_err=%d (%s)",

+                       r, err, fw_error_to_str(err));

             return 1;

         }

     }

@@ -477,8 +477,8 @@ sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain,

     r = sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err;;

     if (r < 0) {

-        error_report("failed to export PDH cert ret=%d fw_err=%d (%s)",

-                     r, err, fw_error_to_str(err));

+        error_setg(errp, "failed to export PDH cert ret=%d fw_err=%d (%s)",

+                   r, err, fw_error_to_str(err));

         goto e_free;

     }

@@ -495,7 +495,7 @@ e_free:

 }

 SevCapability *

-sev_get_capabilities(void)

+sev_get_capabilities(Error **errp)

 {

     SevCapability *cap = NULL;

     guchar *pdh_data = NULL;

@@ -506,13 +506,13 @@ sev_get_capabilities(void)

     fd = open(DEFAULT_SEV_DEVICE, O_RDWR);

     if (fd < 0) {

-        error_report("%s: Failed to open %s '%s'", __func__,

-                     DEFAULT_SEV_DEVICE, strerror(errno));

+        error_setg_errno(errp, errno, "Failed to open %s",

+                         DEFAULT_SEV_DEVICE);

         return NULL;

     }

     if (sev_get_pdh_info(fd, &pdh_data, &pdh_len,

-                         &cert_chain_data, &cert_chain_len)) {

+                         &cert_chain_data, &cert_chain_len, errp)) {

         goto out;

     }

diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h

index 8ada9d385d..1e073342ba 100644

--- a/target/i386/sev_i386.h

+++ b/target/i386/sev_i386.h

@@ -38,7 +38,7 @@ extern SevInfo *sev_get_info(void);

 extern uint32_t sev_get_cbit_position(void);

 extern uint32_t sev_get_reduced_phys_bits(void);

 extern char *sev_get_launch_measurement(void);

-extern SevCapability *sev_get_capabilities(void);

+extern SevCapability *sev_get_capabilities(Error **errp);

 typedef struct QSevGuestInfo QSevGuestInfo;

 typedef struct QSevGuestInfoClass QSevGuestInfoClass;

-- 

2.27.0