From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Hans de Goede <hdegoede@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 20/20] spice-qemu-char: Remove dead debugging code
Date: Thu, 14 Mar 2013 09:57:41 +0100 [thread overview]
Message-ID: <1363251462-31498-21-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1363251462-31498-1-git-send-email-kraxel@redhat.com>
From: Hans de Goede <hdegoede@redhat.com>
Since commit d62e5f7036a018b2ad09f17ebd481bd28953d783
"chardev: add spice support to qapi"
It is impossible to set the debug parameter, so all the dprintf calls
are essentially nops. Since we've not needed the debug parameter in ages this
is not a problem, if it later turns out we do need some more debugging options
we can add more trace-points.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
spice-qemu-char.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index a94f76b..8a9236d 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -8,14 +8,6 @@
#include "qemu/osdep.h"
-#define dprintf(_scd, _level, _fmt, ...) \
- do { \
- static unsigned __dprintf_counter = 0; \
- if (_scd->debug >= _level) { \
- fprintf(stderr, "scd: %3d: " _fmt, ++__dprintf_counter, ## __VA_ARGS__);\
- } \
- } while (0)
-
typedef struct SpiceCharDriver {
CharDriverState* chr;
SpiceCharDeviceInstance sin;
@@ -24,7 +16,6 @@ typedef struct SpiceCharDriver {
uint8_t *buffer;
uint8_t *datapos;
ssize_t bufsize, datalen;
- uint32_t debug;
QLIST_ENTRY(SpiceCharDriver) next;
} SpiceCharDriver;
@@ -49,7 +40,6 @@ static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len)
p += last_out;
}
- dprintf(scd, 3, "%s: %zu/%zd\n", __func__, out, len + out);
trace_spice_vmc_write(out, len + out);
return out;
}
@@ -59,7 +49,6 @@ static int vmc_read(SpiceCharDeviceInstance *sin, uint8_t *buf, int len)
SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
int bytes = MIN(len, scd->datalen);
- dprintf(scd, 2, "%s: %p %d/%d/%zd\n", __func__, scd->datapos, len, bytes, scd->datalen);
if (bytes > 0) {
memcpy(buf, scd->datapos, bytes);
scd->datapos += bytes;
@@ -84,11 +73,9 @@ static void vmc_event(SpiceCharDeviceInstance *sin, uint8_t event)
chr_event = CHR_EVENT_BREAK;
break;
default:
- dprintf(scd, 2, "%s: unknown %d\n", __func__, event);
return;
}
- dprintf(scd, 2, "%s: %d\n", __func__, event);
trace_spice_vmc_event(chr_event);
qemu_chr_be_event(scd->chr, chr_event);
}
@@ -141,7 +128,6 @@ static void vmc_register_interface(SpiceCharDriver *scd)
if (scd->active) {
return;
}
- dprintf(scd, 1, "%s\n", __func__);
scd->sin.base.sif = &vmc_interface.base;
qemu_spice_add_interface(&scd->sin.base);
scd->active = true;
@@ -153,7 +139,6 @@ static void vmc_unregister_interface(SpiceCharDriver *scd)
if (!scd->active) {
return;
}
- dprintf(scd, 1, "%s\n", __func__);
spice_server_remove_interface(&scd->sin.base);
scd->active = false;
trace_spice_vmc_unregister_interface(scd);
@@ -164,7 +149,6 @@ static int spice_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
{
SpiceCharDriver *s = chr->opaque;
- dprintf(s, 2, "%s: %d\n", __func__, len);
vmc_register_interface(s);
assert(s->datalen == 0);
if (s->bufsize < len) {
@@ -182,7 +166,6 @@ static void spice_chr_close(struct CharDriverState *chr)
{
SpiceCharDriver *s = chr->opaque;
- printf("%s\n", __func__);
vmc_unregister_interface(s);
QLIST_REMOVE(s, next);
--
1.7.9.7
next prev parent reply other threads:[~2013-03-14 8:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-14 8:57 [Qemu-devel] [PULL v4 00/20] chardev: qapi conversion continued Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 01/20] chardev: add support for qapi-based chardev initialization Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 02/20] chardev: add mux chardev support to qapi Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 03/20] chardev: switch null init " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 04/20] chardev: add msmouse support " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 05/20] chardev: add braille " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 06/20] chardev: switch file init " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 07/20] chardev: add stdio support " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 08/20] chardev: switch serial/tty init " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 09/20] chardev: switch parallel " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 10/20] chardev: switch pty " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 11/20] chardev: add console support " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 12/20] chardev: add pipe " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 13/20] chardev: add spice " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 14/20] chardev: add vc " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 15/20] chardev: add memory (ringbuf) " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 16/20] chardev: add udp " Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 17/20] Revert "hmp: Disable chardev-add and chardev-remove" Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 18/20] qemu-char.c: fix waiting for telnet connection message Gerd Hoffmann
2013-03-14 8:57 ` [Qemu-devel] [PATCH 19/20] spice-qemu-char: Fix name parameter issues after qapi-ifying Gerd Hoffmann
2013-03-14 8:57 ` Gerd Hoffmann [this message]
2013-03-14 14:27 ` [Qemu-devel] [PULL v4 00/20] chardev: qapi conversion continued Eric Blake
2013-03-14 19:49 ` Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363251462-31498-21-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=hdegoede@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).