commit 9083da1d4c9dfff30d411f8c73ea494e9d78de1b
author Markus Armbruster <armbru@redhat.com> Thu Apr 24 15:44:18 2014 +0200
committer Stefan Hajnoczi <stefanha@redhat.com> Fri Apr 25 15:58:07 2014 +0200
tree bd1697a4dc3146b5dfe3f4767d9ec0430dfc75d3
parent 638fb14169ad96cf9bc0dd5f61460daaecee5bb1

net: Don't use error_is_set() to suppress additional errors

Using error_is_set(errp) that way can sweep programming errors under
the carpet when we get called incorrectly with an error set.

qmp_query_rx_filter() breaks its loop when it detects an error.  It
needs to set another error when the loop completes normally.

Return right away instead of merely breaking the loop.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

net/net.c

diff --git a/net/net.c b/net/net.c
index ccb354a..9db4dba 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1045,7 +1045,7 @@
         if (nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC) {
             if (has_name) {
                 error_setg(errp, "net client(%s) isn't a NIC", name);
-                break;
+                return NULL;
             }
             continue;
         }
@@ -1064,7 +1064,7 @@
         } else if (has_name) {
             error_setg(errp, "net client(%s) doesn't support"
                        " rx-filter querying", name);
-            break;
+            return NULL;
         }
 
         if (has_name) {
@@ -1072,7 +1072,7 @@
         }
     }
 
-    if (filter_list == NULL && !error_is_set(errp) && has_name) {
+    if (filter_list == NULL && has_name) {
         error_setg(errp, "invalid net client name: %s", name);
     }