misc: Fix misleading hexadecimal format
cover misc: Fix misleading hexadecimal format
From: Philippe Mathieu-Daudé <[email protected]>
Fix 0x%d misleading format reported here:
https://lore.kernel.org/qemu-devel/[email protected]/
Philippe Mathieu-Daudé (2):
block: Fix misleading hexadecimal format
hw: Fix misleading hexadecimal format
block/parallels-ext.c | 2 +- hw/i386/sgx.c | 2 +- hw/i386/trace-events | 6 +++--- hw/misc/trace-events | 4 ++-- hw/scsi/trace-events | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/2 block: Fix misleading hexadecimal format
From: Philippe Mathieu-Daudé <[email protected]>
"0x%u" format is very misleading, replace by "0x%x".
Found running:
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/
--- block/parallels-ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/parallels-ext.c +1 -1
@@ -261,7 +261,7 @@ static int parallels_parse_format_extension(BlockDriverState *bs,break ;default : -error_setg (errp,"Unknown feature: 0x%" PRIu64, fh.magic); +error_setg (errp,"Unknown feature: 0x%" PRIx64, fh.magic); goto fail; }
Signature · 1 line
2.35.1
Re: [PATCH-for-7.0 1/2] block: Fix misleading hexadecimal format
Quoted 6 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
"0x%u" format is very misleading, replace by "0x%x".
Found running:
Quoted 7 lines
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/Inspired-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/parallels-ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PATCH-for-7.0 1/2] block: Fix misleading hexadecimal format
In reply to Philippe Mathieu-DaudéQuoted 6 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
"0x%u" format is very misleading, replace by "0x%x".
Found running:
Quoted 7 lines
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/Inspired-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/parallels-ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH-for-7.0 1/2] block: Fix misleading hexadecimal format
In reply to Philippe Mathieu-DaudéQuoted 19 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
"0x%u" format is very misleading, replace by "0x%x".
Found running:
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/Inspired-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/parallels-ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)block/parallels-ext.c +0
-0
block/parallels-ext.c static int parallels_parse_format_extension(BlockDriverState *bs, · line 267
Quoted 8 lines
block/parallels-ext.c +1
-1@@ -261,7 +261,7 @@ static int parallels_parse_format_extension(BlockDriverState *bs,break ;default : -error_setg (errp,"Unknown feature: 0x%" PRIu64, fh.magic); +error_setg (errp,"Unknown feature: 0x%" PRIx64, fh.magic); goto fail; }
PATCH 2/2 hw: Fix misleading hexadecimal format
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
"0x%u" format is very misleading, replace by "0x%x".
Found running:
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
--- hw/i386/sgx.c | 2 +- hw/i386/trace-events | 6 +++--- hw/misc/trace-events | 4 ++-- hw/scsi/trace-events | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
hw/i386/sgx.c +1 -1
@@ -315,7 +315,7 @@ void pc_machine_init_sgx_epc(PCMachineState *pcms) }if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) { -error_report ("Size of all 'sgx-epc' =0x%" PRIu64" causes EPC to wrap" , +error_report ("Size of all 'sgx-epc' =0x%" PRIx64" causes EPC to wrap" , sgx_epc->size);exit (EXIT_FAILURE ); }
hw/i386/trace-events +3 -3
@@ -33,15 +33,15 @@ vtd_fault_disabled(void) "Fault processing disabled for context entry" vtd_replay_ce_valid(const char *mode, uint8_t bus, uint8_t dev, uint8_t fn, uint16_t domain, uint64_t hi, uint64_t lo) "%s: replay valid context device %02"PRIx8":%02"PRIx8".%02"PRIx8" domain 0x%"PRIx16" hi 0x%"PRIx64" lo 0x%"PRIx64 vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8 vtd_page_walk_level(uint64_t addr, uint32_t level, uint64_t start, uint64_t end) "walk (base=0x%"PRIx64", level=%"PRIu32") iova range 0x%"PRIx64" - 0x%"PRIx64 -vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIu16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d" +vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIx16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d" vtd_page_walk_one_skip_map(uint64_t iova, uint64_t mask, uint64_t translated) "iova 0x%"PRIx64" mask 0x%"PRIx64" translated 0x%"PRIx64 vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64 vtd_page_walk_skip_read(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to unable to read" vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set" vtd_switch_address_space(uint8_t bus, uint8_t slot, uint8_t fn, bool on) "Device %02x:%02x.%x switching address space (iommu enabled=%d)" vtd_as_unmap_whole(uint8_t bus, uint8_t slot, uint8_t fn, uint64_t iova, uint64_t size) "Device %02x:%02x.%x start 0x%"PRIx64" size 0x%"PRIx64 -vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64 -vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d" +vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIx16", iova 0x%"PRIx64 +vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIx16" %d" vtd_irq_generate(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64 vtd_reg_read(uint64_t addr, uint64_t size) "addr 0x%"PRIx64" size 0x%"PRIx64 vtd_reg_write(uint64_t addr, uint64_t size, uint64_t val) "addr 0x%"PRIx64" size 0x%"PRIx64" value 0x%"PRIx64
hw/misc/trace-events +2 -2
@@ -1,7 +1,7 @@ # See docs/devel/tracing.rst for syntax documentation. # allwinner-cpucfg.c -allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIu32 +allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIx32 allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
@@ -93,7 +93,7 @@ imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08 # mos6522.c mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d" -mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRId64 " delta_next=0x%"PRId64 +mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64 mos6522_set_sr_int(void) "set sr_int" mos6522_write(uint64_t addr, const char *name, uint64_t val) "reg=0x%"PRIx64 " [%s] val=0x%"PRIx64 mos6522_read(uint64_t addr, const char *name, unsigned val) "reg=0x%"PRIx64 " [%s] val=0x%x"
hw/scsi/trace-events +2 -2
@@ -249,7 +249,7 @@ lsi_bad_phase_interrupt(void) "Phase mismatch interrupt" lsi_bad_selection(uint32_t id) "Selected absent target %"PRIu32 lsi_do_dma_unavailable(void) "DMA no data available" lsi_do_dma(uint64_t addr, int len) "DMA addr=0x%"PRIx64" len=%d" -lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRId32 +lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRIx32 lsi_add_msg_byte_error(void) "MSG IN data too long" lsi_add_msg_byte(uint8_t data) "MSG IN 0x%02x" lsi_reselect(int id) "Reselected target %d"
@@ -267,7 +267,7 @@ lsi_do_msgout_noop(void) "MSG: No Operation" lsi_do_msgout_extended(uint8_t msg, uint8_t len) "Extended message 0x%x (len %d)" lsi_do_msgout_ignored(const char *msg) "%s (ignored)" lsi_do_msgout_simplequeue(uint8_t select_tag) "SIMPLE queue tag=0x%x" -lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRId32 +lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRIx32 lsi_do_msgout_clearqueue(uint32_t tag) "MSG: CLEAR QUEUE tag=0x%"PRIx32 lsi_do_msgout_busdevicereset(uint32_t tag) "MSG: BUS DEVICE RESET tag=0x%"PRIx32 lsi_do_msgout_select(int id) "Select LUN %d"
Signature · 1 line
2.35.1
Re: [PATCH-for-7.0 2/2] hw: Fix misleading hexadecimal format
Quoted 8 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
"0x%u" format is very misleading, replace by "0x%x".
Found running:
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
Quoted 8 lines
Inspired-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/i386/sgx.c | 2 +- hw/i386/trace-events | 6 +++--- hw/misc/trace-events | 4 ++-- hw/scsi/trace-events | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Stefan Hajnoczi
AppliedQuoted 9 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
Fix 0x%d misleading format reported here:
https://lore.kernel.org/qemu-devel/[email protected]/Philippe Mathieu-Daudé (2):
block: Fix misleading hexadecimal format
hw: Fix misleading hexadecimal format
Quoted 10 lines
block/parallels-ext.c | 2 +- hw/i386/sgx.c | 2 +- hw/i386/trace-events | 6 +++--- hw/misc/trace-events | 4 ++-- hw/scsi/trace-events | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)Signature · 1 line
2.35.1
Nice fix, thank you!
Applied to my block tree:
https://gitlab.com/stefanha/qemu/commits/block
Stefan