On 10/17/2013 09:10 AM, John Ferlan wrote: > The header definition didn't match the function declaration, so adjusted > header to reflect the definition. > > Found during a Coverity build where STATIC_ANALYSIS is enabled resulting > in the internal.h adding __nonnull__ handling to arguments. > > Commit '6d264c91' added support for the qemuMonitorJSONDrivePivot() and > commit 'fbc3adc9' added a corresponding test which ended up triggering > the build failure which I didn't notice until today! > > Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx> > --- > src/qemu/qemu_monitor_json.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h > index 51cf19c..a1a7548 100644 > --- a/src/qemu/qemu_monitor_json.h > +++ b/src/qemu/qemu_monitor_json.h > @@ -250,7 +250,7 @@ int qemuMonitorJSONDrivePivot(qemuMonitorPtr mon, > const char *device, > const char *file, > const char *format) > - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); > + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); Hmm. The 'file' argument is marked ATTRIBUTE_UNUSED upstream, but actually used downstream in RHEL 6 where it targets a different downstream-only QMP command. But as we don't need to cater to downstream-only usage, I'm fine with this. ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list