slirp: add tftp tracing

[Qemu-devel] [PATCH] slirp: add tftp tracing

Posted by Gerd Hoffmann 7 years, 2 months ago

Useful when debugging pxeboot, to see what the guest tries to do.

Signed-off-by: Gerd Hoffmann <kraxel@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"
-- 
2.9.3

Re: [Qemu-devel] [PATCH] slirp: add tftp tracing

Posted by Liam Merwick 7 years, 2 months ago

On 13/11/2018 07:03, Gerd Hoffmann wrote:
> Useful when debugging pxeboot, to see what the guest tries to do.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Liam Merwick <liam.merwick@oracle.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"
>

Re: [Qemu-devel] [PATCH] slirp: add tftp tracing

Posted by Philippe Mathieu-Daudé 7 years, 2 months ago

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"
>

Re: [Qemu-devel] [PATCH] slirp: add tftp tracing

Posted by Samuel Thibault 7 years, 2 months ago

Gerd Hoffmann, le mar. 13 nov. 2018 08:03:20 +0100, a ecrit:
> Useful when debugging pxeboot, to see what the guest tries to do.

Applied to my tree, thanks!

Samuel