[PULL 0/2] Block patches
[PULL for-7.0 0/2] Block patches
1
The following changes since commit 58560ad254fbda71d4daa6622d71683190070ee2:
1
The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
2
2
3
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191024' into staging (2019-10-24 16:22:58 +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 d154ef37ff885918fa3e512fd7a8e42870291667:
9
for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:
10
10
11
yield_until_fd_readable: make it work with any AioContect (2019-10-25 14:38:29 +0200)
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
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.
19
16
----------------------------------------------------------------
20
----------------------------------------------------------------
17
21
18
Dietmar Maurer (1):
22
Philippe Mathieu-Daudé (2):
19
yield_until_fd_readable: make it work with any AioContect
23
block: Fix misleading hexadecimal format
24
hw: Fix misleading hexadecimal format
20
25
21
Julia Suvorova (1):
26
block/parallels-ext.c | 2 +-
22
virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()
27
hw/i386/sgx.c | 2 +-
23
28
hw/i386/trace-events | 6 +++---
24
hw/block/virtio-blk.c | 1 +
29
hw/misc/trace-events | 4 ++--
25
util/qemu-coroutine-io.c | 7 +++++--
30
hw/scsi/trace-events | 4 ++--
26
2 files changed, 6 insertions(+), 2 deletions(-)
31
5 files changed, 9 insertions(+), 9 deletions(-)
27
32
28
--
33
--
29
2.21.0
34
2.35.1
30
35
31
diff view generated by jsdifflib
[PULL 2/2] yield_until_fd_readable: make it work with any AioContect
[PULL for-7.0 1/2] block: Fix misleading hexadecimal format
1
From: Dietmar Maurer <dietmar@proxmox.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
Simply use qemu_get_current_aio_context().
3
"0x%u" format is very misleading, replace by "0x%x".
4
4
5
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
5
Found running:
6
Message-Id: <20191024045610.9071-1-dietmar@proxmox.com>
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
7
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
15
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
8
---
16
---
9
util/qemu-coroutine-io.c | 7 +++++--
17
block/parallels-ext.c | 2 +-
10
1 file changed, 5 insertions(+), 2 deletions(-)
18
1 file changed, 1 insertion(+), 1 deletion(-)
11
19
12
diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
20
diff --git a/block/parallels-ext.c b/block/parallels-ext.c
13
index XXXXXXX..XXXXXXX 100644
21
index XXXXXXX..XXXXXXX 100644
14
--- a/util/qemu-coroutine-io.c
22
--- a/block/parallels-ext.c
15
+++ b/util/qemu-coroutine-io.c
23
+++ b/block/parallels-ext.c
16
@@ -XXX,XX +XXX,XX @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send)
24
@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
17
}
25
break;
18
26
19
typedef struct {
27
default:
20
+ AioContext *ctx;
28
- error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
21
Coroutine *co;
29
+ error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
22
int fd;
30
goto fail;
23
} FDYieldUntilData;
31
}
24
@@ -XXX,XX +XXX,XX @@ typedef struct {
32
25
static void fd_coroutine_enter(void *opaque)
26
{
27
FDYieldUntilData *data = opaque;
28
- qemu_set_fd_handler(data->fd, NULL, NULL, NULL);
29
+ aio_set_fd_handler(data->ctx, data->fd, false, NULL, NULL, NULL, NULL);
30
qemu_coroutine_enter(data->co);
31
}
32
33
@@ -XXX,XX +XXX,XX @@ void coroutine_fn yield_until_fd_readable(int fd)
34
FDYieldUntilData data;
35
36
assert(qemu_in_coroutine());
37
+ data.ctx = qemu_get_current_aio_context();
38
data.co = qemu_coroutine_self();
39
data.fd = fd;
40
- qemu_set_fd_handler(fd, fd_coroutine_enter, NULL, &data);
41
+ aio_set_fd_handler(
42
+ data.ctx, fd, false, fd_coroutine_enter, NULL, NULL, &data);
43
qemu_coroutine_yield();
44
}
45
--
33
--
46
2.21.0
34
2.35.1
47
35
48
36
diff view generated by jsdifflib
[PULL 1/2] virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()
[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
1
From: Julia Suvorova <jusual@redhat.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
QEMU does not wait for completed I/O requests, assuming that the guest
3
"0x%u" format is very misleading, replace by "0x%x".
4
driver will reset the device before calling unrealize(). This does not
5
happen on Windows, and QEMU crashes in virtio_notify(), getting the
6
result of a completed I/O request on hot-unplugged device.
7
4
8
Signed-off-by: Julia Suvorova <jusual@redhat.com>
5
Found running:
9
Message-Id: <20191018142856.31870-1-jusual@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>
11
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
12
Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
10
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
11
---
14
---
12
hw/block/virtio-blk.c | 1 +
15
hw/i386/sgx.c | 2 +-
13
1 file changed, 1 insertion(+)
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(-)
14
20
15
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
21
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
16
index XXXXXXX..XXXXXXX 100644
22
index XXXXXXX..XXXXXXX 100644
17
--- a/hw/block/virtio-blk.c
23
--- a/hw/i386/sgx.c
18
+++ b/hw/block/virtio-blk.c
24
+++ b/hw/i386/sgx.c
19
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
25
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
20
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
26
}
21
VirtIOBlock *s = VIRTIO_BLK(dev);
27
22
28
if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
23
+ blk_drain(s->blk);
29
- error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
24
virtio_blk_data_plane_destroy(s->dataplane);
30
+ error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
25
s->dataplane = NULL;
31
sgx_epc->size);
26
qemu_del_vm_change_state_handler(s->change);
32
exit(EXIT_FAILURE);
33
}
34
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
35
index XXXXXXX..XXXXXXX 100644
36
--- a/hw/i386/trace-events
37
+++ b/hw/i386/trace-events
38
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
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
40
vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
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
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"
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"
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
45
vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64
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"
47
vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set"
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)"
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
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"
27
--
101
--
28
2.21.0
102
2.35.1
29
103
30
104
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.