[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-3.2 30/41] slirp: replace trace functions with D
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH for-3.2 30/41] slirp: replace trace functions with DEBUG calls |
Date: |
Wed, 14 Nov 2018 16:36:32 +0400 |
Remove a dependency on QEMU. Use the existing logging facilities.
Signed-off-by: Marc-André Lureau <address@hidden>
---
slirp/tftp.c | 7 ++++---
Makefile.objs | 1 -
slirp/trace-events | 5 -----
3 files changed, 4 insertions(+), 9 deletions(-)
delete mode 100644 slirp/trace-events
diff --git a/slirp/tftp.c b/slirp/tftp.c
index 735b57aa55..dddb614b8a 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_ERROR("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_MISC("tftp rrq file: %s", req_fname);
/* check mode */
if ((pktlen - k) < 6) {
diff --git a/Makefile.objs b/Makefile.objs
index 31852eaf8f..1e1ff387d7 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -251,7 +251,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.19.1.708.g4ede3d42df
- [Qemu-devel] [PATCH for-3.2 27/41] slirp: remove unused global slirp_instance, (continued)
- [Qemu-devel] [PATCH for-3.2 27/41] slirp: remove unused global slirp_instance, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 28/41] slirp: replace error_report() with g_critical(), Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 32/41] slirp: remove unused sbflush(), Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 31/41] slirp: add a callback to log guest errors, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 30/41] slirp: replace trace functions with DEBUG calls,
Marc-André Lureau <=
- [Qemu-devel] [PATCH for-3.2 29/41] slirp: improve a bit the debug macros, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 33/41] slirp: replace qemu_notify_event() with a callback, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 34/41] slirp: remove #if notdef dead code, Marc-André Lureau, 2018/11/14