ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nbd: track clients into NBDExport 

Track the NBDClients of each NBDExport, and use it to implement
nbd_export_close.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-09-18 13:58:25 +02:00
parent 2c8d9f0655
commit 4b9441f6b3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nbd.c
View File

@ -94,6 +94,7 @@ struct NBDExport {
off_t dev_offset; off_t dev_offset;
off_t size; off_t size;
uint32_t nbdflags; uint32_t nbdflags;
QTAILQ_HEAD(, NBDClient) clients;
QSIMPLEQ_HEAD(, NBDRequest) requests; QSIMPLEQ_HEAD(, NBDRequest) requests;
}; };
@ -109,6 +110,7 @@ struct NBDClient {
CoMutex send_lock; CoMutex send_lock;
Coroutine *send_coroutine; Coroutine *send_coroutine;
QTAILQ_ENTRY(NBDClient) next;
int nb_requests; int nb_requests;
bool closing; bool closing;
}; };
@ -665,6 +667,7 @@ void nbd_client_put(NBDClient *client)
qemu_set_fd_handler2(client->sock, NULL, NULL, NULL, NULL); qemu_set_fd_handler2(client->sock, NULL, NULL, NULL, NULL);
close(client->sock); close(client->sock);
client->sock = -1; client->sock = -1;
QTAILQ_REMOVE(&client->exp->clients, client, next);
nbd_export_put(client->exp); nbd_export_put(client->exp);
g_free(client); g_free(client);
} }
@ -725,6 +728,7 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset,
NBDExport *exp = g_malloc0(sizeof(NBDExport)); NBDExport *exp = g_malloc0(sizeof(NBDExport));
QSIMPLEQ_INIT(&exp->requests); QSIMPLEQ_INIT(&exp->requests);
exp->refcount = 1; exp->refcount = 1;
QTAILQ_INIT(&exp->clients);
exp->bs = bs; exp->bs = bs;
exp->dev_offset = dev_offset; exp->dev_offset = dev_offset;
exp->nbdflags = nbdflags; exp->nbdflags = nbdflags;
@ -734,9 +738,13 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset,
void nbd_export_close(NBDExport *exp) 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) 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_co_mutex_init(&client->send_lock);
qemu_set_fd_handler2(csock, nbd_can_read, nbd_read, NULL, client); qemu_set_fd_handler2(csock, nbd_can_read, nbd_read, NULL, client);
QTAILQ_INSERT_TAIL(&exp->clients, client, next);
nbd_export_get(exp); nbd_export_get(exp);
return client; return client;
} }