diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 4ad2a53779..a049c47ea7 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1390,7 +1390,8 @@ sc_prohibit_inline_functions: # glib's G_REGEX_OPTIMIZE instructs the PCRE library to use JIT optimization # of the regexes, which requires executable memory to work. Security mechanisms # such as SELinux may disallow it. glib gracefully falls back to un-optimized -# code. This check serves as a warning to not rely on G_REGEX_OPTIMIZE: +# code. This check serves as a warning to not rely on G_REGEX_OPTIMIZE. +# Currently we avoid use of G_REGEX_OPTIMIZE anywhere. sc_G_REGEX_OPTIMIZE: @prohibit='G_REGEX_OPTIMIZE' \ exclude='see sc_G_REGEX_OPTIMIZE' \ diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 434401a5ef..1d9796a1aa 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -2643,7 +2643,7 @@ virDomainQemuMonitorEventStateRegisterID(virConnectPtr conn, data->flags = flags; if (event && flags != -1) { if (flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX) { - int cflags = G_REGEX_OPTIMIZE; /* see sc_G_REGEX_OPTIMIZE */ + int cflags = 0; g_autoptr(GError) err = NULL; if (flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_NOCASE) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 84d4d9c218..984481c613 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -3270,7 +3270,7 @@ virCommandRunRegex(virCommand *cmd, for (i = 0; i < nregex; i++) { g_autoptr(GError) err = NULL; - reg[i] = g_regex_new(regex[i], G_REGEX_OPTIMIZE, 0, &err); /* see sc_G_REGEX_OPTIMIZE */ + reg[i] = g_regex_new(regex[i], 0, 0, &err); if (!reg[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to compile regex %1$s"), err->message); diff --git a/src/util/virlog.c b/src/util/virlog.c index 8a6cb939bc..7e767e8424 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -253,7 +253,7 @@ virLogOnceInit(void) virLogLock(); virLogDefaultPriority = VIR_LOG_DEFAULT; - virLogRegex = g_regex_new(VIR_LOG_REGEX, G_REGEX_OPTIMIZE, 0, NULL); /* see sc_G_REGEX_OPTIMIZE */ + virLogRegex = g_regex_new(VIR_LOG_REGEX, 0, 0, NULL); /* GLib caches the hostname using a one time thread initializer. * We want to prime this cache early though, because at later time