34b321
From 9c2a6798c053cec989e02935e810a0d239fb493c Mon Sep 17 00:00:00 2001
34b321
From: Vlad Yasevich <vyasevic@redhat.com>
34b321
Date: Wed, 16 Dec 2015 02:59:35 +0100
34b321
Subject: [PATCH 1/2] net: Make qmp_query_rx_filter() with name argument more
34b321
 obvious
34b321
34b321
RH-Author: Vlad Yasevich <vyasevic@redhat.com>
34b321
Message-id: <1450234776-7779-2-git-send-email-vyasevic@redhat.com>
34b321
Patchwork-id: 68620
34b321
O-Subject: [RHEL7.3 qemu-kvm PATCH 1/2] net: Make qmp_query_rx_filter() with name argument more obvious
34b321
Bugzilla: 1269738
34b321
RH-Acked-by: Thomas Huth <thuth@redhat.com>
34b321
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
34b321
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
34b321
34b321
From: Markus Armbruster <armbru@redhat.com>
34b321
34b321
With a client name, the QMP command is specified to return a list of
34b321
one element.  This isn't locally obvious in the code.  Make it so.
34b321
34b321
Signed-off-by: Markus Armbruster <armbru@redhat.com>
34b321
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
34b321
(cherry picked from commit 638fb14169ad96cf9bc0dd5f61460daaecee5bb1)
34b321
Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
34b321
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
34b321
---
34b321
 net/net.c | 4 ++++
34b321
 1 file changed, 4 insertions(+)
34b321
34b321
diff --git a/net/net.c b/net/net.c
34b321
index a8c49fc..0be50a0 100644
34b321
--- a/net/net.c
34b321
+++ b/net/net.c
34b321
@@ -1000,6 +1000,10 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,
34b321
                        " rx-filter querying", name);
34b321
             break;
34b321
         }
34b321
+
34b321
+        if (has_name) {
34b321
+            break;
34b321
+        }
34b321
     }
34b321
 
34b321
     if (filter_list == NULL && !error_is_set(errp) && has_name) {
34b321
-- 
34b321
1.8.3.1
34b321