motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

error: Reduce unnecessary error propagation

Browse source 
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away, even when we need to keep error_propagate() for other
error paths.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-38-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-07-07 18:06:05 +02:00
parent 992861fb1e
commit a5f9b9df25
8 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
block/gluster.c
View file

@ -523,7 +523,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
/* create opts info from runtime_json_opts list */
opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
if (!qemu_opts_absorb_qdict(opts, options, &local_err)) {
if (!qemu_opts_absorb_qdict(opts, options, errp)) {
goto out;
}
@ -554,7 +554,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
/* create opts info from runtime_type_opts list */
opts = qemu_opts_create(&runtime_type_opts, NULL, 0, &error_abort);
if (!qemu_opts_absorb_qdict(opts, backing_options, &local_err)) {
if (!qemu_opts_absorb_qdict(opts, backing_options, errp)) {
goto out;
}
@ -584,7 +584,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
if (gsconf->type == SOCKET_ADDRESS_TYPE_INET) {
/* create opts info from runtime_inet_opts list */
opts = qemu_opts_create(&runtime_inet_opts, NULL, 0, &error_abort);
if (!qemu_opts_absorb_qdict(opts, backing_options, &local_err)) {
if (!qemu_opts_absorb_qdict(opts, backing_options, errp)) {
goto out;
}
@ -632,7 +632,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
} else {
/* create opts info from runtime_unix_opts list */
opts = qemu_opts_create(&runtime_unix_opts, NULL, 0, &error_abort);
if (!qemu_opts_absorb_qdict(opts, backing_options, &local_err)) {
if (!qemu_opts_absorb_qdict(opts, backing_options, errp)) {
goto out;
}