From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T60oB-0005iV-E8 for qemu-devel@nongnu.org; Mon, 27 Aug 2012 11:01:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T60o4-0005dk-Ml for qemu-devel@nongnu.org; Mon, 27 Aug 2012 11:00:55 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:54960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T60o4-0005Yi-80 for qemu-devel@nongnu.org; Mon, 27 Aug 2012 11:00:48 -0400 Received: by mail-ee0-f45.google.com with SMTP id e53so1535391eek.4 for ; Mon, 27 Aug 2012 08:00:47 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 27 Aug 2012 17:00:20 +0200 Message-Id: <1346079626-16386-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1346079626-16386-1-git-send-email-pbonzini@redhat.com> References: <1346079626-16386-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [RFC PATCH 07/13] nbd: do not close BlockDriverState in nbd_export_close List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@gmail.com This is not desirable when embedding the NBD server inside QEMU. Move the bdrv_close to qemu-nbd. Signed-off-by: Paolo Bonzini --- nbd.c | 1 - qemu-nbd.c | 1 + 2 file modificati, 1 inserzione(+). 1 rimozione(-) diff --git a/nbd.c b/nbd.c index fe7551d..1f65b1f 100644 --- a/nbd.c +++ b/nbd.c @@ -893,7 +893,6 @@ void nbd_export_close(NBDExport *exp) g_free(exp->name); } - bdrv_close(exp->bs); g_free(exp); } diff --git a/qemu-nbd.c b/qemu-nbd.c index 1c1cf6a..23392e0 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -586,6 +586,7 @@ int main(int argc, char **argv) } while (!sigterm_reported && (persistent || !nbd_started || nb_fds > 0)); nbd_export_close(exp); + bdrv_close(bs); if (sockpath) { unlink(sockpath); } -- 1.7.11.2