From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPbUD-00031K-JC for qemu-devel@nongnu.org; Wed, 21 Nov 2018 18:00:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPbU9-0004mh-Ae for qemu-devel@nongnu.org; Wed, 21 Nov 2018 18:00:45 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:45700) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPbU8-0004kH-Rd for qemu-devel@nongnu.org; Wed, 21 Nov 2018 18:00:41 -0500 Date: Thu, 22 Nov 2018 00:00:23 +0100 From: Samuel Thibault Message-ID: <20181121230023.putxhpeinrop2dbk@function> References: <20181121220647.18844-1-marcandre.lureau@redhat.com> <20181121220647.18844-26-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20181121220647.18844-26-marcandre.lureau@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 for-3.2 v2 25/30] slirp: replace trace functions with DEBUG calls List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Gerd Hoffmann Cc: qemu-devel@nongnu.org, Zhang Chen , Li Zhijian , Jan Kiszka , Jason Wang Hello, Marc-Andr=C3=A9 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=3Dtftp 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=3Dtftp to get tftp log, Gerd, are you fine with this replacement? Samuel > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > 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 >=20 > 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_ > =20 > -#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) > =20 > extern int slirp_debug; > =20 > @@ -38,4 +39,10 @@ extern int slirp_debug; > } \ > } while (0) > =20 > +#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 =3D 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" > =20 > static inline int tftp_session_in_use(struct tftp_session *spt) > { > @@ -205,7 +204,8 @@ static void tftp_send_error(struct tftp_session *sp= t, > struct mbuf *m; > struct tftp_t *tp; > =20 > - trace_slirp_tftp_error(msg); > + DEBUG_TFTP("tftp error msg: %s", msg); > + > m =3D m_get(spt->slirp); > =20 > if (!m) { > @@ -325,7 +325,8 @@ static void tftp_handle_rrq(Slirp *slirp, struct so= ckaddr_storage *srcsas, > break; > } > } > - trace_slirp_tftp_rrq(req_fname); > + > + DEBUG_TFTP("tftp rrq file: %s", req_fname); > =20 > /* 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 +=3D net > trace-events-subdirs +=3D qapi > trace-events-subdirs +=3D qom > trace-events-subdirs +=3D scsi > -trace-events-subdirs +=3D slirp > trace-events-subdirs +=3D target/arm > trace-events-subdirs +=3D target/i386 > trace-events-subdirs +=3D 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" > --=20 > 2.20.0.rc1 >=20 --=20 Samuel In mutt, type cthis Dans mutt, taper cceci