[Qemu-devel] [PULL 34/65] slirp: replace error_report() with g_critical()

[Samuel Thibault]

From: Marc-André Lureau 

Reduce dependency on QEMU. QEMU could use a custom log handler if it
wants to redirect/filter it.

Signed-off-by: Marc-André Lureau 
Signed-off-by: Samuel Thibault 
---
 slirp/ip6_icmp.c | 2 +-
 slirp/misc.c | 2 +-
 slirp/slirp.c| 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c
index cd1e0b9fe1..3c424df591 100644
--- a/slirp/ip6_icmp.c
+++ b/slirp/ip6_icmp.c
@@ -417,7 +417,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;
 
diff --git a/slirp/misc.c b/slirp/misc.c
index 7362e14339..ee3492a2ae 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -119,7 +119,7 @@ slirp_socketpair_with_oob(int sv[2])
 return 0;
 
 err:
-error_report("Error: slirp_socketpair(): %s", strerror(errno));
+g_critical("slirp_socketpair(): %s", strerror(errno));
 if (s >= 0) {
 closesocket(s);
 }
diff --git a/slirp/slirp.c b/slirp/slirp.c
index f11f9e9e51..8391d18faf 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -1214,8 +1214,8 @@ static int sbuf_tmp_post_load(void *opaque, int version)
 }
 if (tmp->woff >= requested_len ||
 tmp->roff >= requested_len) {
-error_report("invalid sbuf offsets r/w=%u/%u len=%u",
- tmp->roff, tmp->woff, requested_len);
+g_critical("invalid sbuf offsets r/w=%u/%u len=%u",
+   tmp->roff, tmp->woff, requested_len);
 return -EINVAL;
 }
 
@@ -1323,7 +1323,7 @@ static int ss_family_post_load(void *opaque, int 
version_id)
 tss->parent->ss.ss_family = 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;
 }
 
-- 
2.20.1

[Qemu-devel] [PULL 34/65] slirp: replace error_report() with g_critical()

[Samuel Thibault]

From: Marc-André Lureau 

Reduce dependency on QEMU. QEMU could use a custom log handler if it
wants to redirect/filter it.

Signed-off-by: Marc-André Lureau 
Signed-off-by: Samuel Thibault 
---
 slirp/ip6_icmp.c | 2 +-
 slirp/misc.c | 2 +-
 slirp/slirp.c| 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c
index cd1e0b9fe1..3c424df591 100644
--- a/slirp/ip6_icmp.c
+++ b/slirp/ip6_icmp.c
@@ -417,7 +417,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;
 
diff --git a/slirp/misc.c b/slirp/misc.c
index 7362e14339..ee3492a2ae 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -119,7 +119,7 @@ slirp_socketpair_with_oob(int sv[2])
 return 0;
 
 err:
-error_report("Error: slirp_socketpair(): %s", strerror(errno));
+g_critical("slirp_socketpair(): %s", strerror(errno));
 if (s >= 0) {
 closesocket(s);
 }
diff --git a/slirp/slirp.c b/slirp/slirp.c
index f11f9e9e51..8391d18faf 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -1214,8 +1214,8 @@ static int sbuf_tmp_post_load(void *opaque, int version)
 }
 if (tmp->woff >= requested_len ||
 tmp->roff >= requested_len) {
-error_report("invalid sbuf offsets r/w=%u/%u len=%u",
- tmp->roff, tmp->woff, requested_len);
+g_critical("invalid sbuf offsets r/w=%u/%u len=%u",
+   tmp->roff, tmp->woff, requested_len);
 return -EINVAL;
 }
 
@@ -1323,7 +1323,7 @@ static int ss_family_post_load(void *opaque, int 
version_id)
 tss->parent->ss.ss_family = 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;
 }
 
-- 
2.20.1