[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 08/27] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprin
From: |
Richard Henderson |
Subject: |
[PATCH v3 08/27] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf |
Date: |
Fri, 12 Apr 2024 00:33:27 -0700 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1.
Using qemu_hexdump_line both fixes the deprecation warning and
simplifies the code base.
Note that this drops the "0x" prefix to every byte, which should
be of no consequence to tracing.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/scsi/scsi-disk.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 4bd7af9d0c..f386a2f01c 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -2648,19 +2648,12 @@ static const SCSIReqOps *const
scsi_disk_reqops_dispatch[256] = {
static void scsi_disk_new_request_dump(uint32_t lun, uint32_t tag, uint8_t
*buf)
{
- int i;
int len = scsi_cdb_length(buf);
- char *line_buffer, *p;
+ g_autoptr(GString) str = NULL;
assert(len > 0 && len <= 16);
- line_buffer = g_malloc(len * 5 + 1);
-
- for (i = 0, p = line_buffer; i < len; i++) {
- p += sprintf(p, " 0x%02x", buf[i]);
- }
- trace_scsi_disk_new_request(lun, tag, line_buffer);
-
- g_free(line_buffer);
+ str = qemu_hexdump_line(NULL, buf, len, 1, 0);
+ trace_scsi_disk_new_request(lun, tag, str->str);
}
static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun,
--
2.34.1
- Re: [PATCH v3 03/27] util/hexdump: Use a GString for qemu_hexdump_line, (continued)
- [PATCH v3 02/27] util/hexdump: Remove ascii parameter from qemu_hexdump_line, Richard Henderson, 2024/04/12
- [PATCH v3 04/27] util/hexdump: Add unit_len and block_len to qemu_hexdump_line, Richard Henderson, 2024/04/12
- [PATCH v3 06/27] hw/mips/malta: Add re-usable rng_seed_hex_new() method, Richard Henderson, 2024/04/12
- [PATCH v3 07/27] system/qtest: Replace sprintf by qemu_hexdump_line, Richard Henderson, 2024/04/12
- [PATCH v3 09/27] hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf, Richard Henderson, 2024/04/12
- [PATCH v3 10/27] hw/dma/pl330: Use qemu_hexdump_line to avoid sprintf, Richard Henderson, 2024/04/12
- [PATCH v3 08/27] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf,
Richard Henderson <=
- [PATCH v3 12/27] disas/m68k: Replace sprintf() by snprintf(), Richard Henderson, 2024/04/12
- [PATCH v3 13/27] disas/microblaze: Replace sprintf() by snprintf(), Richard Henderson, 2024/04/12
- [PATCH v3 15/27] target/microblaze: Re-indent print_insn_microblaze, Richard Henderson, 2024/04/12
- [PATCH v3 14/27] disas/microblaze: Split out print_immval_addr, Richard Henderson, 2024/04/12
- [PATCH v3 16/27] disas/microblaze: Merge op->name output into each fprintf, Richard Henderson, 2024/04/12
- [PATCH v3 11/27] backends/tpm: Use qemu_hexdump_line to avoid sprintf, Richard Henderson, 2024/04/12
- [PATCH v3 05/27] util/hexdump: Inline g_string_append_printf "%02x", Richard Henderson, 2024/04/12