From: John Ferlan <jferlan@redhat.com>
Date: Thu, 12 Jul 2018 19:41:32 +0000 (-0400)
Subject: qemu: Fix ATTRIBUTE_NONNULL for qemuMonitorAddObject
X-Git-Tag: v4.6.0-rc1~250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7406ab691ffe0fbe051f6ae57614737e193df6a5;p=thirdparty%2Flibvirt.git

qemu: Fix ATTRIBUTE_NONNULL for qemuMonitorAddObject

Commit id fac0dacd was trying to make things more robust;
however, the ATTRIBUTE_NONNULL(1) would be for the @mon,
not the intended (2) and the @props argument as described
in the commit message.

Found by Coverity build.

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

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index e8ed2d044c..81474a04f6 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -824,7 +824,7 @@ int qemuMonitorCreateObjectProps(virJSONValuePtr *propsret,
 int qemuMonitorAddObject(qemuMonitorPtr mon,
                          virJSONValuePtr *props,
                          char **alias)
-    ATTRIBUTE_NONNULL(1);
+    ATTRIBUTE_NONNULL(2);
 
 int qemuMonitorDelObject(qemuMonitorPtr mon,
                          const char *objalias);