[libvirt] [PATCH] Fix mistakes in checking return values

Daniel P. Berrange berrange at redhat.com
Mon Mar 17 15:49:11 UTC 2014


Thre was a syntax error in checking virRegisterStateDriver in
the remote driver, and bogus checking of a void return type
of virDomainConfNWFilterRegister in nwfilter.

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 src/nwfilter/nwfilter_driver.c | 3 +--
 src/remote/remote_driver.c     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

Pushed as a build break fix.

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 228794d..8ce2b7d 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -720,7 +720,6 @@ int nwfilterRegister(void) {
         return -1;
     if (virRegisterStateDriver(&stateDriver) < 0)
         return -1;
-    if (virDomainConfNWFilterRegister(&domainNWFilterDriver) < 0)
-        return -1;
+    virDomainConfNWFilterRegister(&domainNWFilterDriver);
     return 0;
 }
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index c9711bb..e85f34d 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -7840,7 +7840,7 @@ remoteRegister(void)
     if (virRegisterNWFilterDriver(&nwfilter_driver) < 0)
         return -1;
 #ifdef WITH_LIBVIRTD
-    if (virRegisterStateDriver(&state_driver) == -1) < 0)
+    if (virRegisterStateDriver(&state_driver) < 0)
         return -1;
 #endif
 
-- 
1.8.5.3




More information about the libvir-list mailing list