NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: Remove ATTRIBUTE_NONNULL for virDomainQemuMonitorEventNew

Browse Source 
Commit 17561eb36 modified the logic to check "if (!event)" for an
attribute that was not supposed to be passed as NULL.  This causes
the static checker/Coverity build to fail. Since the check is made,
alter the header.

Also add an error message since returning -1 without some sort of
error message as previously would have happened with the failed
VIR_STRDUP so that the eventual error doesn't get the default
for some reason message.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
John Ferlan 2019-11-03 07:12:58 -05:00
parent 18a1ce77b6
commit d343e8203d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_event.c
View File

@ -1935,8 +1935,12 @@ virDomainQemuMonitorEventNew(int id,
return NULL; return NULL;
/* event is mandatory, details are optional */ /* event is mandatory, details are optional */
if (!event) if (!event) {
virReportError(VIR_ERR_INVALID_ARG,
_("unexpected event=NULL name=%s uuid=%s details=%s"),
name, uuidstr, NULLSTR(details));
goto error; goto error;
}
ev->event = g_strdup(event); ev->event = g_strdup(event);
ev->seconds = seconds; ev->seconds = seconds;

2
src/conf/domain_event.h
View File

@ -321,4 +321,4 @@ virDomainQemuMonitorEventNew(int id,
long long seconds, long long seconds,
unsigned int micros, unsigned int micros,
const char *details) const char *details)
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);