From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCeq6-0006Eo-LA for qemu-devel@nongnu.org; Tue, 07 Jul 2015 22:11:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCeq2-0002sC-Ru for qemu-devel@nongnu.org; Tue, 07 Jul 2015 22:11:58 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:55658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCeq2-0002rp-KZ for qemu-devel@nongnu.org; Tue, 07 Jul 2015 22:11:54 -0400 Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 Jul 2015 20:11:54 -0600 Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 3F41D1FF004A for ; Tue, 7 Jul 2015 20:03:02 -0600 (MDT) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t682B9Oo39125166 for ; Tue, 7 Jul 2015 19:11:09 -0700 Received: from d03av03.boulder.ibm.com (localhost [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t682BpW5024662 for ; Tue, 7 Jul 2015 20:11:51 -0600 From: Michael Roth Date: Tue, 7 Jul 2015 21:11:28 -0500 Message-Id: <1436321496-26179-4-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1436321496-26179-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1436321496-26179-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 03/11] Revert "guest agent: remove g_strcmp0 usage" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Markus Armbruster From: Markus Armbruster 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 Reviewed-by: John Snow Signed-off-by: Michael Roth --- qga/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/main.c b/qga/main.c index 23cde01..791982e 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 -- 1.9.1