[Qemu-devel] [PULL 0/1] Block patches
[PULL for-7.0 0/2] Block patches
1
The following changes since commit 474f3938d79ab36b9231c9ad3b5a9314c2aeacde:
1
The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
2
2
3
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jun-21-2019' into staging (2019-06-21 15:40:50 +0100)
3
Update version for v7.0.0-rc1 release (2022-03-22 22:58:44 +0000)
4
4
5
are available in the Git repository at:
5
are available in the Git repository at:
6
6
7
https://github.com/stefanha/qemu.git tags/block-pull-request
7
https://gitlab.com/stefanha/qemu.git tags/block-pull-request
8
8
9
for you to fetch changes up to 6c11dda922915aaaa032db4462294e8df45f7441:
9
for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:
10
10
11
build: use $(DESTDIR)x instead of $(DESTDIR)/x (2019-06-28 14:12:14 +0100)
11
hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Pull request
15
15
16
No user-visible changes.
16
Philippe found cases where the 0x%d format string was used, leading to
17
misleading output. The patches look harmless and could save people time, so I
18
think it's worth including them in 7.0.
17
19
18
----------------------------------------------------------------
20
----------------------------------------------------------------
19
21
20
Stefan Hajnoczi (1):
22
Philippe Mathieu-Daudé (2):
21
build: use $(DESTDIR)x instead of $(DESTDIR)/x
23
block: Fix misleading hexadecimal format
24
hw: Fix misleading hexadecimal format
22
25
23
Makefile | 16 ++++++++--------
26
block/parallels-ext.c | 2 +-
24
1 file changed, 8 insertions(+), 8 deletions(-)
27
hw/i386/sgx.c | 2 +-
28
hw/i386/trace-events | 6 +++---
29
hw/misc/trace-events | 4 ++--
30
hw/scsi/trace-events | 4 ++--
31
5 files changed, 9 insertions(+), 9 deletions(-)
25
32
26
--
33
--
27
2.21.0
34
2.35.1
28
35
29
diff view generated by jsdifflib
New patch
[PULL for-7.0 1/2] block: Fix misleading hexadecimal format
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
1
2
3
"0x%u" format is very misleading, replace by "0x%x".
4
5
Found running:
6
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/
8
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
10
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
11
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
12
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
13
Reviewed-by: Denis V. Lunev <den@openvz.org>
14
Message-id: 20220323114718.58714-2-philippe.mathieu.daude@gmail.com
15
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
16
---
17
block/parallels-ext.c | 2 +-
18
1 file changed, 1 insertion(+), 1 deletion(-)
19
20
diff --git a/block/parallels-ext.c b/block/parallels-ext.c
21
index XXXXXXX..XXXXXXX 100644
22
--- a/block/parallels-ext.c
23
+++ b/block/parallels-ext.c
24
@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
25
break;
26
27
default:
28
- error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
29
+ error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
30
goto fail;
31
}
32
33
--
34
2.35.1
35
36
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/1] build: use $(DESTDIR)x instead of $(DESTDIR)/x
[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
1
The GNU make manual[1] demonstrates $(DESTDIR)$(bindir)/foo and QEMU
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
mostly follows that. There are just a few instances of
3
$(DESTDIR)/$(bindir)/foo. Fix these inconsistencies.
4
2
5
[1] https://www.gnu.org/software/make/manual/html_node/DESTDIR.html
3
"0x%u" format is very misleading, replace by "0x%x".
6
4
7
Cc: Daniel P. Berrange <berrange@redhat.com>
5
Found running:
8
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
6
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
8
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
10
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
9
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
11
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
10
Message-id: 20190521145318.12787-1-stefanha@redhat.com
12
Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
11
Message-Id: <20190521145318.12787-1-stefanha@redhat.com>
12
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
---
14
---
14
Makefile | 16 ++++++++--------
15
hw/i386/sgx.c | 2 +-
15
1 file changed, 8 insertions(+), 8 deletions(-)
16
hw/i386/trace-events | 6 +++---
17
hw/misc/trace-events | 4 ++--
18
hw/scsi/trace-events | 4 ++--
19
4 files changed, 8 insertions(+), 8 deletions(-)
16
20
17
diff --git a/Makefile b/Makefile
21
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
18
index XXXXXXX..XXXXXXX 100644
22
index XXXXXXX..XXXXXXX 100644
19
--- a/Makefile
23
--- a/hw/i386/sgx.c
20
+++ b/Makefile
24
+++ b/hw/i386/sgx.c
21
@@ -XXX,XX +XXX,XX @@ ifneq ($(DESCS),)
25
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
22
    done
26
}
23
endif
27
24
    for s in $(ICON_SIZES); do \
28
if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
25
-        mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps"; \
29
- error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
26
+        mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
30
+ error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
27
        $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \
31
sgx_epc->size);
28
-            "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \
32
exit(EXIT_FAILURE);
29
+            "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \
33
}
30
    done; \
34
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
31
-    mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps"; \
35
index XXXXXXX..XXXXXXX 100644
32
+    mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps"; \
36
--- a/hw/i386/trace-events
33
    $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_32x32.bmp \
37
+++ b/hw/i386/trace-events
34
-        "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \
38
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
35
-    mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps"; \
39
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
36
+        "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \
40
vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
37
+    mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps"; \
41
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
38
    $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \
42
-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"
39
-        "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
43
+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"
40
-    mkdir -p "$(DESTDIR)/$(qemu_desktopdir)"
44
vtd_page_walk_one_skip_map(uint64_t iova, uint64_t mask, uint64_t translated) "iova 0x%"PRIx64" mask 0x%"PRIx64" translated 0x%"PRIx64
41
+        "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
45
vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64
42
+    mkdir -p "$(DESTDIR)$(qemu_desktopdir)"
46
vtd_page_walk_skip_read(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to unable to read"
43
    $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \
47
vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set"
44
-        "$(DESTDIR)/$(qemu_desktopdir)/qemu.desktop"
48
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)"
45
+        "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop"
49
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
46
ifdef CONFIG_GTK
50
-vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64
47
    $(MAKE) -C po $@
51
-vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d"
48
endif
52
+vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIx16", iova 0x%"PRIx64
53
+vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIx16" %d"
54
vtd_irq_generate(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64
55
vtd_reg_read(uint64_t addr, uint64_t size) "addr 0x%"PRIx64" size 0x%"PRIx64
56
vtd_reg_write(uint64_t addr, uint64_t size, uint64_t val) "addr 0x%"PRIx64" size 0x%"PRIx64" value 0x%"PRIx64
57
diff --git a/hw/misc/trace-events b/hw/misc/trace-events
58
index XXXXXXX..XXXXXXX 100644
59
--- a/hw/misc/trace-events
60
+++ b/hw/misc/trace-events
61
@@ -XXX,XX +XXX,XX @@
62
# See docs/devel/tracing.rst for syntax documentation.
63
64
# allwinner-cpucfg.c
65
-allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIu32
66
+allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIx32
67
allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
68
allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
69
70
@@ -XXX,XX +XXX,XX @@ imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08
71
72
# mos6522.c
73
mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d"
74
-mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRId64 " delta_next=0x%"PRId64
75
+mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64
76
mos6522_set_sr_int(void) "set sr_int"
77
mos6522_write(uint64_t addr, const char *name, uint64_t val) "reg=0x%"PRIx64 " [%s] val=0x%"PRIx64
78
mos6522_read(uint64_t addr, const char *name, unsigned val) "reg=0x%"PRIx64 " [%s] val=0x%x"
79
diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events
80
index XXXXXXX..XXXXXXX 100644
81
--- a/hw/scsi/trace-events
82
+++ b/hw/scsi/trace-events
83
@@ -XXX,XX +XXX,XX @@ lsi_bad_phase_interrupt(void) "Phase mismatch interrupt"
84
lsi_bad_selection(uint32_t id) "Selected absent target %"PRIu32
85
lsi_do_dma_unavailable(void) "DMA no data available"
86
lsi_do_dma(uint64_t addr, int len) "DMA addr=0x%"PRIx64" len=%d"
87
-lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRId32
88
+lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRIx32
89
lsi_add_msg_byte_error(void) "MSG IN data too long"
90
lsi_add_msg_byte(uint8_t data) "MSG IN 0x%02x"
91
lsi_reselect(int id) "Reselected target %d"
92
@@ -XXX,XX +XXX,XX @@ lsi_do_msgout_noop(void) "MSG: No Operation"
93
lsi_do_msgout_extended(uint8_t msg, uint8_t len) "Extended message 0x%x (len %d)"
94
lsi_do_msgout_ignored(const char *msg) "%s (ignored)"
95
lsi_do_msgout_simplequeue(uint8_t select_tag) "SIMPLE queue tag=0x%x"
96
-lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRId32
97
+lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRIx32
98
lsi_do_msgout_clearqueue(uint32_t tag) "MSG: CLEAR QUEUE tag=0x%"PRIx32
99
lsi_do_msgout_busdevicereset(uint32_t tag) "MSG: BUS DEVICE RESET tag=0x%"PRIx32
100
lsi_do_msgout_select(int id) "Select LUN %d"
49
--
101
--
50
2.21.0
102
2.35.1
51
103
52
104
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.