[libvirt] [PATCH 12/22] util: Remove NONNULL(2, 3) for virHostdevReAttachUSBDevices
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(a)redhat.com>
---
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 86ca8e0..c424a97 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -1624,7 +1624,7 @@ virHostdevReAttachUSBDevices(virHostdevManagerPtr mgr,
if (!(usb = virUSBDeviceNew(usbsrc->bus, usbsrc->device, NULL))) {
VIR_WARN("Unable to reattach USB device %03d.%03d on domain %s",
- usbsrc->bus, usbsrc->device, dom_name);
+ usbsrc->bus, usbsrc->device, NULLSTR(dom_name));
continue;
}
diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h
index 4ce5c4d..76039bb 100644
--- a/src/util/virhostdev.h
+++ b/src/util/virhostdev.h
@@ -110,7 +110,7 @@ virHostdevReAttachUSBDevices(virHostdevManagerPtr hostdev_mgr,
const char *dom_name,
virDomainHostdevDefPtr *hostdevs,
int nhostdevs)
- ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
+ ATTRIBUTE_NONNULL(1);
void
virHostdevReAttachSCSIDevices(virHostdevManagerPtr hostdev_mgr,
const char *drv_name,
--
2.9.3