Hello,
Marc-André Lureau, le jeu. 22 nov. 2018 02:06:42 +0400, a ecrit:
> Remove a dependency on QEMU. Use the existing logging facilities.
> Set SLIRP_DEBUG=tftp to get tftp log.
As mentioned before, I was hesitating to replace the tracing with a
DEBUG call. Now that I have merged to my tree the DEBUG rework which
allows to just set SLIRP_DEBUG=tftp to get tftp log, Gerd, are you fine
with this replacement?
Samuel
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> slirp/debug.h | 13 ++++++++++---
> slirp/slirp.c | 1 +
> slirp/tftp.c | 7 ++++---
> Makefile.objs | 1 -
> slirp/trace-events | 5 -----
> 5 files changed, 15 insertions(+), 12 deletions(-)
> delete mode 100644 slirp/trace-events
>
> diff --git a/slirp/debug.h b/slirp/debug.h
> index 25a5d59439..20557f9866 100644
> --- a/slirp/debug.h
> +++ b/slirp/debug.h
> @@ -8,9 +8,10 @@
> #ifndef DEBUG_H_
> #define DEBUG_H_
>
> -#define DBG_CALL 0x1
> -#define DBG_MISC 0x2
> -#define DBG_ERROR 0x4
> +#define DBG_CALL (1 << 0)
> +#define DBG_MISC (1 << 1)
> +#define DBG_ERROR (1 << 2)
> +#define DBG_TFTP (1 << 3)
>
> extern int slirp_debug;
>
> @@ -38,4 +39,10 @@ extern int slirp_debug;
> } \
> } while (0)
>
> +#define DEBUG_TFTP(fmt, ...) do { \
> + if (slirp_debug & DBG_TFTP) { \
> + g_debug(fmt, ##__VA_ARGS__); \
> + } \
> +} while (0)
> +
> #endif /* DEBUG_H_ */
> diff --git a/slirp/slirp.c b/slirp/slirp.c
> index f254a23a5a..cd0ad81f26 100644
> --- a/slirp/slirp.c
> +++ b/slirp/slirp.c
> @@ -270,6 +270,7 @@ static void slirp_init_once(void)
> { "call", DBG_CALL },
> { "misc", DBG_MISC },
> { "error", DBG_ERROR },
> + { "tftp", DBG_TFTP },
> };
> slirp_debug = g_parse_debug_string(debug, keys, G_N_ELEMENTS(keys));
> }
> diff --git a/slirp/tftp.c b/slirp/tftp.c
> index a9ba1480db..6fb381ef33 100644
> --- a/slirp/tftp.c
> +++ b/slirp/tftp.c
> @@ -26,7 +26,6 @@
> #include "slirp.h"
> #include "qemu-common.h"
> #include "qemu/cutils.h"
> -#include "trace.h"
>
> static inline int tftp_session_in_use(struct tftp_session *spt)
> {
> @@ -205,7 +204,8 @@ static void tftp_send_error(struct tftp_session *spt,
> struct mbuf *m;
> struct tftp_t *tp;
>
> - trace_slirp_tftp_error(msg);
> + DEBUG_TFTP("tftp error msg: %s", msg);
> +
> m = m_get(spt->slirp);
>
> if (!m) {
> @@ -325,7 +325,8 @@ static void tftp_handle_rrq(Slirp *slirp, struct sockaddr_storage *srcsas,
> break;
> }
> }
> - trace_slirp_tftp_rrq(req_fname);
> +
> + DEBUG_TFTP("tftp rrq file: %s", req_fname);
>
> /* check mode */
> if ((pktlen - k) < 6) {
> diff --git a/Makefile.objs b/Makefile.objs
> index a11050a7aa..1cb2faab5e 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -250,7 +250,6 @@ trace-events-subdirs += net
> trace-events-subdirs += qapi
> trace-events-subdirs += qom
> trace-events-subdirs += scsi
> -trace-events-subdirs += slirp
> trace-events-subdirs += target/arm
> trace-events-subdirs += target/i386
> trace-events-subdirs += target/mips
> diff --git a/slirp/trace-events b/slirp/trace-events
> deleted file mode 100644
> index ff8f656e8c..0000000000
> --- a/slirp/trace-events
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# See docs/devel/tracing.txt for syntax documentation.
> -
> -# slirp/tftp.c
> -slirp_tftp_rrq(const char *file) "file: %s"
> -slirp_tftp_error(const char *file) "msg: %s"
> --
> 2.20.0.rc1
>
--
Samuel
In mutt, type cthis
Dans mutt, taper cceci