[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] nbd: add notification for closing an NBDExpor
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 08/12] nbd: add notification for closing an NBDExport |
Date: |
Wed, 19 Sep 2012 15:49:52 +0200 |
In order to exit cleanly from qemu-nbd, add a callback that triggers
when an NBDExport is closed. In the case of qemu-nbd it will exit the
main loop.
Signed-off-by: Paolo Bonzini <address@hidden>
---
nbd.c | 10 +++++++++-
nbd.h | 3 ++-
qemu-nbd.c | 2 +-
3 file modificati, 12 inserzioni(+), 3 rimozioni(-)
diff --git a/nbd.c b/nbd.c
index c39692b..2e9de70 100644
--- a/nbd.c
+++ b/nbd.c
@@ -90,6 +90,8 @@ struct NBDRequest {
struct NBDExport {
int refcount;
+ void (*close)(NBDExport *exp);
+
BlockDriverState *bs;
off_t dev_offset;
off_t size;
@@ -723,7 +725,8 @@ static void nbd_request_put(NBDRequest *req)
}
NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset,
- off_t size, uint32_t nbdflags)
+ off_t size, uint32_t nbdflags,
+ void (*close)(NBDExport *))
{
NBDExport *exp = g_malloc0(sizeof(NBDExport));
QSIMPLEQ_INIT(&exp->requests);
@@ -733,6 +736,7 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t
dev_offset,
exp->dev_offset = dev_offset;
exp->nbdflags = nbdflags;
exp->size = size == -1 ? bdrv_getlength(bs) : size;
+ exp->close = close;
return exp;
}
@@ -761,6 +765,10 @@ void nbd_export_put(NBDExport *exp)
}
if (--exp->refcount == 0) {
+ if (exp->close) {
+ exp->close(exp);
+ }
+
while (!QSIMPLEQ_EMPTY(&exp->requests)) {
NBDRequest *first = QSIMPLEQ_FIRST(&exp->requests);
QSIMPLEQ_REMOVE_HEAD(&exp->requests, entry);
diff --git a/nbd.h b/nbd.h
index 86921cd..895820b 100644
--- a/nbd.h
+++ b/nbd.h
@@ -79,7 +79,8 @@ typedef struct NBDExport NBDExport;
typedef struct NBDClient NBDClient;
NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset,
- off_t size, uint32_t nbdflags);
+ off_t size, uint32_t nbdflags,
+ void (*close)(NBDExport *));
void nbd_export_close(NBDExport *exp);
void nbd_export_get(NBDExport *exp);
void nbd_export_put(NBDExport *exp);
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 2a2cba3..8b87dea 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -546,7 +546,7 @@ int main(int argc, char **argv)
}
}
- exp = nbd_export_new(bs, dev_offset, fd_size, nbdflags);
+ exp = nbd_export_new(bs, dev_offset, fd_size, nbdflags, NULL);
if (sockpath) {
fd = unix_socket_incoming(sockpath);
--
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 <=
- [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, 2012/09/19
- [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