Falling back to qemu-trivial, hope that's okay. Markus Armbruster <arm...@redhat.com> writes:
> Ping? > > Markus Armbruster <arm...@redhat.com> writes: > >> Since we now require GLib 2.22+ (commit f40685c), we don't have to >> work around lack of g_strcmp0() anymore. >> >> This reverts commit 8f4774789947bc4bc4c8d026a289fe980d3d2ee1. >> >> Conflicts: >> qemu-ga.c >> >> Signed-off-by: Markus Armbruster <arm...@redhat.com> >> --- >> qga/main.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/qga/main.c b/qga/main.c >> index 9939a2b..0b788e1 100644 >> --- a/qga/main.c >> +++ b/qga/main.c >> @@ -274,7 +274,7 @@ static void ga_log(const gchar *domain, GLogLevelFlags >> level, >> >> level &= G_LOG_LEVEL_MASK; >> #ifndef _WIN32 >> - if (domain && strcmp(domain, "syslog") == 0) { >> + if (g_strcmp0(domain, "syslog") == 0) { >> syslog(LOG_INFO, "%s: %s", level_str, msg); >> } else if (level & s->log_level) { >> #else