From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEKfn-0001qj-Vl for qemu-devel@nongnu.org; Wed, 19 Sep 2012 09:50:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TEKfe-0005h9-As for qemu-devel@nongnu.org; Wed, 19 Sep 2012 09:50:39 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:56240) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEKfe-0005IH-4P for qemu-devel@nongnu.org; Wed, 19 Sep 2012 09:50:30 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so2503409pbb.4 for ; Wed, 19 Sep 2012 06:50:29 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 19 Sep 2012 15:49:52 +0200 Message-Id: <1348062596-30446-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1348062596-30446-1-git-send-email-pbonzini@redhat.com> References: <1348062596-30446-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/12] nbd: add notification for closing an NBDExport List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- 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