From nobody Thu Nov 6 16:24:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542200747241848.3248796612353; Wed, 14 Nov 2018 05:05:47 -0800 (PST) Received: from localhost ([::1]:59976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMurY-0005qW-5a for importer@patchew.org; Wed, 14 Nov 2018 08:05:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMuUm-0003ME-G2 for qemu-devel@nongnu.org; Wed, 14 Nov 2018 07:42:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMuUl-0003m0-MQ for qemu-devel@nongnu.org; Wed, 14 Nov 2018 07:42:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48860) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gMuUl-0003ll-HE for qemu-devel@nongnu.org; Wed, 14 Nov 2018 07:42:11 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BE7F85D697; Wed, 14 Nov 2018 12:42:10 +0000 (UTC) Received: from localhost (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 121C75D759; Wed, 14 Nov 2018 12:42:04 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Wed, 14 Nov 2018 16:36:30 +0400 Message-Id: <20181114123643.24091-29-marcandre.lureau@redhat.com> In-Reply-To: <20181114123643.24091-1-marcandre.lureau@redhat.com> References: <20181114123643.24091-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 14 Nov 2018 12:42:10 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-3.2 28/41] slirp: replace error_report() with g_critical() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: samuel.thibault@ens-lyon.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , rjones@redhat.com, stefanha@redhat.com, renzo@cs.unibo.it Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Reduce dependency on QEMU. QEMU could use a custom log handler if it wants to redirect/filter it. Signed-off-by: Marc-Andr=C3=A9 Lureau --- slirp/ip6_icmp.c | 2 +- slirp/misc.c | 4 ++-- slirp/slirp.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c index 71d95daef0..e2e23d57bd 100644 --- a/slirp/ip6_icmp.c +++ b/slirp/ip6_icmp.c @@ -418,7 +418,7 @@ void icmp6_input(struct mbuf *m) icmp6_send_echoreply(m, slirp, ip, icmp); } else { /* TODO */ - error_report("external icmpv6 not supported yet"); + g_critical("external icmpv6 not supported yet"); } break; =20 diff --git a/slirp/misc.c b/slirp/misc.c index dd2b3512a8..17361b79a4 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -119,7 +119,7 @@ slirp_socketpair_with_oob(int sv[2]) return 0; =20 err: - error_report("Error: slirp_socketpair(): %s", strerror(errno)); + g_critical("slirp_socketpair(): %s", strerror(errno)); if (s >=3D 0) { closesocket(s); } @@ -162,7 +162,7 @@ fork_exec(struct socket *so, const char *ex) g_strfreev(argv); =20 if (err) { - error_report("%s", err->message); + g_critical("fork_exec: %s", err->message); g_error_free(err); closesocket(sp[0]); closesocket(sp[1]); diff --git a/slirp/slirp.c b/slirp/slirp.c index 864a9b5a7a..b1270a0309 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -1215,8 +1215,8 @@ static int sbuf_tmp_post_load(void *opaque, int versi= on) } if (tmp->woff >=3D requested_len || tmp->roff >=3D requested_len) { - error_report("invalid sbuf offsets r/w=3D%u/%u len=3D%u", - tmp->roff, tmp->woff, requested_len); + g_critical("invalid sbuf offsets r/w=3D%u/%u len=3D%u", + tmp->roff, tmp->woff, requested_len); return -EINVAL; } =20 @@ -1324,7 +1324,7 @@ static int ss_family_post_load(void *opaque, int vers= ion_id) tss->parent->ss.ss_family =3D AF_INET6; break; default: - error_report("invalid ss_family type %x", tss->portable_family); + g_critical("invalid ss_family type %x", tss->portable_family); return -EINVAL; } =20 --=20 2.19.1.708.g4ede3d42df