On 06/09/2016 02:21 PM, Eduardo Habkost wrote: > This patch simplifies code that uses a local_err variable just to immediately > use it for an error_propagate() call. > > Done using the following Coccinelle patch: > > +++ b/block.c > @@ -353,7 +353,6 @@ out: > int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp) > { > BlockDriver *drv; > - Error *local_err = NULL; > int ret; > > drv = bdrv_find_protocol(filename, true, errp); > @@ -361,8 +360,7 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp) > return -ENOENT; > } > > - ret = bdrv_create(drv, filename, opts, &local_err); > - error_propagate(errp, local_err); > + ret = bdrv_create(drv, filename, opts, errp); > return ret; And I _know_ there's a Coccinelle recipe for further shortening this into 'return bdrv_create(...)' (since it was part of the tutorial class at last year's KVM Forum) - again, I don't know the actual syntax to use to get it, but it shouldn't be too hard to find in a web search. Fine as yet another followup patch. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org