rpc: Change return type of virNetClientAddStream to void

This function return value is invariant since VIR_EXPAND_N check
removal in 7d2fd6e, so change its type and remove all dependent checks.

Found by Linux Verification Center (linuxtesting.org) with Svace.

Reported-by: Pavel Nekrasov <p.nekrasov@fobos-nt.ru>
Signed-off-by: Alexander Kuznetsov <kuznetsovam@altlinux.org>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 4a16b8ef1de3aeb0683a51331d586c9e4de04a3a..307f9ca9450b966988d47ecfd65065f1b59c315e 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -5663,10 +5663,7 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn,
                                         false)))
         return -1;
 
-    if (virNetClientAddStream(priv->client, netst) < 0) {
-        virObjectUnref(netst);
-        return -1;
-    }
+    virNetClientAddStream(priv->client, netst);
 
     st->driver = &remoteStreamDrv;
     st->privateData = netst;
@@ -6432,10 +6429,7 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr dconn,
                                         false)))
         goto cleanup;
 
-    if (virNetClientAddStream(priv->client, netst) < 0) {
-        virObjectUnref(netst);
-        goto cleanup;
-    }
+    virNetClientAddStream(priv->client, netst);
 
     st->driver = &remoteStreamDrv;
     st->privateData = netst;

diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index c5842dc79627502a8261c68e3e199e346ad101f4..724a6aed6e33d4c1fc64164aff223e44da4d9405 100755 (executable)
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -1822,10 +1822,7 @@ elsif ($mode eq "client") {
             print "    if (!(netst = virNetClientStreamNew(priv->remoteProgram, $call->{constname}, priv->counter, sparse)))\n";
             print "        goto cleanup;\n";
             print "\n";
-            print "    if (virNetClientAddStream(priv->client, netst) < 0) {\n";
-            print "        virObjectUnref(netst);\n";
-            print "        goto cleanup;\n";
-            print "    }";
+            print "    virNetClientAddStream(priv->client, netst);\n";
             print "\n";
             print "    st->driver = &remoteStreamDrv;\n";
             print "    st->privateData = netst;\n";

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 62d2368c9aeb9b625b697881e86ea3f59842cd25..92933220e2b5602522d090c2c059e9f81af37e88 100644 (file)
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -1065,8 +1065,8 @@ void virNetClientAddProgram(virNetClient *client,
 }
 
 
-int virNetClientAddStream(virNetClient *client,
-                          virNetClientStream *st)
+void virNetClientAddStream(virNetClient *client,
+                           virNetClientStream *st)
 {
     virObjectLock(client);
 
@@ -1074,7 +1074,6 @@ int virNetClientAddStream(virNetClient *client,
     client->streams[client->nstreams-1] = virObjectRef(st);
 
     virObjectUnlock(client);
-    return 0;
 }
 
 

diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index ade3f8babebcfde9ce76d4d5e38ffad63ade9f00..d21dd089d8f892253d611d3179508cffaecc22a0 100644 (file)
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -120,8 +120,8 @@ bool virNetClientHasPassFD(virNetClient *client);
 void virNetClientAddProgram(virNetClient *client,
                             virNetClientProgram *prog);
 
-int virNetClientAddStream(virNetClient *client,
-                          virNetClientStream *st);
+void virNetClientAddStream(virNetClient *client,
+                           virNetClientStream *st);
 
 void virNetClientRemoveStream(virNetClient *client,
                               virNetClientStream *st);