From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <109lozanoi@gmail.com>) id 1aiGtm-0002ax-JZ for qemu-devel@nongnu.org; Tue, 22 Mar 2016 03:38:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <109lozanoi@gmail.com>) id 1aiGtl-0000u9-K5 for qemu-devel@nongnu.org; Tue, 22 Mar 2016 03:38:42 -0400 Received: from mail-pf0-x22f.google.com ([2607:f8b0:400e:c00::22f]:33051) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <109lozanoi@gmail.com>) id 1aiGtl-0000tt-C5 for qemu-devel@nongnu.org; Tue, 22 Mar 2016 03:38:41 -0400 Received: by mail-pf0-x22f.google.com with SMTP id 4so167724194pfd.0 for ; Tue, 22 Mar 2016 00:38:40 -0700 (PDT) From: Isaac Lozano <109lozanoi@gmail.com> Date: Tue, 22 Mar 2016 00:41:37 -0700 Message-Id: <1458632497-27173-1-git-send-email-109lozanoi@gmail.com> Subject: [Qemu-devel] [PATCH] util: Improved qemu_hexmap() to include an ascii dump of the buffer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Isaac Lozano <109lozanoi@gmail.com> 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. Signed-off-by: Isaac Lozano <109lozanoi@gmail.com> --- net/net.c | 31 +------------------------------ util/hexdump.c | 35 ++++++++++++++++++++++++----------- 2 files changed, 25 insertions(+), 41 deletions(-) diff --git a/net/net.c b/net/net.c index 1a78edf..8d51ffb 100644 --- a/net/net.c +++ b/net/net.c @@ -79,34 +79,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 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 '~') - 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; @@ -661,8 +633,7 @@ static ssize_t qemu_send_packet_async_with_flags(NetClientState *sender, int ret; #ifdef DEBUG_NET - printf("qemu_send_packet_async:\n"); - hex_dump(stdout, buf, size); + qemu_hexdump((const char*)buf, stdout, "qemu_send_packet_async", size); #endif if (sender->link_down || !sender->peer) { diff --git a/util/hexdump.c b/util/hexdump.c index 1d9c129..886e53c 100644 --- a/util/hexdump.c +++ b/util/hexdump.c @@ -18,21 +18,34 @@ 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.7.2