util: drop logging filter/output flags

With the removal of support for log message stack traces, there is
nothing using the logging filter/output flags and they can be removed.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/util/virlog.c b/src/util/virlog.c
index 2a745fca753c5c2d2c551adc66bf5a29a4c0e233..2ce094f6aaad50dbb1bb79bff7c0fb7aa39f69d5 100644 (file)
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -87,7 +87,6 @@ VIR_ENUM_IMPL(virLogDestination,
 struct _virLogFilter {
     char *match;
     virLogPriority priority;
-    unsigned int flags; /* bitwise OR of virLogFilterFlags */
 };
 
 static int virLogFiltersSerial = 1;
@@ -126,7 +125,6 @@ static void virLogOutputToFd(virLogSourcePtr src,
                              const char *funcname,
                              const char *timestamp,
                              virLogMetadataPtr metadata,
-                             unsigned int flags,
                              const char *rawstr,
                              const char *str,
                              void *data);
@@ -509,19 +507,16 @@ virLogSourceUpdate(virLogSourcePtr source)
     virLogLock();
     if (source->serial < virLogFiltersSerial) {
         unsigned int priority = virLogDefaultPriority;
-        unsigned int flags = 0;
         size_t i;
 
         for (i = 0; i < virLogNbFilters; i++) {
             if (fnmatch(virLogFilters[i]->match, source->name, 0) == 0) {
                 priority = virLogFilters[i]->priority;
-                flags = virLogFilters[i]->flags;
                 break;
             }
         }
 
         source->priority = priority;
-        source->flags = flags;
         source->serial = virLogFiltersSerial;
     }
     virLogUnlock();
@@ -590,7 +585,6 @@ virLogVMessage(virLogSourcePtr source,
     int ret;
     size_t i;
     int saved_errno = errno;
-    unsigned int filterflags = 0;
 
     if (virLogInitialize() < 0)
         return;
@@ -610,7 +604,6 @@ virLogVMessage(virLogSourcePtr source,
         virLogSourceUpdate(source);
     if (priority < source->priority)
         goto cleanup;
-    filterflags = source->flags;
 
     /*
      * serialize the error message, add level and timestamp
@@ -640,13 +633,13 @@ virLogVMessage(virLogSourcePtr source,
                 if (virLogVersionString(&rawinitmsg, &initmsg) >= 0)
                     virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO,
                                         __FILE__, __LINE__, __func__,
-                                        timestamp, NULL, 0, rawinitmsg, initmsg,
+                                        timestamp, NULL, rawinitmsg, initmsg,
                                         virLogOutputs[i]->data);
                 VIR_FREE(initmsg);
                 if (virLogHostnameString(&hoststr, &initmsg) >= 0)
                     virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO,
                                         __FILE__, __LINE__, __func__,
-                                        timestamp, NULL, 0, hoststr, initmsg,
+                                        timestamp, NULL, hoststr, initmsg,
                                         virLogOutputs[i]->data);
                 VIR_FREE(hoststr);
                 VIR_FREE(initmsg);
@@ -654,7 +647,7 @@ virLogVMessage(virLogSourcePtr source,
             }
             virLogOutputs[i]->f(source, priority,
                                 filename, linenr, funcname,
-                                timestamp, metadata, filterflags,
+                                timestamp, metadata,
                                 str, msg, virLogOutputs[i]->data);
         }
     }
@@ -666,13 +659,13 @@ virLogVMessage(virLogSourcePtr source,
             if (virLogVersionString(&rawinitmsg, &initmsg) >= 0)
                 virLogOutputToFd(&virLogSelf, VIR_LOG_INFO,
                                  __FILE__, __LINE__, __func__,
-                                 timestamp, NULL, 0, rawinitmsg, initmsg,
+                                 timestamp, NULL, rawinitmsg, initmsg,
                                  (void *) STDERR_FILENO);
             VIR_FREE(initmsg);
             if (virLogHostnameString(&hoststr, &initmsg) >= 0)
                 virLogOutputToFd(&virLogSelf, VIR_LOG_INFO,
                                  __FILE__, __LINE__, __func__,
-                                 timestamp, NULL, 0, hoststr, initmsg,
+                                 timestamp, NULL, hoststr, initmsg,
                                  (void *) STDERR_FILENO);
             VIR_FREE(hoststr);
             VIR_FREE(initmsg);
@@ -680,7 +673,7 @@ virLogVMessage(virLogSourcePtr source,
         }
         virLogOutputToFd(source, priority,
                          filename, linenr, funcname,
-                         timestamp, metadata, filterflags,
+                         timestamp, metadata,
                          str, msg, (void *) STDERR_FILENO);
     }
     virLogUnlock();
@@ -700,7 +693,6 @@ virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED,
                  const char *funcname G_GNUC_UNUSED,
                  const char *timestamp,
                  virLogMetadataPtr metadata G_GNUC_UNUSED,
-                 unsigned int flags,
                  const char *rawstr G_GNUC_UNUSED,
                  const char *str,
                  void *data)
@@ -708,8 +700,6 @@ virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED,
     int fd = (intptr_t) data;
     char *msg;
 
-    virCheckFlags(0,);
-
     if (fd < 0)
         return;
 
@@ -805,13 +795,10 @@ virLogOutputToSyslog(virLogSourcePtr source G_GNUC_UNUSED,
                      const char *funcname G_GNUC_UNUSED,
                      const char *timestamp G_GNUC_UNUSED,
                      virLogMetadataPtr metadata G_GNUC_UNUSED,
-                     unsigned int flags,
                      const char *rawstr G_GNUC_UNUSED,
                      const char *str,
                      void *data G_GNUC_UNUSED)
 {
-    virCheckFlags(0,);
-
     syslog(virLogPrioritySyslog(priority), "%s", str);
 }
 
@@ -953,12 +940,10 @@ virLogOutputToJournald(virLogSourcePtr source,
                        const char *funcname,
                        const char *timestamp G_GNUC_UNUSED,
                        virLogMetadataPtr metadata,
-                       unsigned int flags,
                        const char *rawstr,
                        const char *str G_GNUC_UNUSED,
                        void *data)
 {
-    virCheckFlags(0,);
     int buffd = -1;
     int journalfd = (intptr_t) data;
     struct msghdr mh;
@@ -1371,7 +1356,6 @@ virLogOutputNew(virLogOutputFunc f,
  * virLogFilterNew:
  * @match: the pattern to match
  * @priority: the priority to give to messages matching the pattern
- * @flags: extra flags, see virLogFilterFlags enum
  *
  * Allocates and returns a new log filter object. The object has to be later
  * defined, so that the pattern will be taken into account when executing the
@@ -1385,15 +1369,12 @@ virLogOutputNew(virLogOutputFunc f,
  */
 virLogFilterPtr
 virLogFilterNew(const char *match,
-                virLogPriority priority,
-                unsigned int flags)
+                virLogPriority priority)
 {
     virLogFilterPtr ret = NULL;
     char *mdup = NULL;
     size_t mlen = strlen(match);
 
-    virCheckFlags(0, NULL);
-
     if (priority < VIR_LOG_DEBUG || priority > VIR_LOG_ERROR) {
         virReportError(VIR_ERR_INVALID_ARG, _("Invalid log priority %d"),
                        priority);
@@ -1417,7 +1398,6 @@ virLogFilterNew(const char *match,
 
     ret->match = mdup;
     ret->priority = priority;
-    ret->flags = flags;
 
     return ret;
 }
@@ -1662,7 +1642,6 @@ virLogParseFilter(const char *src)
     size_t count = 0;
     virLogPriority prio;
     char **tokens = NULL;
-    unsigned int flags = 0;
     char *match = NULL;
 
     VIR_DEBUG("filter=%s", src);
@@ -1698,7 +1677,7 @@ virLogParseFilter(const char *src)
         goto cleanup;
     }
 
-    if (!(ret = virLogFilterNew(match, prio, flags)))
+    if (!(ret = virLogFilterNew(match, prio)))
         goto cleanup;
 
  cleanup:

diff --git a/src/util/virlog.h b/src/util/virlog.h
index 9d9461f339151ffd32f4fbc9b4d0272497dfd9cc..8846fae9aa8ae026403e45e8142a384846738d26 100644 (file)
--- a/src/util/virlog.h
+++ b/src/util/virlog.h
@@ -64,7 +64,6 @@ struct _virLogSource {
     const char *name;
     unsigned int priority;
     unsigned int serial;
-    unsigned int flags;
 };
 
 /*
@@ -77,7 +76,6 @@ struct _virLogSource {
         .name = "" n "", \
         .priority = VIR_LOG_ERROR, \
         .serial = 0, \
-        .flags = 0, \
     }
 
 /*
@@ -144,7 +142,6 @@ typedef virLogFilter *virLogFilterPtr;
  * @funcname: the function emitting the message
  * @timestamp: zero terminated string with timestamp of the message
  * @metadata: NULL or metadata array, terminated by an item with NULL key
- * @flags: flags associated with the message
  * @rawstr: the unformatted message to log, zero terminated
  * @str: the message to log, preformatted and zero terminated
  * @data: extra output logging data
@@ -158,7 +155,6 @@ typedef void (*virLogOutputFunc) (virLogSourcePtr src,
                                   const char *funcname,
                                   const char *timestamp,
                                   virLogMetadataPtr metadata,
-                                  unsigned int flags,
                                   const char *rawstr,
                                   const char *str,
                                   void *data);
@@ -171,10 +167,6 @@ typedef void (*virLogOutputFunc) (virLogSourcePtr src,
  */
 typedef void (*virLogCloseFunc) (void *data);
 
-typedef enum {
-    VIR_LOG_STACK_TRACE = (1 << 0),
-} virLogFilterFlags;
-
 int virLogGetNbFilters(void);
 int virLogGetNbOutputs(void);
 char *virLogGetFilters(void);
@@ -224,8 +216,7 @@ virLogOutputPtr virLogOutputNew(virLogOutputFunc f,
                                 virLogDestination dest,
                                 const char *name) ATTRIBUTE_NONNULL(1);
 virLogFilterPtr virLogFilterNew(const char *match,
-                                virLogPriority priority,
-                                unsigned int flags) ATTRIBUTE_NONNULL(1);
+                                virLogPriority priority) ATTRIBUTE_NONNULL(1);
 int virLogFindOutput(virLogOutputPtr *outputs, size_t noutputs,
                      virLogDestination dest, const void *opaque);
 int virLogDefineOutputs(virLogOutputPtr *outputs,

diff --git a/tests/testutils.c b/tests/testutils.c
index 3a8e3142b4acd967ffaf7d80d06697af121e2bc8..15fe561c6bc9061fec1034224fe3b739e47a6fe6 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -740,13 +740,11 @@ virtTestLogOutput(virLogSourcePtr source G_GNUC_UNUSED,
                   const char *funcname G_GNUC_UNUSED,
                   const char *timestamp,
                   virLogMetadataPtr metadata G_GNUC_UNUSED,
-                  unsigned int flags,
                   const char *rawstr G_GNUC_UNUSED,
                   const char *str,
                   void *data)
 {
     struct virtTestLogData *log = data;
-    virCheckFlags(0,);
     virBufferAsprintf(&log->buf, "%s: %s", timestamp, str);
 }