[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/13] util/vhost-user-server: drop unnecessary watch deletion
From: |
Stefan Hajnoczi |
Subject: |
[PATCH v2 04/13] util/vhost-user-server: drop unnecessary watch deletion |
Date: |
Thu, 24 Sep 2020 16:15:40 +0100 |
Explicitly deleting watches is not necessary since libvhost-user calls
remove_watch() during vu_deinit(). Add an assertion to check this
though.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
util/vhost-user-server.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c
index ebe47885f5..ebb850731b 100644
--- a/util/vhost-user-server.c
+++ b/util/vhost-user-server.c
@@ -48,21 +48,6 @@ static void close_client(VuServer *server)
/* When this is set vu_client_trip will stop new processing vhost-user
message */
server->sioc = NULL;
- VuFdWatch *vu_fd_watch, *next;
- QTAILQ_FOREACH_SAFE(vu_fd_watch, &server->vu_fd_watches, next, next) {
- aio_set_fd_handler(server->ioc->ctx, vu_fd_watch->fd, true, NULL,
- NULL, NULL, NULL);
- }
-
- while (!QTAILQ_EMPTY(&server->vu_fd_watches)) {
- QTAILQ_FOREACH_SAFE(vu_fd_watch, &server->vu_fd_watches, next, next) {
- if (!vu_fd_watch->processing) {
- QTAILQ_REMOVE(&server->vu_fd_watches, vu_fd_watch, next);
- g_free(vu_fd_watch);
- }
- }
- }
-
while (server->processing_msg) {
if (server->ioc->read_coroutine) {
server->ioc->read_coroutine = NULL;
@@ -73,6 +58,10 @@ static void close_client(VuServer *server)
}
vu_deinit(&server->vu_dev);
+
+ /* vu_deinit() should have called remove_watch() */
+ assert(QTAILQ_EMPTY(&server->vu_fd_watches));
+
object_unref(OBJECT(sioc));
object_unref(OBJECT(server->ioc));
}
--
2.26.2
- [PATCH v2 00/13] block/export: convert vhost-user-blk-server to block exports API, Stefan Hajnoczi, 2020/09/24
- [PATCH v2 01/13] block/export: shorten serial string to fit, Stefan Hajnoczi, 2020/09/24
- [PATCH v2 02/13] util/vhost-user-server: s/fileds/fields/ typo fix, Stefan Hajnoczi, 2020/09/24
- [PATCH v2 03/13] util/vhost-user-server: drop unnecessary QOM cast, Stefan Hajnoczi, 2020/09/24
- [PATCH v2 04/13] util/vhost-user-server: drop unnecessary watch deletion,
Stefan Hajnoczi <=
- [PATCH v2 05/13] block/export: consolidate request structs into VuBlockReq, Stefan Hajnoczi, 2020/09/24
- [PATCH v2 06/13] util/vhost-user-server: drop unused DevicePanicNotifier, Stefan Hajnoczi, 2020/09/24
- [PATCH v2 07/13] util/vhost-user-server: fix memory leak in vu_message_read(), Stefan Hajnoczi, 2020/09/24
- [PATCH v2 08/13] util/vhost-user-server: check EOF when reading payload, Stefan Hajnoczi, 2020/09/24
- [PATCH v2 09/13] util/vhost-user-server: rework vu_client_trip() coroutine lifecycle, Stefan Hajnoczi, 2020/09/24
- [PATCH v2 10/13] block/export: report flush errors, Stefan Hajnoczi, 2020/09/24
- [PATCH v2 11/13] block/export: convert vhost-user-blk server to block export API, Stefan Hajnoczi, 2020/09/24