[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/7] qemu-nbd: open the block device after starting
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 7/7] qemu-nbd: open the block device after starting the client thread |
Date: |
Fri, 4 Nov 2011 15:51:24 +0100 |
This is cleaner, because we do not need to close the block device when
there is an error opening /dev/nbdX. It was done this way only to
print errors before daemonizing.
At the same time, use atexit to ensure that the block device is closed
whenever we exit.
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-nbd.c | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 20fe4b5..c55b66a 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -464,22 +464,6 @@ int main(int argc, char **argv)
}
}
- bdrv_init();
-
- bs = bdrv_new("hda");
-
- srcpath = argv[optind];
- if ((ret = bdrv_open(bs, srcpath, flags, NULL)) < 0) {
- errno = -ret;
- err(EXIT_FAILURE, "Failed to bdrv_open '%s'", srcpath);
- }
-
- fd_size = bs->total_sectors * 512;
-
- if (partition != -1 &&
- find_partition(bs, partition, &dev_offset, &fd_size))
- err(EXIT_FAILURE, "Could not find partition %d", partition);
-
if (device) {
/* Open before spawning new threads. In the future, we may
* drop privileges after opening.
@@ -495,6 +479,23 @@ int main(int argc, char **argv)
}
}
+ bdrv_init();
+ atexit(bdrv_close_all);
+
+ bs = bdrv_new("hda");
+ srcpath = argv[optind];
+ if ((ret = bdrv_open(bs, srcpath, flags, NULL)) < 0) {
+ errno = -ret;
+ err(EXIT_FAILURE, "Failed to bdrv_open '%s'", argv[optind]);
+ }
+
+ fd_size = bs->total_sectors * 512;
+
+ if (partition != -1 &&
+ find_partition(bs, partition, &dev_offset, &fd_size)) {
+ err(EXIT_FAILURE, "Could not find partition %d", partition);
+ }
+
sharing_fds = g_malloc((shared + 1) * sizeof(int));
if (sockpath) {
@@ -572,7 +573,6 @@ int main(int argc, char **argv)
qemu_vfree(data);
close(sharing_fds[0]);
- bdrv_close(bs);
g_free(sharing_fds);
if (sockpath) {
unlink(sockpath);
--
1.7.6.4
- [Qemu-devel] [PATCH 0/7] reorganize operation of "qemu-nbd -c" and fix it, Paolo Bonzini, 2011/11/04
- [Qemu-devel] [PATCH 1/7] nbd: treat EPIPE from NBD_DO_IT as success, Paolo Bonzini, 2011/11/04
- [Qemu-devel] [PATCH 3/7] qemu-nbd: rename socket variable, Paolo Bonzini, 2011/11/04
- [Qemu-devel] [PATCH 2/7] qemu-nbd: trap SIGTERM, Paolo Bonzini, 2011/11/04
- [Qemu-devel] [PATCH 5/7] qemu-nbd: print error messages from the daemon through a pipe, Paolo Bonzini, 2011/11/04
- [Qemu-devel] [PATCH 4/7] qemu-nbd: move client to a thread, Paolo Bonzini, 2011/11/04
- [Qemu-devel] [PATCH 7/7] qemu-nbd: open the block device after starting the client thread,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 6/7] qemu-nbd: fix socket creation race, Paolo Bonzini, 2011/11/04
- Re: [Qemu-devel] [PATCH 0/7] reorganize operation of "qemu-nbd -c" and fix it, Kevin Wolf, 2011/11/08