[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 59/65] qemu-nbd: Use blk_new_open() in main()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 59/65] qemu-nbd: Use blk_new_open() in main() |
Date: |
Mon, 16 Feb 2015 15:46:24 +0000 |
From: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qemu-nbd.c | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 4d8df08..ac1e5d6 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -391,7 +391,6 @@ int main(int argc, char **argv)
{
BlockBackend *blk;
BlockDriverState *bs;
- BlockDriver *drv;
off_t dev_offset = 0;
uint32_t nbdflags = 0;
bool disconnect = false;
@@ -434,7 +433,7 @@ int main(int argc, char **argv)
char *end;
int flags = BDRV_O_RDWR;
int partition = -1;
- int ret;
+ int ret = 0;
int fd;
bool seen_cache = false;
bool seen_discard = false;
@@ -445,6 +444,7 @@ int main(int argc, char **argv)
const char *fmt = NULL;
Error *local_err = NULL;
BlockdevDetectZeroesOptions detect_zeroes =
BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF;
+ QDict *options = NULL;
/* The client thread uses SIGTERM to interrupt the server. A signal
* handler ensures that "qemu-nbd -v -c" exits with a nice status code.
@@ -689,24 +689,17 @@ int main(int argc, char **argv)
atexit(bdrv_close_all);
if (fmt) {
- drv = bdrv_find_format(fmt);
- if (!drv) {
- errx(EXIT_FAILURE, "Unknown file format '%s'", fmt);
- }
- } else {
- drv = NULL;
+ options = qdict_new();
+ qdict_put(options, "driver", qstring_from_str(fmt));
}
- blk = blk_new_with_bs("hda", &error_abort);
- bs = blk_bs(blk);
-
srcpath = argv[optind];
- ret = bdrv_open(&bs, srcpath, NULL, NULL, flags, drv, &local_err);
- if (ret < 0) {
- errno = -ret;
- err(EXIT_FAILURE, "Failed to bdrv_open '%s': %s", argv[optind],
- error_get_pretty(local_err));
+ blk = blk_new_open("hda", srcpath, NULL, options, flags, &local_err);
+ if (!blk) {
+ errx(EXIT_FAILURE, "Failed to blk_new_open '%s': %s", argv[optind],
+ error_get_pretty(local_err));
}
+ bs = blk_bs(blk);
if (sn_opts) {
ret = bdrv_snapshot_load_tmp(bs,
--
2.1.0
- [Qemu-devel] [PULL v2 49/65] iotests: Add test for qemu-img convert to NBD, (continued)
- [Qemu-devel] [PULL v2 49/65] iotests: Add test for qemu-img convert to NBD, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 52/65] block: Add Error parameter to bdrv_find_protocol(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 53/65] iotests: Add test for driver=qcow2, format=qcow2, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 48/65] qemu-img: Fix qemu-img convert -n, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 51/65] block: Add blk_new_open(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 56/65] qemu-img: Use blk_new_open() in img_open(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 54/65] blockdev: Use blk_new_open() in blockdev_init(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 57/65] qemu-img: Use blk_new_open() in img_rebase(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 55/65] block/xen: Use blk_new_open() in blk_connect(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 58/65] qemu-img: Use BlockBackend as far as possible, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 59/65] qemu-nbd: Use blk_new_open() in main(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 63/65] block: Clamp BlockBackend requests, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 61/65] qemu-io: Remove "growable" option, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 60/65] qemu-io: Use blk_new_open() in openfile(), Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 62/65] qemu-io: Use BlockBackend, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 64/65] block: Remove "growable" from BDS, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 65/65] block: Keep bdrv_check*_request()'s return value, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 27/65] libqos/ahci: Add cmd response sanity check helpers, Stefan Hajnoczi, 2015/02/16
- Re: [Qemu-devel] [PULL v2 00/65] Block patches, Peter Maydell, 2015/02/24