[Qemu-devel] [PULL for-2.11 0/1] Block patches
[PULL for-7.0 0/2] Block patches
1
The following changes since commit 8048082f7a11040a366942a2de8abb4c3d0020c9:
1
The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
2
2
3
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-11-15-1' into staging (2017-11-16 11:34:24 +0000)
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
git://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 341e0b5658681f46680024cdbfc998717d85cc35:
9
for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:
10
10
11
throttle-groups: forget timer and schedule next TGM on detach (2017-11-16 14:12:57 +0000)
11
hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)
12
13
----------------------------------------------------------------
14
Pull request
15
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.
12
19
13
----------------------------------------------------------------
20
----------------------------------------------------------------
14
21
15
----------------------------------------------------------------
22
Philippe Mathieu-Daudé (2):
23
block: Fix misleading hexadecimal format
24
hw: Fix misleading hexadecimal format
16
25
17
Stefan Hajnoczi (1):
26
block/parallels-ext.c | 2 +-
18
throttle-groups: forget timer and schedule next TGM on detach
27
hw/i386/sgx.c | 2 +-
19
28
hw/i386/trace-events | 6 +++---
20
block/throttle-groups.c | 12 ++++++++++++
29
hw/misc/trace-events | 4 ++--
21
1 file changed, 12 insertions(+)
30
hw/scsi/trace-events | 4 ++--
31
5 files changed, 9 insertions(+), 9 deletions(-)
22
32
23
--
33
--
24
2.13.6
34
2.35.1
25
35
26
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 for-2.11 1/1] throttle-groups: forget timer and schedule next TGM on detach
[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
1
tg->any_timer_armed[] must be cleared when detaching pending timers from
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
the AioContext. Failure to do so leads to hung I/O because it looks
3
like there are still timers pending when in fact they have been removed.
4
2
5
Other ThrottleGroupMembers might have requests pending too so it's
3
"0x%u" format is very misleading, replace by "0x%x".
6
necessary to schedule the next TGM so it can set a timer.
7
4
8
This patch fixes hung I/O when QEMU is launched with drives that are in
5
Found running:
9
the same throttling group:
10
6
11
(guest)$ dd if=/dev/zero of=/dev/vdb oflag=direct bs=512 &
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
12
(guest)$ dd if=/dev/zero of=/dev/vdc oflag=direct bs=512 &
13
(qemu) stop
14
(qemu) cont
15
...I/O is stuck...
16
8
17
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
18
Message-id: 20171116112150.27607-1-stefanha@redhat.com
10
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
11
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
12
Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
19
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
20
---
14
---
21
block/throttle-groups.c | 12 ++++++++++++
15
hw/i386/sgx.c | 2 +-
22
1 file changed, 12 insertions(+)
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(-)
23
20
24
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
21
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
25
index XXXXXXX..XXXXXXX 100644
22
index XXXXXXX..XXXXXXX 100644
26
--- a/block/throttle-groups.c
23
--- a/hw/i386/sgx.c
27
+++ b/block/throttle-groups.c
24
+++ b/hw/i386/sgx.c
28
@@ -XXX,XX +XXX,XX @@ void throttle_group_attach_aio_context(ThrottleGroupMember *tgm,
25
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
29
26
}
30
void throttle_group_detach_aio_context(ThrottleGroupMember *tgm)
27
31
{
28
if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
32
+ ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts);
29
- error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
33
ThrottleTimers *tt = &tgm->throttle_timers;
30
+ error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
34
+ int i;
31
sgx_epc->size);
35
32
exit(EXIT_FAILURE);
36
/* Requests must have been drained */
33
}
37
assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0);
34
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
38
assert(qemu_co_queue_empty(&tgm->throttled_reqs[0]));
35
index XXXXXXX..XXXXXXX 100644
39
assert(qemu_co_queue_empty(&tgm->throttled_reqs[1]));
36
--- a/hw/i386/trace-events
40
37
+++ b/hw/i386/trace-events
41
+ /* Kick off next ThrottleGroupMember, if necessary */
38
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
42
+ qemu_mutex_lock(&tg->lock);
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
43
+ for (i = 0; i < 2; i++) {
40
vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
44
+ if (timer_pending(tt->timers[i])) {
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
45
+ tg->any_timer_armed[i] = false;
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"
46
+ schedule_next_request(tgm, i);
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"
47
+ }
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
48
+ }
45
vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64
49
+ qemu_mutex_unlock(&tg->lock);
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"
50
+
47
vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set"
51
throttle_timers_detach_aio_context(tt);
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)"
52
tgm->aio_context = NULL;
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
53
}
50
-vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64
51
-vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d"
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"
54
--
101
--
55
2.13.6
102
2.35.1
56
103
57
104
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.