From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45455)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <philmd@redhat.com>) id 1gMXxJ-0006vu-BM
	for qemu-devel@nongnu.org; Tue, 13 Nov 2018 07:38:10 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <philmd@redhat.com>) id 1gMXxG-0002PA-6j
	for qemu-devel@nongnu.org; Tue, 13 Nov 2018 07:38:09 -0500
Received: from mail-wr1-f67.google.com ([209.85.221.67]:41489)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <philmd@redhat.com>) id 1gMXxG-0002Nz-0P
	for qemu-devel@nongnu.org; Tue, 13 Nov 2018 07:38:06 -0500
Received: by mail-wr1-f67.google.com with SMTP id v18-v6so13134937wrt.8
	for <qemu-devel@nongnu.org>; Tue, 13 Nov 2018 04:38:04 -0800 (PST)
References: <20181113070320.16147-1-kraxel@redhat.com>
From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= <philmd@redhat.com>
Message-ID: <bea636d4-9f0c-de1f-ac70-3ce4a2245033@redhat.com>
Date: Tue, 13 Nov 2018 13:38:01 +0100
MIME-Version: 1.0
In-Reply-To: <20181113070320.16147-1-kraxel@redhat.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH] slirp: add tftp tracing
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org
Cc: Jan Kiszka <jan.kiszka@siemens.com>, Samuel Thibault <samuel.thibault@ens-lyon.org>

On 13/11/18 8:03, Gerd Hoffmann wrote:
> Useful when debugging pxeboot, to see what the guest tries to do.

Good idea!

> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>   Makefile.objs      | 1 +
>   slirp/tftp.c       | 3 +++
>   slirp/trace-events | 5 +++++
>   3 files changed, 9 insertions(+)
>   create mode 100644 slirp/trace-events
> 
> diff --git a/Makefile.objs b/Makefile.objs
> index 1e1ff387d7..31852eaf8f 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -251,6 +251,7 @@ 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/tftp.c b/slirp/tftp.c
> index a9bc4bb1b6..735b57aa55 100644
> --- a/slirp/tftp.c
> +++ b/slirp/tftp.c
> @@ -26,6 +26,7 @@
>   #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)
>   {
> @@ -204,6 +205,7 @@ static void tftp_send_error(struct tftp_session *spt,
>     struct mbuf *m;
>     struct tftp_t *tp;
>   
> +  trace_slirp_tftp_error(msg);
>     m = m_get(spt->slirp);
>   
>     if (!m) {
> @@ -323,6 +325,7 @@ static void tftp_handle_rrq(Slirp *slirp, struct sockaddr_storage *srcsas,
>         break;
>       }
>     }
> +  trace_slirp_tftp_rrq(req_fname);
>   
>     /* check mode */
>     if ((pktlen - k) < 6) {
> diff --git a/slirp/trace-events b/slirp/trace-events
> new file mode 100644
> index 0000000000..ff8f656e8c
> --- /dev/null
> +++ b/slirp/trace-events
> @@ -0,0 +1,5 @@
> +# 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"
>