[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/20] curl: correctly propagate errors
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/20] curl: correctly propagate errors |
Date: |
Sun, 9 Feb 2014 10:48:45 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/curl.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index a807584..353bab1 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -456,30 +456,27 @@ static int curl_open(BlockDriverState *bs, QDict
*options, int flags,
static int inited = 0;
if (flags & BDRV_O_RDWR) {
- qerror_report(ERROR_CLASS_GENERIC_ERROR,
- "curl block device does not support writes");
+ error_setg(errp, "curl block device does not support writes");
return -EROFS;
}
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
qemu_opts_absorb_qdict(opts, options, &local_err);
if (error_is_set(&local_err)) {
- qerror_report_err(local_err);
- error_free(local_err);
+ error_propagate(errp, local_err);
goto out_noclean;
}
s->readahead_size = qemu_opt_get_size(opts, "readahead", READ_AHEAD_SIZE);
if ((s->readahead_size & 0x1ff) != 0) {
- fprintf(stderr, "HTTP_READAHEAD_SIZE %zd is not a multiple of 512\n",
- s->readahead_size);
+ error_setg(errp, "HTTP_READAHEAD_SIZE %zd is not a multiple of 512\n",
+ s->readahead_size);
goto out_noclean;
}
file = qemu_opt_get(opts, "url");
if (file == NULL) {
- qerror_report(ERROR_CLASS_GENERIC_ERROR, "curl block driver requires "
- "an 'url' option");
+ error_setg(errp, "curl block driver requires an 'url' option");
goto out_noclean;
}
--
1.8.5.3
- [Qemu-devel] [PATCH 05/20] iscsi: fix indentation, (continued)
- [Qemu-devel] [PATCH 10/20] curl: correctly propagate errors,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/20] qcow: correctly propagate errors, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 12/20] qed: correctly propagate errors, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 13/20] vhdx: correctly propagate errors, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 15/20] vmdk: extract vmdk_read_desc, Paolo Bonzini, 2014/02/09