From 47dcce2f083ab82448fa66d9ae60dd59b19b6c75 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Wed, 22 Mar 2017 07:23:46 -0400 Subject: [PATCH] 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 --- src/util/virhostdev.c | 2 +- src/util/virhostdev.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index c424a970f7..fc0ebcb394 100644 --- 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 76039bb600..43ba705b0f 100644 --- 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, -- GitLab