diff options
| author | Markus Armbruster <armbru@redhat.com> | 2020-07-07 18:05:47 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-07-10 15:18:08 +0200 |
| commit | 14217038bc9e36246d311fa8e026a01a5d7bbd42 (patch) | |
| tree | c93af897bda7a8789e91d09eb89a035bbe4bcff0 /hw/mem | |
| parent | 62a35aaa310807fa161ca041ddb0f308faeb582b (diff) | |
qapi: Use returned bool to check for failure, manual part
The previous commit used Coccinelle to convert from checking the Error
object to checking the return value. Convert a few more manually.
Also tweak control flow in places to conform to the conventional "if
error bail out" pattern.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-20-armbru@redhat.com>
Diffstat (limited to 'hw/mem')
| -rw-r--r-- | hw/mem/nvdimm.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index ec92ffd415..1fa976c56c 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -85,21 +85,18 @@ static void nvdimm_set_uuid(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { NVDIMMDevice *nvdimm = NVDIMM(obj); - Error *local_err = NULL; char *value; - if (!visit_type_str(v, name, &value, &local_err)) { - goto out; + if (!visit_type_str(v, name, &value, errp)) { + return; } if (qemu_uuid_parse(value, &nvdimm->uuid) != 0) { error_setg(errp, "Property '%s.%s' has invalid value", object_get_typename(obj), name); } - g_free(value); -out: - error_propagate(errp, local_err); + g_free(value); } |