From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFl9v-0002wh-DR for qemu-devel@nongnu.org; Mon, 26 Jan 2015 10:01:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFl9u-0007b2-88 for qemu-devel@nongnu.org; Mon, 26 Jan 2015 10:00:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFl9t-0007an-Ur for qemu-devel@nongnu.org; Mon, 26 Jan 2015 10:00:58 -0500 From: Max Reitz Date: Mon, 26 Jan 2015 10:00:38 -0500 Message-Id: <1422284444-12529-9-git-send-email-mreitz@redhat.com> In-Reply-To: <1422284444-12529-1-git-send-email-mreitz@redhat.com> References: <1422284444-12529-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 08/14] qemu-nbd: Use blk_new_open() in main() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Max Reitz , Markus Armbruster , Stefan Hajnoczi , Stefano Stabellini Signed-off-by: Max Reitz --- qemu-nbd.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index d222512..fdc9590 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -386,7 +386,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; @@ -429,7 +428,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; @@ -440,6 +439,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. @@ -684,24 +684,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_obj(options, "driver", QOBJECT(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