| Message ID | 20200306051536.27803-1-vsementsov@virtuozzo.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | error: auto propagated local_err part I | expand |
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> writes: > File with errp-cleaning APIs dropped for two reasons: > > 1. I'm tired after a 3-days war with coccinelle, and don't want to add more > patches here. Oww. In my experience, Coccinelle is both awesome and terrible. I hope you didn't do all that work just to address minor complaints from me. I *try* to make it clear where on the spectrum from "I want you to improve this" to "perhaps you'd like to try this idea" my review comments are, but I'm certainly not perfect there. Anyway, here we are, so let's look at the patches. > 2. Markus noted, that we forget two more functions which needs such wrappers > and corresponding conversion, so seems better to handle all these things > in same manner for now. > > changes in v8: > > 01: - update comments > - fix bug in macro [Markus] > - use do {} while(0) > > 02: a lot of changes > - about error propagation: try to update only patterns where we propagate > local_error to errp. So, patches 09 and 10 changed (wow!) > - Now clearing functions are not defined. Still, do the conversion, so > that when script applied where these functions needed, compilation will > be broken. > - improve ordering of hunks, and comment everything > > 09,10: drop hunks, which are converted for nothing. Quick eye-over: you no longer wrap nbd_co_receive_cmdread_reply(), nbd_co_receive_blockstatus_reply(), and xen_bus_realize(). Clearly better. > v8 is available at > https://src.openvz.org/scm/~vsementsov/qemu.git #tag up-auto-local-err-partI-v8 > v7 is available at > https://src.openvz.org/scm/~vsementsov/qemu.git #tag up-auto-local-err-partI-v7 > > In these series, there is no commit-per-subsystem script, each generated > commit is generated in separate. > > Still, generating commands are very similar, and looks like > > sed -n '/^<Subsystem name>$/,/^$/{s/^F: //p}' MAINTAINERS | \ > xargs git ls-files | grep '\.[hc]$' | \ > xargs spatch \ > --sp-file scripts/coccinelle/auto-propagated-errp.cocci \ > --macro-file scripts/cocci-macro-file.h \ > --in-place --no-show-diff --max-width 80 > > Note, that in each generated commit, generation command is the only > text, indented by 8 spaces in 'git log -1' output, so, to regenerate all > commits (for example, after rebase, or change in coccinelle script), you > may use the following command: > > git rebase -x "sh -c \"git show --pretty= --name-only | xargs git checkout HEAD^ -- ; git reset; git log -1 | grep '^ ' | sh\"" HEAD~7 > > Which will start automated interactive rebase for generated patches, > which will stop if generated patch changed > (you may do git commit --amend to apply updated generated changes). > > Note: > git show --pretty= --name-only - lists files, changed in HEAD > git log -1 | grep '^ ' | sh - rerun generation command of HEAD > > > Check for compilation of changed .c files > git rebase -x "sh -c \"git show --pretty= --name-only | sed -n 's/\.c$/.o/p' | xargs make -j9\"" HEAD~7 Thanks for the write-up!
File with errp-cleaning APIs dropped for two reasons: 1. I'm tired after a 3-days war with coccinelle, and don't want to add more patches here. 2. Markus noted, that we forget two more functions which needs such wrappers and corresponding conversion, so seems better to handle all these things in same manner for now. changes in v8: 01: - update comments - fix bug in macro [Markus] - use do {} while(0) 02: a lot of changes - about error propagation: try to update only patterns where we propagate local_error to errp. So, patches 09 and 10 changed (wow!) - Now clearing functions are not defined. Still, do the conversion, so that when script applied where these functions needed, compilation will be broken. - improve ordering of hunks, and comment everything 09,10: drop hunks, which are converted for nothing. v8 is available at https://src.openvz.org/scm/~vsementsov/qemu.git #tag up-auto-local-err-partI-v8 v7 is available at https://src.openvz.org/scm/~vsementsov/qemu.git #tag up-auto-local-err-partI-v7 In these series, there is no commit-per-subsystem script, each generated commit is generated in separate. Still, generating commands are very similar, and looks like sed -n '/^<Subsystem name>$/,/^$/{s/^F: //p}' MAINTAINERS | \ xargs git ls-files | grep '\.[hc]$' | \ xargs spatch \ --sp-file scripts/coccinelle/auto-propagated-errp.cocci \ --macro-file scripts/cocci-macro-file.h \ --in-place --no-show-diff --max-width 80 Note, that in each generated commit, generation command is the only text, indented by 8 spaces in 'git log -1' output, so, to regenerate all commits (for example, after rebase, or change in coccinelle script), you may use the following command: git rebase -x "sh -c \"git show --pretty= --name-only | xargs git checkout HEAD^ -- ; git reset; git log -1 | grep '^ ' | sh\"" HEAD~7 Which will start automated interactive rebase for generated patches, which will stop if generated patch changed (you may do git commit --amend to apply updated generated changes). Note: git show --pretty= --name-only - lists files, changed in HEAD git log -1 | grep '^ ' | sh - rerun generation command of HEAD Check for compilation of changed .c files git rebase -x "sh -c \"git show --pretty= --name-only | sed -n 's/\.c$/.o/p' | xargs make -j9\"" HEAD~7 Vladimir Sementsov-Ogievskiy (10): error: auto propagated local_err scripts: add coccinelle script to use auto propagated errp hw/sd/ssi-sd: fix error handling in ssi_sd_realize SD (Secure Card): introduce ERRP_AUTO_PROPAGATE pflash: introduce ERRP_AUTO_PROPAGATE fw_cfg: introduce ERRP_AUTO_PROPAGATE virtio-9p: introduce ERRP_AUTO_PROPAGATE TPM: introduce ERRP_AUTO_PROPAGATE nbd: introduce ERRP_AUTO_PROPAGATE xen: introduce ERRP_AUTO_PROPAGATE include/block/nbd.h | 1 + include/qapi/error.h | 206 +++++++++++++--- block/nbd.c | 21 +- hw/9pfs/9p-local.c | 12 +- hw/9pfs/9p.c | 1 + hw/block/dataplane/xen-block.c | 17 +- hw/block/pflash_cfi01.c | 7 +- hw/block/pflash_cfi02.c | 7 +- hw/block/xen-block.c | 125 ++++------ hw/nvram/fw_cfg.c | 14 +- hw/pci-host/xen_igd_pt.c | 7 +- hw/sd/sdhci-pci.c | 7 +- hw/sd/sdhci.c | 21 +- hw/sd/ssi-sd.c | 26 +- hw/tpm/tpm_util.c | 7 +- hw/xen/xen-backend.c | 7 +- hw/xen/xen-bus.c | 92 +++---- hw/xen/xen-host-pci-device.c | 27 +- hw/xen/xen_pt.c | 25 +- hw/xen/xen_pt_config_init.c | 20 +- nbd/client.c | 5 + nbd/server.c | 5 + tpm.c | 7 +- scripts/coccinelle/auto-propagated-errp.cocci | 231 ++++++++++++++++++ 24 files changed, 617 insertions(+), 281 deletions(-) create mode 100644 scripts/coccinelle/auto-propagated-errp.cocci Cc: Eric Blake <eblake@redhat.com> Cc: Kevin Wolf <kwolf@redhat.com> Cc: Max Reitz <mreitz@redhat.com> Cc: Greg Kurz <groug@kaod.org> Cc: Christian Schoenebeck <qemu_oss@crudebyte.com> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Anthony Perard <anthony.perard@citrix.com> Cc: Paul Durrant <paul@xen.org> Cc: Stefan Hajnoczi <stefanha@redhat.com> Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com> Cc: Laszlo Ersek <lersek@redhat.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Stefan Berger <stefanb@linux.ibm.com> Cc: Markus Armbruster <armbru@redhat.com> Cc: Michael Roth <mdroth@linux.vnet.ibm.com> Cc: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Cc: xen-devel@lists.xenproject.org