From d94a3cfcfb8b01b6af538a4832e4c74cbc95c728 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Tue, 16 Apr 2013 07:17:00 -0400 Subject: [PATCH] Fix build breaker with ATTRIBUTE_NONNULL defs Using "./autogen.sh --system lv_cv_static_analysis=yes" for my daily Coverity builds resulted in the following error when building: In file included from util/vircgrouppriv.h:32:0, from util/vircgroup.c:44: util/vircgroup.h:59:5: error: nonnull argument with out-of-range operand number (argument 1, operand 5) util/vircgroup.h:74:5: error: nonnull argument references non-pointer operand (argument 1, operand 4) make[3]: *** [libvirt_util_la-vircgroup.lo] Error 1 make[3]: Leaving directory `/home/jferlan/libvirt.cov.curr/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/jferlan/libvirt.cov.curr/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.cov.curr' make: *** [all] Error 2 --- src/util/vircgroup.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index f324fa3191..b030e4ab68 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -56,7 +56,7 @@ int virCgroupNewDriver(const char *name, bool create, int controllers, virCgroupPtr *group) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(5); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); int virCgroupNewSelf(virCgroupPtr *group) ATTRIBUTE_NONNULL(1); @@ -71,7 +71,7 @@ int virCgroupNewDomainPartition(virCgroupPtr partition, const char *name, bool create, virCgroupPtr *group) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); int virCgroupNewVcpu(virCgroupPtr domain, int vcpuid,