From nobody Fri May 17 06:54:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1598108774; cv=none; d=zohomail.com; s=zohoarc; b=lzTa5ioRinmQQR+lxbv6E0hg7fvVzInUREeNib0KqQxgeIuYLispDC4PgiZy67eN5IN93dReWl2YtvxQzCX6RNQD+n+lG9hiudLZ4raDoFeHs1uJOW/8fzTlUgkut8fvAZYX3MyGtZnOj3DhUw5dJIjXKJsDNDSX6OKsccUHtYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598108774; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=va12qEWE1uizpmZs5eu7pHxQLaxV4eDLRUG5PqTqbec=; b=gREjzZWXtxR43KPv9MEFJw9Dt5hUFlRiCe3s6m7Nap2kGZbB+/Toq8S2gpu38dXy8typDcgwpaDCRZHLgMob5RnzQH6VqqWjPb+unFB5IuQLk3BSFZYY/ePyODy9zrfQ1KyqHZFdSrIEQmPxv8IF9wEaFeIivkDCEG3mVhHR+FQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598108774258498.62811470511065; Sat, 22 Aug 2020 08:06:14 -0700 (PDT) Received: from localhost ([::1]:58778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9V5x-0005rj-0U for importer@patchew.org; Sat, 22 Aug 2020 11:06:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9V4r-0004ju-Mo; Sat, 22 Aug 2020 11:05:05 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:51431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k9V4p-0007aF-Tc; Sat, 22 Aug 2020 11:05:05 -0400 Received: by mail-wm1-x342.google.com with SMTP id p14so4440770wmg.1; Sat, 22 Aug 2020 08:05:02 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id t12sm3866637wrm.61.2020.08.22.08.04.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Aug 2020 08:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=va12qEWE1uizpmZs5eu7pHxQLaxV4eDLRUG5PqTqbec=; b=DiddmmhTXgUJa4obHpspyx0uLLCx6JQP7rE0RZgOc6tvhTFo96MFSwlEmr/Q+aOWJe 7eUyZ4bFIVMX0zIxOecZpKH2T4EWevnW6vbaRCeUe2AIaVNogtPOOOLLB0c3HMMzqefu b5rMEswk37U7DtwK6mF138tvi7WcIjUQS8/dVZxWmi3Aa2pixHgbTa9z/zYBTf10qjvw vY9tYHE3IUsSph8K7H07D2rSNZ7p2pqIiqmid4hej0hMGcmAMLGJW69yHfc8i3C9b3fI Lh7xi7I8b0dTOlFvXyNwJEMTIqStEZ7iAcRSjQ5ku9Sf61e4PkFtUABJ/d+Ef/m6D+LA 18QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=va12qEWE1uizpmZs5eu7pHxQLaxV4eDLRUG5PqTqbec=; b=pqytgZXa7CnVmTqfSy/5Jq3YHH4YpondkCXolselN5na40gUY03uZn7Y8p1cMJqTbl UEp81y+t34R3RYqLOhWUFFpFtB+4RpPMhg8d25AddAb3rPAeHfDY5ezPEYCitsklnVnM TzycCSuhTw1fEUhxbjaQ6ZCn3SfG3iEi8BRO+JK4ZFGkRAedwkh+7X6UZSKm99G5ITsI K65dPDoAhiViZ3E1bxWQly8fwIl7RY6WAw7c102Bj2mde++xKAPUzyEDpLhqmTRSxQEl BqlJXbiPMszCDiHyc47WbO7TbquTFXDuTV9SS4d7A8YoCwTWtXoZ01oAgtXmFx+XjjRN Ihlg== X-Gm-Message-State: AOAM53320UyH1mFiFUYnBTg3jpgB8a1kmpYfeBkQVJLFPJUqbI+E2Y06 2mXgz3ryLUMGm8IJjE+/aOb9gZf+IpI= X-Google-Smtp-Source: ABdhPJzMuMvVg0ZumBkMiXwj+F4oXvvATJuSFYVQFXhzvaQcVnKF4H66LW0025iW97UUkGnNmGj0hQ== X-Received: by 2002:a7b:c011:: with SMTP id c17mr8477888wmb.63.1598108700490; Sat, 22 Aug 2020 08:05:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] util/hexdump: Convert to take a void pointer argument Date: Sat, 22 Aug 2020 17:04:57 +0200 Message-Id: <20200822150457.1322519-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-block@nongnu.org, Li Zhijian , qemu-trivial@nongnu.org, Jason Wang , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhang Chen , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Gerd Hoffmann , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Most uses of qemu_hexdump() do not take an array of char as input, forcing use of cast. Since we can use this helper to dump any kind of buffer, use a pointer to void argument instead. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu-common.h | 2 +- hw/dma/xlnx_dpdma.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/sd/sd.c | 2 +- hw/usb/redirect.c | 2 +- net/colo-compare.c | 12 ++++++------ net/net.c | 2 +- util/hexdump.c | 3 ++- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index bb9496bd80f..de82a619abd 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -138,7 +138,7 @@ int os_parse_cmd_args(int index, const char *optarg); * Hexdump a buffer to a file. An optional string prefix is added to every= line */ =20 -void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t si= ze); +void qemu_hexdump(const void *ptr, FILE *fp, const char *prefix, size_t si= ze); =20 /* * helper to parse debug environment variables diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c index b40c897de2c..d75a8069426 100644 --- a/hw/dma/xlnx_dpdma.c +++ b/hw/dma/xlnx_dpdma.c @@ -388,7 +388,7 @@ static void xlnx_dpdma_dump_descriptor(DPDMADescriptor = *desc) { if (DEBUG_DPDMA) { qemu_log("DUMP DESCRIPTOR:\n"); - qemu_hexdump((char *)desc, stdout, "", sizeof(DPDMADescriptor)); + qemu_hexdump(desc, stdout, "", sizeof(DPDMADescriptor)); } } =20 diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 7035cf4eb97..c817a28decd 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -357,7 +357,7 @@ static ssize_t etsec_receive(NetClientState *nc, =20 #if defined(HEX_DUMP) fprintf(stderr, "%s receive size:%zd\n", nc->name, size); - qemu_hexdump((void *)buf, stderr, "", size); + qemu_hexdump(buf, stderr, "", size); #endif /* Flush is unnecessary as are already in receiving path */ etsec->need_flush =3D false; diff --git a/hw/sd/sd.c b/hw/sd/sd.c index fad9cf1ee7a..190e4cf1232 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1781,7 +1781,7 @@ send_response: } =20 #ifdef DEBUG_SD - qemu_hexdump((const char *)response, stderr, "Response", rsplen); + qemu_hexdump(response, stderr, "Response", rsplen); #endif =20 return rsplen; diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 417a60a2e68..09edb0d81c0 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -240,7 +240,7 @@ static void usbredir_log_data(USBRedirDevice *dev, cons= t char *desc, if (dev->debug < usbredirparser_debug_data) { return; } - qemu_hexdump((char *)data, stderr, desc, len); + qemu_hexdump(data, stderr, desc, len); } =20 /* diff --git a/net/colo-compare.c b/net/colo-compare.c index 2c20de1537d..550272b3baa 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -494,9 +494,9 @@ sec: g_queue_push_head(&conn->secondary_list, spkt); =20 if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE))= { - qemu_hexdump((char *)ppkt->data, stderr, + qemu_hexdump(ppkt->data, stderr, "colo-compare ppkt", ppkt->size); - qemu_hexdump((char *)spkt->data, stderr, + qemu_hexdump(spkt->data, stderr, "colo-compare spkt", spkt->size); } =20 @@ -535,9 +535,9 @@ static int colo_packet_compare_udp(Packet *spkt, Packet= *ppkt) trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size); trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size= ); if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE))= { - qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt= ", + qemu_hexdump(ppkt->data, stderr, "colo-compare pri pkt", ppkt->size); - qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt= ", + qemu_hexdump(spkt->data, stderr, "colo-compare sec pkt", spkt->size); } return -1; @@ -578,9 +578,9 @@ static int colo_packet_compare_icmp(Packet *spkt, Packe= t *ppkt) trace_colo_compare_icmp_miscompare("Secondary pkt size", spkt->size); if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE))= { - qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt= ", + qemu_hexdump(ppkt->data, stderr, "colo-compare pri pkt", ppkt->size); - qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt= ", + qemu_hexdump(spkt->data, stderr, "colo-compare sec pkt", spkt->size); } return -1; diff --git a/net/net.c b/net/net.c index bbaedb3c7a6..f3e5d533fd7 100644 --- a/net/net.c +++ b/net/net.c @@ -636,7 +636,7 @@ static ssize_t qemu_send_packet_async_with_flags(NetCli= entState *sender, =20 #ifdef DEBUG_NET printf("qemu_send_packet_async:\n"); - qemu_hexdump((const char *)buf, stdout, "net", size); + qemu_hexdump(buf, stdout, "net", size); #endif =20 if (sender->link_down || !sender->peer) { diff --git a/util/hexdump.c b/util/hexdump.c index f879ff0ad6b..faff78970a4 100644 --- a/util/hexdump.c +++ b/util/hexdump.c @@ -16,8 +16,9 @@ #include "qemu/osdep.h" #include "qemu-common.h" =20 -void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t si= ze) +void qemu_hexdump(const void *ptr, FILE *fp, const char *prefix, size_t si= ze) { + const char *buf =3D ptr; unsigned int b, len, i, c; =20 for (b =3D 0; b < size; b +=3D 16) { --=20 2.26.2