[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 34/64] slirp: replace error_report() with g_critical(
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 34/64] slirp: replace error_report() with g_critical() |
Date: |
Wed, 19 Dec 2018 00:04:12 +0100 |
From: Marc-André Lureau <address@hidden>
Reduce dependency on QEMU. QEMU could use a custom log handler if it
wants to redirect/filter it.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
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 3261a04236..238629228f 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.19.2
- [Qemu-devel] [PULL 23/64] slirp: remove unused HAVE_ARPA_INET_H, (continued)
- [Qemu-devel] [PULL 23/64] slirp: remove unused HAVE_ARPA_INET_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 16/64] slirp: remove PROBE_CONN dead-code, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 10/64] slirp: replace the poor-man string split with g_strsplit(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 08/64] slirp: remove Monitor dependency, return a string for info, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 21/64] slirp: remove NO_UNIX_SOCKETS, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 36/64] slirp: add a callback to log guest errors, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 30/64] slirp: replace HOST_WORDS_BIGENDIAN with glib equivalent, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 26/64] slirp: remove HAVE_SYS_IOCTL_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 33/64] slirp: remove unused global slirp_instance, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 42/64] net: do not depend on slirp internals, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 34/64] slirp: replace error_report() with g_critical(),
Samuel Thibault <=
- [Qemu-devel] [PULL 27/64] slirp: remove HAVE_SYS_FILIO_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 25/64] slirp: remove unused HAVE_SYS_SELECT_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 22/64] slirp: remove unused HAVE_SYS_STROPTS_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 38/64] slirp: remove unused sbflush(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 31/64] slirp: replace SIZEOF_CHAR_P with glib equivalent, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 43/64] glib-compat: add g_spawn_async_with_fds() fallback, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 28/64] slirp: remove unused DECLARE_IOVEC, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 41/64] slirp: replace ARRAY_SIZE with G_N_ELEMENTS, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 45/64] slirp: replace error_report() with g_critical(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 35/64] slirp: improve a bit the debug macros, Samuel Thibault, 2018/12/18