[Qemu-devel] [PULL 0/2] Block patches
[PULL for-7.0 0/2] Block patches
1
The following changes since commit 7260438b7056469610ee166f7abe9ff8a26b8b16:
1
The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
2
2
3
Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-3.2-part2' into staging (2019-01-14 11:41:43 +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 fef1660132b0f25bf2d275d7f986ddcfe19a4426:
9
for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:
10
10
11
aio-posix: Fix concurrent aio_poll/set_fd_handler. (2019-01-14 14:09:41 +0000)
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
Remy Noel (2):
22
Philippe Mathieu-Daudé (2):
21
aio-posix: Unregister fd from ctx epoll when removing fd_handler.
23
block: Fix misleading hexadecimal format
22
aio-posix: Fix concurrent aio_poll/set_fd_handler.
24
hw: Fix misleading hexadecimal format
23
25
24
util/aio-posix.c | 90 +++++++++++++++++++++++++++++-------------------
26
block/parallels-ext.c | 2 +-
25
util/aio-win32.c | 67 ++++++++++++++++-------------------
27
hw/i386/sgx.c | 2 +-
26
2 files changed, 84 insertions(+), 73 deletions(-)
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(-)
27
32
28
--
33
--
29
2.20.1
34
2.35.1
30
35
31
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/2] aio-posix: Unregister fd from ctx epoll when removing fd_handler.
[PULL for-7.0 1/2] block: Fix misleading hexadecimal format
1
From: Remy Noel <remy.noel@blade-group.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
Cleaning the events will cause aio_epoll_update to unregister the fd.
3
"0x%u" format is very misleading, replace by "0x%x".
4
Otherwise, the fd is kept registered until it is destroyed.
5
4
6
Signed-off-by: Remy Noel <remy.noel@blade-group.com>
5
Found running:
7
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
6
8
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/
9
Message-id: 20181220152030.28035-2-remy.noel@blade-group.com
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
10
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
15
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
11
---
16
---
12
util/aio-posix.c | 3 +++
17
block/parallels-ext.c | 2 +-
13
1 file changed, 3 insertions(+)
18
1 file changed, 1 insertion(+), 1 deletion(-)
14
19
15
diff --git a/util/aio-posix.c b/util/aio-posix.c
20
diff --git a/block/parallels-ext.c b/block/parallels-ext.c
16
index XXXXXXX..XXXXXXX 100644
21
index XXXXXXX..XXXXXXX 100644
17
--- a/util/aio-posix.c
22
--- a/block/parallels-ext.c
18
+++ b/util/aio-posix.c
23
+++ b/block/parallels-ext.c
19
@@ -XXX,XX +XXX,XX @@ void aio_set_fd_handler(AioContext *ctx,
24
@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
20
QLIST_REMOVE(node, node);
25
break;
21
deleted = true;
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;
22
}
31
}
23
+ /* Clean events in order to unregister fd from the ctx epoll. */
32
24
+ node->pfd.events = 0;
25
+
26
poll_disable_change = -!node->io_poll;
27
} else {
28
poll_disable_change = !io_poll - (node && !node->io_poll);
29
--
33
--
30
2.20.1
34
2.35.1
31
35
32
36
diff view generated by jsdifflib
[Qemu-devel] [PULL 2/2] aio-posix: Fix concurrent aio_poll/set_fd_handler.
[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
1
From: Remy Noel <remy.noel@blade-group.com>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
It is possible for an io_poll callback to be concurrently executed along
3
"0x%u" format is very misleading, replace by "0x%x".
4
with an aio_set_fd_handlers. This can cause all sorts of problems, like
5
a NULL callback or a bad opaque pointer.
6
4
7
This changes set_fd_handlers so that it no longer modify existing handlers
5
Found running:
8
entries and instead, always insert those after having proper initialisation.
9
6
10
Tested-by: Stefan Hajnoczi <stefanha@redhat.com>
7
$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
11
Signed-off-by: Remy Noel <remy.noel@blade-group.com>
8
12
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
9
Inspired-by: Richard Henderson <richard.henderson@linaro.org>
13
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
10
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
14
Message-id: 20181220152030.28035-3-remy.noel@blade-group.com
11
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
12
Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
15
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
16
---
14
---
17
util/aio-posix.c | 89 ++++++++++++++++++++++++++++--------------------
15
hw/i386/sgx.c | 2 +-
18
util/aio-win32.c | 67 ++++++++++++++++--------------------
16
hw/i386/trace-events | 6 +++---
19
2 files changed, 82 insertions(+), 74 deletions(-)
17
hw/misc/trace-events | 4 ++--
18
hw/scsi/trace-events | 4 ++--
19
4 files changed, 8 insertions(+), 8 deletions(-)
20
20
21
diff --git a/util/aio-posix.c b/util/aio-posix.c
21
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
22
index XXXXXXX..XXXXXXX 100644
22
index XXXXXXX..XXXXXXX 100644
23
--- a/util/aio-posix.c
23
--- a/hw/i386/sgx.c
24
+++ b/util/aio-posix.c
24
+++ b/hw/i386/sgx.c
25
@@ -XXX,XX +XXX,XX @@ static AioHandler *find_aio_handler(AioContext *ctx, int fd)
25
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
26
return NULL;
27
}
28
29
+static bool aio_remove_fd_handler(AioContext *ctx, AioHandler *node)
30
+{
31
+ /* If the GSource is in the process of being destroyed then
32
+ * g_source_remove_poll() causes an assertion failure. Skip
33
+ * removal in that case, because glib cleans up its state during
34
+ * destruction anyway.
35
+ */
36
+ if (!g_source_is_destroyed(&ctx->source)) {
37
+ g_source_remove_poll(&ctx->source, &node->pfd);
38
+ }
39
+
40
+ /* If a read is in progress, just mark the node as deleted */
41
+ if (qemu_lockcnt_count(&ctx->list_lock)) {
42
+ node->deleted = 1;
43
+ node->pfd.revents = 0;
44
+ return false;
45
+ }
46
+ /* Otherwise, delete it for real. We can't just mark it as
47
+ * deleted because deleted nodes are only cleaned up while
48
+ * no one is walking the handlers list.
49
+ */
50
+ QLIST_REMOVE(node, node);
51
+ return true;
52
+}
53
+
54
void aio_set_fd_handler(AioContext *ctx,
55
int fd,
56
bool is_external,
57
@@ -XXX,XX +XXX,XX @@ void aio_set_fd_handler(AioContext *ctx,
58
void *opaque)
59
{
60
AioHandler *node;
61
+ AioHandler *new_node = NULL;
62
bool is_new = false;
63
bool deleted = false;
64
int poll_disable_change;
65
@@ -XXX,XX +XXX,XX @@ void aio_set_fd_handler(AioContext *ctx,
66
qemu_lockcnt_unlock(&ctx->list_lock);
67
return;
68
}
69
-
70
- /* If the GSource is in the process of being destroyed then
71
- * g_source_remove_poll() causes an assertion failure. Skip
72
- * removal in that case, because glib cleans up its state during
73
- * destruction anyway.
74
- */
75
- if (!g_source_is_destroyed(&ctx->source)) {
76
- g_source_remove_poll(&ctx->source, &node->pfd);
77
- }
78
-
79
- /* If a read is in progress, just mark the node as deleted */
80
- if (qemu_lockcnt_count(&ctx->list_lock)) {
81
- node->deleted = 1;
82
- node->pfd.revents = 0;
83
- } else {
84
- /* Otherwise, delete it for real. We can't just mark it as
85
- * deleted because deleted nodes are only cleaned up while
86
- * no one is walking the handlers list.
87
- */
88
- QLIST_REMOVE(node, node);
89
- deleted = true;
90
- }
91
/* Clean events in order to unregister fd from the ctx epoll. */
92
node->pfd.events = 0;
93
94
@@ -XXX,XX +XXX,XX @@ void aio_set_fd_handler(AioContext *ctx,
95
} else {
96
poll_disable_change = !io_poll - (node && !node->io_poll);
97
if (node == NULL) {
98
- /* Alloc and insert if it's not already there */
99
- node = g_new0(AioHandler, 1);
100
- node->pfd.fd = fd;
101
- QLIST_INSERT_HEAD_RCU(&ctx->aio_handlers, node, node);
102
-
103
- g_source_add_poll(&ctx->source, &node->pfd);
104
is_new = true;
105
}
106
+ /* Alloc and insert if it's not already there */
107
+ new_node = g_new0(AioHandler, 1);
108
109
/* Update handler with latest information */
110
- node->io_read = io_read;
111
- node->io_write = io_write;
112
- node->io_poll = io_poll;
113
- node->opaque = opaque;
114
- node->is_external = is_external;
115
+ new_node->io_read = io_read;
116
+ new_node->io_write = io_write;
117
+ new_node->io_poll = io_poll;
118
+ new_node->opaque = opaque;
119
+ new_node->is_external = is_external;
120
121
- node->pfd.events = (io_read ? G_IO_IN | G_IO_HUP | G_IO_ERR : 0);
122
- node->pfd.events |= (io_write ? G_IO_OUT | G_IO_ERR : 0);
123
+ if (is_new) {
124
+ new_node->pfd.fd = fd;
125
+ } else {
126
+ new_node->pfd = node->pfd;
127
+ }
128
+ g_source_add_poll(&ctx->source, &new_node->pfd);
129
+
130
+ new_node->pfd.events = (io_read ? G_IO_IN | G_IO_HUP | G_IO_ERR : 0);
131
+ new_node->pfd.events |= (io_write ? G_IO_OUT | G_IO_ERR : 0);
132
+
133
+ QLIST_INSERT_HEAD_RCU(&ctx->aio_handlers, new_node, node);
134
+ }
135
+ if (node) {
136
+ deleted = aio_remove_fd_handler(ctx, node);
137
}
26
}
138
27
139
/* No need to order poll_disable_cnt writes against other updates;
28
if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
140
@@ -XXX,XX +XXX,XX @@ void aio_set_fd_handler(AioContext *ctx,
29
- error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
141
atomic_set(&ctx->poll_disable_cnt,
30
+ error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
142
atomic_read(&ctx->poll_disable_cnt) + poll_disable_change);
31
sgx_epc->size);
143
32
exit(EXIT_FAILURE);
144
- aio_epoll_update(ctx, node, is_new);
33
}
145
+ if (new_node) {
34
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
146
+ aio_epoll_update(ctx, new_node, is_new);
147
+ } else if (node) {
148
+ /* Unregister deleted fd_handler */
149
+ aio_epoll_update(ctx, node, false);
150
+ }
151
qemu_lockcnt_unlock(&ctx->list_lock);
152
aio_notify(ctx);
153
154
diff --git a/util/aio-win32.c b/util/aio-win32.c
155
index XXXXXXX..XXXXXXX 100644
35
index XXXXXXX..XXXXXXX 100644
156
--- a/util/aio-win32.c
36
--- a/hw/i386/trace-events
157
+++ b/util/aio-win32.c
37
+++ b/hw/i386/trace-events
158
@@ -XXX,XX +XXX,XX @@ struct AioHandler {
38
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
159
QLIST_ENTRY(AioHandler) node;
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
160
};
40
vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
161
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
162
+static void aio_remove_fd_handler(AioContext *ctx, AioHandler *node)
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"
163
+{
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"
164
+ /* If aio_poll is in progress, just mark the node as deleted */
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
165
+ if (qemu_lockcnt_count(&ctx->list_lock)) {
45
vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64
166
+ node->deleted = 1;
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"
167
+ node->pfd.revents = 0;
47
vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set"
168
+ } else {
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)"
169
+ /* Otherwise, delete it for real. We can't just mark it as
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
170
+ * deleted because deleted nodes are only cleaned up after
50
-vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64
171
+ * releasing the list_lock.
51
-vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d"
172
+ */
52
+vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIx16", iova 0x%"PRIx64
173
+ QLIST_REMOVE(node, node);
53
+vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIx16" %d"
174
+ g_free(node);
54
vtd_irq_generate(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64
175
+ }
55
vtd_reg_read(uint64_t addr, uint64_t size) "addr 0x%"PRIx64" size 0x%"PRIx64
176
+}
56
vtd_reg_write(uint64_t addr, uint64_t size, uint64_t val) "addr 0x%"PRIx64" size 0x%"PRIx64" value 0x%"PRIx64
177
+
57
diff --git a/hw/misc/trace-events b/hw/misc/trace-events
178
void aio_set_fd_handler(AioContext *ctx,
58
index XXXXXXX..XXXXXXX 100644
179
int fd,
59
--- a/hw/misc/trace-events
180
bool is_external,
60
+++ b/hw/misc/trace-events
181
@@ -XXX,XX +XXX,XX @@ void aio_set_fd_handler(AioContext *ctx,
61
@@ -XXX,XX +XXX,XX @@
182
void *opaque)
62
# See docs/devel/tracing.rst for syntax documentation.
183
{
63
184
/* fd is a SOCKET in our case */
64
# allwinner-cpucfg.c
185
- AioHandler *node;
65
-allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIu32
186
+ AioHandler *old_node;
66
+allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIx32
187
+ AioHandler *node = NULL;
67
allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
188
68
allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
189
qemu_lockcnt_lock(&ctx->list_lock);
69
190
- QLIST_FOREACH(node, &ctx->aio_handlers, node) {
70
@@ -XXX,XX +XXX,XX @@ imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08
191
- if (node->pfd.fd == fd && !node->deleted) {
71
192
+ QLIST_FOREACH(old_node, &ctx->aio_handlers, node) {
72
# mos6522.c
193
+ if (old_node->pfd.fd == fd && !old_node->deleted) {
73
mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d"
194
break;
74
-mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRId64 " delta_next=0x%"PRId64
195
}
75
+mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64
196
}
76
mos6522_set_sr_int(void) "set sr_int"
197
77
mos6522_write(uint64_t addr, const char *name, uint64_t val) "reg=0x%"PRIx64 " [%s] val=0x%"PRIx64
198
- /* Are we deleting the fd handler? */
78
mos6522_read(uint64_t addr, const char *name, unsigned val) "reg=0x%"PRIx64 " [%s] val=0x%x"
199
- if (!io_read && !io_write) {
79
diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events
200
- if (node) {
80
index XXXXXXX..XXXXXXX 100644
201
- /* If aio_poll is in progress, just mark the node as deleted */
81
--- a/hw/scsi/trace-events
202
- if (qemu_lockcnt_count(&ctx->list_lock)) {
82
+++ b/hw/scsi/trace-events
203
- node->deleted = 1;
83
@@ -XXX,XX +XXX,XX @@ lsi_bad_phase_interrupt(void) "Phase mismatch interrupt"
204
- node->pfd.revents = 0;
84
lsi_bad_selection(uint32_t id) "Selected absent target %"PRIu32
205
- } else {
85
lsi_do_dma_unavailable(void) "DMA no data available"
206
- /* Otherwise, delete it for real. We can't just mark it as
86
lsi_do_dma(uint64_t addr, int len) "DMA addr=0x%"PRIx64" len=%d"
207
- * deleted because deleted nodes are only cleaned up after
87
-lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRId32
208
- * releasing the list_lock.
88
+lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRIx32
209
- */
89
lsi_add_msg_byte_error(void) "MSG IN data too long"
210
- QLIST_REMOVE(node, node);
90
lsi_add_msg_byte(uint8_t data) "MSG IN 0x%02x"
211
- g_free(node);
91
lsi_reselect(int id) "Reselected target %d"
212
- }
92
@@ -XXX,XX +XXX,XX @@ lsi_do_msgout_noop(void) "MSG: No Operation"
213
- }
93
lsi_do_msgout_extended(uint8_t msg, uint8_t len) "Extended message 0x%x (len %d)"
214
- } else {
94
lsi_do_msgout_ignored(const char *msg) "%s (ignored)"
215
+ if (io_read || io_write) {
95
lsi_do_msgout_simplequeue(uint8_t select_tag) "SIMPLE queue tag=0x%x"
216
HANDLE event;
96
-lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRId32
217
long bitmask = 0;
97
+lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRIx32
218
98
lsi_do_msgout_clearqueue(uint32_t tag) "MSG: CLEAR QUEUE tag=0x%"PRIx32
219
- if (node == NULL) {
99
lsi_do_msgout_busdevicereset(uint32_t tag) "MSG: BUS DEVICE RESET tag=0x%"PRIx32
220
- /* Alloc and insert if it's not already there */
100
lsi_do_msgout_select(int id) "Select LUN %d"
221
- node = g_new0(AioHandler, 1);
222
- node->pfd.fd = fd;
223
- QLIST_INSERT_HEAD_RCU(&ctx->aio_handlers, node, node);
224
- }
225
+ /* Alloc and insert if it's not already there */
226
+ node = g_new0(AioHandler, 1);
227
+ node->pfd.fd = fd;
228
229
node->pfd.events = 0;
230
if (node->io_read) {
231
@@ -XXX,XX +XXX,XX @@ void aio_set_fd_handler(AioContext *ctx,
232
bitmask |= FD_WRITE | FD_CONNECT;
233
}
234
235
+ QLIST_INSERT_HEAD_RCU(&ctx->aio_handlers, node, node);
236
event = event_notifier_get_handle(&ctx->notifier);
237
WSAEventSelect(node->pfd.fd, event, bitmask);
238
}
239
+ if (old_node) {
240
+ aio_remove_fd_handler(ctx, old_node);
241
+ }
242
243
qemu_lockcnt_unlock(&ctx->list_lock);
244
aio_notify(ctx);
245
@@ -XXX,XX +XXX,XX @@ void aio_set_event_notifier(AioContext *ctx,
246
if (node) {
247
g_source_remove_poll(&ctx->source, &node->pfd);
248
249
- /* aio_poll is in progress, just mark the node as deleted */
250
- if (qemu_lockcnt_count(&ctx->list_lock)) {
251
- node->deleted = 1;
252
- node->pfd.revents = 0;
253
- } else {
254
- /* Otherwise, delete it for real. We can't just mark it as
255
- * deleted because deleted nodes are only cleaned up after
256
- * releasing the list_lock.
257
- */
258
- QLIST_REMOVE(node, node);
259
- g_free(node);
260
- }
261
+ aio_remove_fd_handler(ctx, node);
262
}
263
} else {
264
if (node == NULL) {
265
--
101
--
266
2.20.1
102
2.35.1
267
103
268
104
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.