Quellcode durchsuchen

iothread: Remove unused Error** argument in aio_context_set_aio_params

aio_context_set_aio_params() doesn't use its undocumented
Error** argument. Remove it to simplify.

Note this removes a use of "unchecked Error**" in
iothread_set_aio_context_params().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20231120171806.19361-1-philmd@linaro.org>
Philippe Mathieu-Daudé vor 1 Jahr
Ursprung
Commit
897a06c6d7
5 geänderte Dateien mit 5 neuen und 12 gelöschten Zeilen
  1. 1 2
      include/block/aio.h
  2. 1 2
      iothread.c
  3. 1 2
      util/aio-posix.c
  4. 1 2
      util/aio-win32.c
  5. 1 4
      util/main-loop.c

+ 1 - 2
include/block/aio.h

@@ -699,8 +699,7 @@ void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns,
  * @max_batch: maximum number of requests in a batch, 0 means that the
  * @max_batch: maximum number of requests in a batch, 0 means that the
  *             engine will use its default
  *             engine will use its default
  */
  */
-void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch,
-                                Error **errp);
+void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch);
 
 
 /**
 /**
  * aio_context_set_thread_pool_params:
  * aio_context_set_thread_pool_params:

+ 1 - 2
iothread.c

@@ -170,8 +170,7 @@ static void iothread_set_aio_context_params(EventLoopBase *base, Error **errp)
     }
     }
 
 
     aio_context_set_aio_params(iothread->ctx,
     aio_context_set_aio_params(iothread->ctx,
-                               iothread->parent_obj.aio_max_batch,
-                               errp);
+                               iothread->parent_obj.aio_max_batch);
 
 
     aio_context_set_thread_pool_params(iothread->ctx, base->thread_pool_min,
     aio_context_set_thread_pool_params(iothread->ctx, base->thread_pool_min,
                                        base->thread_pool_max, errp);
                                        base->thread_pool_max, errp);

+ 1 - 2
util/aio-posix.c

@@ -777,8 +777,7 @@ void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns,
     aio_notify(ctx);
     aio_notify(ctx);
 }
 }
 
 
-void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch,
-                                Error **errp)
+void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch)
 {
 {
     /*
     /*
      * No thread synchronization here, it doesn't matter if an incorrect value
      * No thread synchronization here, it doesn't matter if an incorrect value

+ 1 - 2
util/aio-win32.c

@@ -438,7 +438,6 @@ void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns,
     }
     }
 }
 }
 
 
-void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch,
-                                Error **errp)
+void aio_context_set_aio_params(AioContext *ctx, int64_t max_batch)
 {
 {
 }
 }

+ 1 - 4
util/main-loop.c

@@ -192,10 +192,7 @@ static void main_loop_update_params(EventLoopBase *base, Error **errp)
         return;
         return;
     }
     }
 
 
-    aio_context_set_aio_params(qemu_aio_context, base->aio_max_batch, errp);
-    if (*errp) {
-        return;
-    }
+    aio_context_set_aio_params(qemu_aio_context, base->aio_max_batch);
 
 
     aio_context_set_thread_pool_params(qemu_aio_context, base->thread_pool_min,
     aio_context_set_thread_pool_params(qemu_aio_context, base->thread_pool_min,
                                        base->thread_pool_max, errp);
                                        base->thread_pool_max, errp);