[libvirt] [PATCH 4/9] virhostdevtest: Check for integer retval in more verbose way

Michal Privoznik mprivozn at redhat.com
Mon Aug 12 11:54:20 UTC 2019


From: Michal Privoznik <miso.privoznik at gmail.com>

There are few functions called from the test which return an
integer but their retval is compared as if it was a pointer.
Now, there is nothing wrong with that from machine POV, but
from readability perspective it's wrong.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tests/virhostdevtest.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c
index 20984f3442..2c65db2068 100644
--- a/tests/virhostdevtest.c
+++ b/tests/virhostdevtest.c
@@ -161,22 +161,22 @@ testVirHostdevPreparePCIHostdevs_unmanaged(void)
     active_count = virPCIDeviceListCount(mgr->activePCIHostdevs);
     inactive_count = virPCIDeviceListCount(mgr->inactivePCIHostdevs);
     VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again");
-    if (!virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid,
-                                     &hostdevs[0], 1, 0))
+    if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid,
+                                    &hostdevs[0], 1, 0) == 0)
         goto cleanup;
     CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, active_count);
     CHECK_PCI_LIST_COUNT(mgr->inactivePCIHostdevs, inactive_count);
 
     VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again");
-    if (!virHostdevPreparePCIDevices(mgr, drv_name, "test_domain1", uuid,
-                                     &hostdevs[1], 1, 0))
+    if (virHostdevPreparePCIDevices(mgr, drv_name, "test_domain1", uuid,
+                                    &hostdevs[1], 1, 0) == 0)
         goto cleanup;
     CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, active_count);
     CHECK_PCI_LIST_COUNT(mgr->inactivePCIHostdevs, inactive_count);
 
     VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again");
-    if (!virHostdevPreparePCIDevices(mgr, "test_driver1", dom_name, uuid,
-                                     &hostdevs[2], 1, 0))
+    if (virHostdevPreparePCIDevices(mgr, "test_driver1", dom_name, uuid,
+                                    &hostdevs[2], 1, 0) == 0)
         goto cleanup;
     CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, active_count);
     CHECK_PCI_LIST_COUNT(mgr->inactivePCIHostdevs, inactive_count);
@@ -252,22 +252,22 @@ testVirHostdevPreparePCIHostdevs_managed(bool mixed)
     active_count = virPCIDeviceListCount(mgr->activePCIHostdevs);
     inactive_count = virPCIDeviceListCount(mgr->inactivePCIHostdevs);
     VIR_DEBUG("Test: prepare same hostdevs for same driver/domain again");
-    if (!virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid,
-                                      &hostdevs[0], 1, 0))
+    if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid,
+                                    &hostdevs[0], 1, 0) == 0)
         goto cleanup;
     CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, active_count);
     CHECK_PCI_LIST_COUNT(mgr->inactivePCIHostdevs, inactive_count);
 
     VIR_DEBUG("Test: prepare same hostdevs for same driver, diff domain again");
-    if (!virHostdevPreparePCIDevices(mgr, drv_name, "test_domain1", uuid,
-                                      &hostdevs[1], 1, 0))
+    if (virHostdevPreparePCIDevices(mgr, drv_name, "test_domain1", uuid,
+                                    &hostdevs[1], 1, 0) == 0)
         goto cleanup;
     CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, active_count);
     CHECK_PCI_LIST_COUNT(mgr->inactivePCIHostdevs, inactive_count);
 
     VIR_DEBUG("Test: prepare same hostdevs for diff driver/domain again");
-    if (!virHostdevPreparePCIDevices(mgr, "test_driver1", dom_name, uuid,
-                                      &hostdevs[2], 1, 0))
+    if (virHostdevPreparePCIDevices(mgr, "test_driver1", dom_name, uuid,
+                                    &hostdevs[2], 1, 0) == 0)
         goto cleanup;
     CHECK_PCI_LIST_COUNT(mgr->activePCIHostdevs, active_count);
     CHECK_PCI_LIST_COUNT(mgr->inactivePCIHostdevs, inactive_count);
-- 
2.21.0




More information about the libvir-list mailing list