[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/12] nbd: track clients into NBDExport
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 07/12] nbd: track clients into NBDExport |
Date: |
Wed, 19 Sep 2012 15:49:51 +0200 |
Track the NBDClients of each NBDExport, and use it to implement
nbd_export_close.
Signed-off-by: Paolo Bonzini <address@hidden>
---
nbd.c | 13 +++++++++++--
1 file modificato, 11 inserzioni(+), 2 rimozioni(-)
diff --git a/nbd.c b/nbd.c
index 4922d38..c39692b 100644
--- a/nbd.c
+++ b/nbd.c
@@ -94,6 +94,7 @@ struct NBDExport {
off_t dev_offset;
off_t size;
uint32_t nbdflags;
+ QTAILQ_HEAD(, NBDClient) clients;
QSIMPLEQ_HEAD(, NBDRequest) requests;
};
@@ -109,6 +110,7 @@ struct NBDClient {
CoMutex send_lock;
Coroutine *send_coroutine;
+ QTAILQ_ENTRY(NBDClient) next;
int nb_requests;
bool closing;
};
@@ -665,6 +667,7 @@ void nbd_client_put(NBDClient *client)
qemu_set_fd_handler2(client->sock, NULL, NULL, NULL, NULL);
close(client->sock);
client->sock = -1;
+ QTAILQ_REMOVE(&client->exp->clients, client, next);
nbd_export_put(client->exp);
g_free(client);
}
@@ -725,6 +728,7 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t
dev_offset,
NBDExport *exp = g_malloc0(sizeof(NBDExport));
QSIMPLEQ_INIT(&exp->requests);
exp->refcount = 1;
+ QTAILQ_INIT(&exp->clients);
exp->bs = bs;
exp->dev_offset = dev_offset;
exp->nbdflags = nbdflags;
@@ -734,9 +738,13 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t
dev_offset,
void nbd_export_close(NBDExport *exp)
{
- assert(exp->refcount == 1);
+ NBDClient *client, *next;
- /* stub */
+ nbd_export_get(exp);
+ QTAILQ_FOREACH_SAFE(client, &exp->clients, next, next) {
+ nbd_client_close(client);
+ }
+ nbd_export_put(exp);
}
void nbd_export_get(NBDExport *exp)
@@ -1035,6 +1043,7 @@ NBDClient *nbd_client_new(NBDExport *exp, int csock,
qemu_co_mutex_init(&client->send_lock);
qemu_set_fd_handler2(csock, nbd_can_read, nbd_read, NULL, client);
+ QTAILQ_INSERT_TAIL(&exp->clients, client, next);
nbd_export_get(exp);
return client;
}
--
1.7.12
- [Qemu-devel] [PULL 00/12] NBD patches for 2012-09-22, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 01/12] nbd: add more constants, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 03/12] nbd: do not close BlockDriverState in nbd_export_close, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 02/12] nbd: pass NBDClient to nbd_send_negotiate, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 04/12] nbd: make refcount interface public, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 05/12] nbd: do not leak nbd_trip coroutines when a connection is torn down, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 06/12] nbd: add reference counting to NBDExport, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 08/12] nbd: add notification for closing an NBDExport, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 11/12] nbd: negotiate with named exports, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 07/12] nbd: track clients into NBDExport,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/12] qemu-nbd: rewrite termination conditions to use a state machine, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 10/12] nbd: register named exports, Paolo Bonzini, 2012/09/19
- [Qemu-devel] [PATCH 12/12] nbd: add nbd_export_get_blockdev, Paolo Bonzini, 2012/09/19
- Re: [Qemu-devel] [PULL 00/12] NBD patches for 2012-09-22, Anthony Liguori, 2012/09/25