[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/5] util: Improved qemu_hexmap() to include an ascii
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 1/5] util: Improved qemu_hexmap() to include an ascii dump of the buffer |
Date: |
Wed, 6 Apr 2016 10:37:56 +0800 |
From: Isaac Lozano <address@hidden>
qemu_hexdump() in util/hexdump.c has been changed to give also include a
ascii dump of the buffer. Also, calls to hex_dump() in net/net.c have
been replaced with calls to qemu_hexdump(). This takes care of two misc
BiteSized Tasks.
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Isaac Lozano <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/net.c | 30 +-----------------------------
util/hexdump.c | 33 ++++++++++++++++++++++-----------
2 files changed, 23 insertions(+), 40 deletions(-)
diff --git a/net/net.c b/net/net.c
index 594c3b8..0bc42a1 100644
--- a/net/net.c
+++ b/net/net.c
@@ -81,34 +81,6 @@ int default_net = 1;
/***********************************************************/
/* network device redirectors */
-#if defined(DEBUG_NET)
-static void hex_dump(FILE *f, const uint8_t *buf, int size)
-{
- int len, i, j, c;
-
- for(i=0;i<size;i+=16) {
- len = size - i;
- if (len > 16)
- len = 16;
- fprintf(f, "%08x ", i);
- for(j=0;j<16;j++) {
- if (j < len)
- fprintf(f, " %02x", buf[i+j]);
- else
- fprintf(f, " ");
- }
- fprintf(f, " ");
- for(j=0;j<len;j++) {
- c = buf[i+j];
- if (c < ' ' || c > '~')
- c = '.';
- fprintf(f, "%c", c);
- }
- fprintf(f, "\n");
- }
-}
-#endif
-
static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
{
const char *p, *p1;
@@ -664,7 +636,7 @@ static ssize_t
qemu_send_packet_async_with_flags(NetClientState *sender,
#ifdef DEBUG_NET
printf("qemu_send_packet_async:\n");
- hex_dump(stdout, buf, size);
+ qemu_hexdump((const char *)buf, stdout, "net", size);
#endif
if (sender->link_down || !sender->peer) {
diff --git a/util/hexdump.c b/util/hexdump.c
index 1d9c129..f879ff0 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -18,21 +18,32 @@
void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size)
{
- unsigned int b;
+ unsigned int b, len, i, c;
- for (b = 0; b < size; b++) {
- if ((b % 16) == 0) {
- fprintf(fp, "%s: %04x:", prefix, b);
+ for (b = 0; b < size; b += 16) {
+ len = size - b;
+ if (len > 16) {
+ len = 16;
}
- if ((b % 4) == 0) {
- fprintf(fp, " ");
+ fprintf(fp, "%s: %04x:", prefix, b);
+ for (i = 0; i < 16; i++) {
+ if ((i % 4) == 0) {
+ fprintf(fp, " ");
+ }
+ if (i < len) {
+ fprintf(fp, " %02x", (unsigned char)buf[b + i]);
+ } else {
+ fprintf(fp, " ");
+ }
}
- fprintf(fp, " %02x", (unsigned char)buf[b]);
- if ((b % 16) == 15) {
- fprintf(fp, "\n");
+ fprintf(fp, " ");
+ for (i = 0; i < len; i++) {
+ c = buf[b + i];
+ if (c < ' ' || c > '~') {
+ c = '.';
+ }
+ fprintf(fp, "%c", c);
}
- }
- if ((b % 16) != 0) {
fprintf(fp, "\n");
}
}
--
2.5.0
- [Qemu-devel] [PULL 0/5] Net patches, Jason Wang, 2016/04/05
- [Qemu-devel] [PULL 1/5] util: Improved qemu_hexmap() to include an ascii dump of the buffer,
Jason Wang <=
- [Qemu-devel] [PULL 2/5] net: Allocating Large sized arrays to heap, Jason Wang, 2016/04/05
- [Qemu-devel] [PULL 3/5] net: fix OptsVisitor memory leak, Jason Wang, 2016/04/05
- [Qemu-devel] [PULL 4/5] rtl8139: using CP_TX_OWN for ownership transferring during tx, Jason Wang, 2016/04/05
- [Qemu-devel] [PULL 5/5] filter-buffer: fix segfault when starting qemu with status=off property, Jason Wang, 2016/04/05
- Re: [Qemu-devel] [PULL 0/5] Net patches, Peter Maydell, 2016/04/07