From patchwork Fri Mar 25 10:42:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaac Lozano <109lozanoi@gmail.com> X-Patchwork-Id: 8669381 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2A478C0553 for ; Fri, 25 Mar 2016 10:39:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EEDD820254 for ; Fri, 25 Mar 2016 10:39:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4325620220 for ; Fri, 25 Mar 2016 10:39:47 +0000 (UTC) Received: from localhost ([::1]:55392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajP9e-00082o-D7 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 25 Mar 2016 06:39:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <109lozanoi@gmail.com>) id 1ajP9X-00082G-32 for qemu-devel@nongnu.org; Fri, 25 Mar 2016 06:39:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <109lozanoi@gmail.com>) id 1ajP9V-0001ZH-Ts for qemu-devel@nongnu.org; Fri, 25 Mar 2016 06:39:38 -0400 Received: from mail-pa0-x242.google.com ([2607:f8b0:400e:c03::242]:35351) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <109lozanoi@gmail.com>) id 1ajP9V-0001Yp-NG for qemu-devel@nongnu.org; Fri, 25 Mar 2016 06:39:37 -0400 Received: by mail-pa0-x242.google.com with SMTP id fl4so6198410pad.2 for ; Fri, 25 Mar 2016 03:39:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=IpFqr/8Yo4LDReBnVzCC6JC4c3xmMdrYZ2rhZ1hnmE0=; b=MRxqahXBB73TiSvYsNJ2+6i1QXDzSOU3metnJY31XaOYENamFvh57rnRtky0V1IIci 466jLFYSBwwa+9UcNc3sSnoQqFhTKXTdkqIMT/hu51rVes5gataVd9aO8my+rk4BgGGj R++SfzQfIZV/R5UIU0xCA4w8oAvc8pxNMhDFNru7y5yJ9hyJatlni9UuwHtJ1x0xDxTu 1MDh+PBpd1qS3SuWz+Cm9hzD3rhgBCmpjPC3cu1HCC6xwqcPiut9id2JLecI7X1up7sU pNMfNMnsaDZoSDwtycUFXMtj674lUl7lqY0+OwfCuhEeLwwE7dPj2vpCTjSdiNwfnpXR yLZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IpFqr/8Yo4LDReBnVzCC6JC4c3xmMdrYZ2rhZ1hnmE0=; b=Nok6jMskwGjszlRZso9xfTDHVhaUVySYWi9ZPQC3N6WdmrYvuV7N9BhI1sIBvU4dZh a6XzVzeVg25eABzXTdffzzPzQBSlbOthE3fjSuKirhepQbfkDLqcwR2h8dSbBbuRpLyI NvzRWw8l7ZT5xjGRRX/RWh9gu948zw+4B1Eqk1pNEGI1ZVnRzbPY8RI8nRigcuCaIV/Q AMcyLioVWVUn1zPHssbZJJj5gQlBjhpniH4CeuEFh2rXUvZkqIaY37Efkh6LsduAS4HO Vd9xz5lDWMT3fSqcFtci3K35/elYmWFk/b23WJ9Q2KwUd16yYL2vX/lIHO9458ltijAL R9Hw== X-Gm-Message-State: AD7BkJJY0z/umEtFn752WnnrVPFXpw0GZ2o1jZEpUxo2Pc0zoyP36oLcLwB3qR0IWIkzeA== X-Received: by 10.67.1.237 with SMTP id bj13mr20278189pad.130.1458902376517; Fri, 25 Mar 2016 03:39:36 -0700 (PDT) Received: from Phobos.localdomain ([2602:301:772d:a050::3ed]) by smtp.gmail.com with ESMTPSA id fa3sm15645938pab.45.2016.03.25.03.39.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Mar 2016 03:39:35 -0700 (PDT) From: Isaac Lozano <109lozanoi@gmail.com> To: qemu-devel@nongnu.org Date: Fri, 25 Mar 2016 03:42:15 -0700 Message-Id: <1458902535-9715-1-git-send-email-109lozanoi@gmail.com> X-Mailer: git-send-email 2.7.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::242 Cc: peter.crosthwaite@xilinx.com, jasowang@redhat.com, thuth@redhat.com, kraxel@redhat.com, Isaac Lozano <109lozanoi@gmail.com>, jsnow@redhat.com Subject: [Qemu-devel] [PATCH v2] util: Improved qemu_hexmap() to include an ascii dump of the buffer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,FROM_STARTS_WITH_NUMS,RCVD_IN_DNSWL_HI, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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> Reviewed-by: Thomas Huth Reviewed-by: Gerd Hoffmann --- v2: Fixed code-style and made debug line smaller. 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 1a78edf..9bc9ad3 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; @@ -662,7 +634,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"); } }