]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Check return status for virDomainGraphicsListenSetAddress
authorJohn Ferlan <jferlan@redhat.com>
Tue, 9 Feb 2016 11:24:33 +0000 (06:24 -0500)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 10 Feb 2016 20:18:54 +0000 (15:18 -0500)
Recent refactors in the vbox code to check the return status for the
function tipped Coverity's scales of justice for any functions that
do not check status - such as this one.

While I'm at it, since the call is essentially the same other than
whether starting from val or val+1 when val[0] = '[', just adjust
the val pointer by one and have one call instead of two.

Additionally, the call to virDomainGraphicsListenGetAddress is redundant
since it checking that the address field got filled.  It's a leftover
from the strndup -> ListenSetAddress conversion (commit id 'ef79fb5b5')

Signed-off-by: John Ferlan <jferlan@redhat.com>
src/qemu/qemu_command.c

index d09a0638ae4ffd42d51d5c10bc8a3402ae283547..a723e2aed83bece44e3ba821fc8000dea61746cf 100644 (file)
@@ -11920,12 +11920,8 @@ qemuParseCommandLineVnc(virDomainDefPtr def,
             goto cleanup;
         }
         if (val[0] == '[')
-            virDomainGraphicsListenSetAddress(vnc, 0,
-                                              val+1, tmp-(val+1), true);
-        else
-            virDomainGraphicsListenSetAddress(vnc, 0,
-                                              val, tmp-val, true);
-        if (!virDomainGraphicsListenGetAddress(vnc, 0))
+            val++;
+        if (virDomainGraphicsListenSetAddress(vnc, 0, val, tmp-val, true) < 0)
             goto cleanup;
 
         if (*opts == ',') {