]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: remove NULL check from virDomainQemuMonitorEventNew
authorJán Tomko <jtomko@redhat.com>
Mon, 11 Nov 2019 09:21:03 +0000 (10:21 +0100)
committerJán Tomko <jtomko@redhat.com>
Thu, 21 Nov 2019 11:44:23 +0000 (12:44 +0100)
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>
src/conf/domain_event.c
src/conf/domain_event.h

index 900d8f745e710de711fff4f3112865038d0472ad..33fbf1040627fc36260841c9013276306fdc2cbb 100644 (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;
 }
 
 
index 0a4bce3d04a781974f50ba2291331cc68dc6277f..d1cfb81d62d6bfe1235cb894c97e4afdbdfd8794 100644 (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);