External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: remove NULL check from virDomainQemuMonitorEventNew

Browse Source 
The qemu_domain_monitor_event_msg struct in qemu_protocol.x
defines event as a nonnull_string and qemuMonitorJSONIOProcessEvent
also errors out on a non-NULL event.

Drop the check to fix the build with static analysis.

This essentially reverts commit d343e8203d248635f5e7a0d86dd077f74d49e3af

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2019-11-11 10:21:03 +01:00
parent 7611a1ef00
commit 5e067ba4e1
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/domain_event.c
View File

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

2
src/conf/domain_event.h
View File

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