[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 44/46] qemu-img: Ignore Error objects where the return value suff
From: |
Markus Armbruster |
Subject: |
[PATCH 44/46] qemu-img: Ignore Error objects where the return value suffices |
Date: |
Wed, 24 Jun 2020 18:43:42 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qemu-img.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 27bf94e7ae..c11bfe0268 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -464,22 +464,18 @@ static int add_old_style_options(const char *fmt,
QemuOpts *opts,
const char *base_filename,
const char *base_fmt)
{
- Error *err = NULL;
-
if (base_filename) {
if (!qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, base_filename,
- &err)) {
+ NULL)) {
error_report("Backing file not supported for file format '%s'",
fmt);
- error_free(err);
return -1;
}
}
if (base_fmt) {
- if (!qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, base_fmt, &err)) {
+ if (!qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, base_fmt, NULL)) {
error_report("Backing file format not supported for file "
"format '%s'", fmt);
- error_free(err);
return -1;
}
}
--
2.26.2
- [PATCH 05/46] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), (continued)
- [PATCH 05/46] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), Markus Armbruster, 2020/06/24
- [PATCH 33/46] qom: Crash more nicely on object_property_get_link() failure, Markus Armbruster, 2020/06/24
- [PATCH 30/46] s390x/pci: Fix harmless mistake in zpci's property fid's setter, Markus Armbruster, 2020/06/24
- [PATCH 44/46] qemu-img: Ignore Error objects where the return value suffices,
Markus Armbruster <=
- [PATCH 24/46] qapi: Smooth error checking manually, Markus Armbruster, 2020/06/24
- [PATCH 37/46] qom: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/06/24
- [PATCH 20/46] block: Avoid error accumulation in bdrv_img_create(), Markus Armbruster, 2020/06/24
- [PATCH 32/46] qom: Rename qdev_get_type() to object_get_type(), Markus Armbruster, 2020/06/24