[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 10/17] block/nbd: drop nbd_have_request()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 10/17] block/nbd: drop nbd_have_request() |
Date: |
Mon, 10 Jun 2013 14:26:06 +0200 |
.io_flush() is no longer called so drop nbd_have_request(). We cannot
drop in_flight since it is still used by other block/nbd.c code.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/nbd.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 30e3b78..80d2b31 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -270,13 +270,6 @@ static void nbd_coroutine_start(BDRVNBDState *s, struct
nbd_request *request)
request->handle = INDEX_TO_HANDLE(s, i);
}
-static int nbd_have_request(void *opaque)
-{
- BDRVNBDState *s = opaque;
-
- return s->in_flight > 0;
-}
-
static void nbd_reply_ready(void *opaque)
{
BDRVNBDState *s = opaque;
@@ -333,7 +326,7 @@ static int nbd_co_send_request(BDRVNBDState *s, struct
nbd_request *request,
qemu_co_mutex_lock(&s->send_mutex);
s->send_coroutine = qemu_coroutine_self();
qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, nbd_restart_write,
- nbd_have_request, s);
+ NULL, s);
if (qiov) {
if (!s->is_unix) {
socket_set_cork(s->sock, 1);
@@ -353,7 +346,7 @@ static int nbd_co_send_request(BDRVNBDState *s, struct
nbd_request *request,
rc = nbd_send_request(s->sock, request);
}
qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL,
- nbd_have_request, s);
+ NULL, s);
s->send_coroutine = NULL;
qemu_co_mutex_unlock(&s->send_mutex);
return rc;
@@ -430,7 +423,7 @@ static int nbd_establish_connection(BlockDriverState *bs)
* kick the reply mechanism. */
qemu_set_nonblock(sock);
qemu_aio_set_fd_handler(sock, nbd_reply_ready, NULL,
- nbd_have_request, s);
+ NULL, s);
s->sock = sock;
s->size = size;
--
1.8.1.4
- [Qemu-devel] [PATCH v3 00/17] aio: drop io_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 01/17] block: stop relying on io_flush() in bdrv_drain_all(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 03/17] tests: adjust test-aio to new aio_poll() semantics, Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 02/17] dataplane/virtio-blk: check exit conditions before aio_poll(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 05/17] aio: stop using .io_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 06/17] block/curl: drop curl_aio_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 07/17] block/gluster: drop qemu_gluster_aio_flush_cb(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 08/17] block/iscsi: drop iscsi_process_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 09/17] block/linux-aio: drop qemu_laio_completion_cb(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 10/17] block/nbd: drop nbd_have_request(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 12/17] block/sheepdog: drop have_co_req() and aio_flush_request(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 11/17] block/rbd: drop qemu_rbd_aio_flush_cb(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 15/17] thread-pool: drop thread_pool_active(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 04/17] tests: adjust test-thread-pool to new aio_poll() semantics, Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 16/17] tests: drop event_active_cb(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 17/17] aio: drop io_flush argument, Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 13/17] block/ssh: drop return_true(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 14/17] dataplane/virtio-blk: drop flush_true() and flush_io(), Stefan Hajnoczi, 2013/06/10