[libvirt PATCH 1/4] remote: Propagate error from virDomainGetSecurityLabelList via RPC

[Jiri Denemark]

The daemon side of this API has been broken ever since the API was
introduced in 2012. Instead of sending the error from
virDomainGetSecurityLabelList via RPC so that the client can see it, the
dispatcher would just send a successful reply with return value set to
-1 (and an empty array of labels). The client side would propagate this
return value so the client can see the API failed, but the original
error would be lost.

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/remote/remote_daemon_dispatch.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index 6c56e9ec3e..4d993afee6 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -2637,13 +2637,11 @@ remoteDispatchDomainGetSecurityLabelList(virNetServer *server G_GNUC_UNUSED,
     if (!(dom = get_nonnull_domain(conn, args->dom)))
         goto cleanup;
 
-    if ((len = virDomainGetSecurityLabelList(dom, &seclabels)) < 0) {
-        ret->ret = len;
-        ret->labels.labels_len = 0;
-        ret->labels.labels_val = NULL;
-        goto done;
-    }
+    if ((len = virDomainGetSecurityLabelList(dom, &seclabels)) < 0)
+        goto cleanup;
 
+    ret->ret = len;
+    ret->labels.labels_len = len;
     ret->labels.labels_val = g_new0(remote_domain_get_security_label_ret, len);
 
     for (i = 0; i < len; i++) {
@@ -2653,9 +2651,7 @@ remoteDispatchDomainGetSecurityLabelList(virNetServer *server G_GNUC_UNUSED,
         cur->label.label_len = label_len;
         cur->enforcing = seclabels[i].enforcing;
     }
-    ret->labels.labels_len = ret->ret = len;
 
- done:
     rv = 0;
 
  cleanup:
-- 
2.39.1