util: Remove NONNULL(2,3) for virHostdevReAttachSCSIVHostDevices

The comparison code used STREQ_NULLABLE anyway for both 'drv_name' and
'dom_name', so no need. Add a NULLSTR on the 'dom_name' too.

Signed-off-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index c424a970f7ab3f2d1bff4ce7e4734fdb850cca4b..fc0ebcb39443f1dc713550626ec91a10f446489e 100644 (file)
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -1756,7 +1756,7 @@ virHostdevReAttachSCSIVHostDevices(virHostdevManagerPtr mgr,
 
         if (!(host = virSCSIVHostDeviceNew(hostsrc->wwpn))) {
             VIR_WARN("Unable to reattach SCSI_host device %s on domain %s",
-                     hostsrc->wwpn, dom_name);
+                     hostsrc->wwpn, NULLSTR(dom_name));
             virObjectUnlock(mgr->activeSCSIVHostHostdevs);
             return;
         }

diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h
index 76039bb60024ab7c63bd96bcf1a1371ce02a29b6..43ba705b0f881b674d69483aad8f90e58e8dcc29 100644 (file)
--- a/src/util/virhostdev.h
+++ b/src/util/virhostdev.h
@@ -124,7 +124,7 @@ virHostdevReAttachSCSIVHostDevices(virHostdevManagerPtr hostdev_mgr,
                                    const char *dom_name,
                                    virDomainHostdevDefPtr *hostdevs,
                                    int nhostdevs)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
+    ATTRIBUTE_NONNULL(1);
 int
 virHostdevUpdateActivePCIDevices(virHostdevManagerPtr mgr,
                                  virDomainHostdevDefPtr *hostdevs,