From: John Ferlan <jferlan@redhat.com>
Date: Tue, 21 Mar 2017 18:32:01 +0000 (-0400)
Subject: util: Remove NONNULL(1) for virHostdevPrepareDomainDevices
X-Git-Tag: v3.2.0-rc1~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40f2a476d111d72da772e49283a84110e6c61d2b;p=thirdparty%2Flibvirt.git

util: Remove NONNULL(1) for virHostdevPrepareDomainDevices

Since the code checks 'mgr == NULL' anyway, no need for the prototype
to have the NONNULL arg check.  Also add an error message to indicate what
the failure is so that there isn't a failed for some reason error.

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

diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index fc0ebcb394..a75d108f73 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -1873,8 +1873,11 @@ virHostdevPrepareDomainDevices(virHostdevManagerPtr mgr,
     if (!def->nhostdevs)
         return 0;
 
-    if (mgr == NULL)
+    if (!mgr) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("no host device manager defined"));
         return -1;
+    }
 
     if (flags & VIR_HOSTDEV_SP_PCI) {
         if (virHostdevPreparePCIDevices(mgr, driver,
diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h
index 43ba705b0f..7ee0b43331 100644
--- a/src/util/virhostdev.h
+++ b/src/util/virhostdev.h
@@ -157,7 +157,7 @@ virHostdevPrepareDomainDevices(virHostdevManagerPtr mgr,
                                const char *driver,
                                virDomainDefPtr def,
                                unsigned int flags)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
+    ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 void
 virHostdevReAttachDomainDevices(virHostdevManagerPtr mgr,
                                 const char *driver,