From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 22 Aug 2012 16:50:30 +0000 (+0200)
Subject: nbd: do not close BlockDriverState in nbd_export_close
X-Git-Tag: v1.3.0-rc0~440^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4aab7b4cb2d994e17c987d7d3fb2b6645ea92a2;p=thirdparty%2Fqemu.git

nbd: do not close BlockDriverState in nbd_export_close

This is not desirable when embedding the NBD server inside QEMU.
Move the bdrv_close to qemu-nbd.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/nbd.c b/nbd.c
index 5a3088d232f..83200bdccd4 100644
--- a/nbd.c
+++ b/nbd.c
@@ -721,7 +721,6 @@ void nbd_export_close(NBDExport *exp)
         g_free(first);
     }
 
-    bdrv_close(exp->bs);
     g_free(exp);
 }
 
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 1c1cf6a4630..23392e0d3cc 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);
     }