On 04/11/2017 12:12 PM, Markus Armbruster wrote: > Eric Blake writes: > >> We now have macros in place to make it less verbose to add a scalar >> to QDict and QList, so use them. To make this patch smaller to >> review, a couple of subdirectories were done in earlier patches. >> >> Patch created mechanically via: >> spatch --sp-file scripts/coccinelle/qobject.cocci \ >> --macro-file scripts/cocci-macro-file.h --dir . --in-place >> and needed only one touch-up in monitor.c to avoid a long line. >> >> Signed-off-by: Eric Blake >> --- >> block.c | 45 +++++++++++++++++++-------------------------- >> blockdev.c | 30 +++++++++++++----------------- >> hw/block/xen_disk.c | 2 +- >> hw/usb/xen-usb.c | 12 ++++++------ >> monitor.c | 23 +++++++++++------------ >> qapi/qmp-event.c | 2 +- >> qemu-img.c | 6 +++--- >> qemu-io.c | 2 +- >> qemu-nbd.c | 2 +- >> qobject/qdict.c | 2 +- >> target/s390x/cpu_models.c | 4 ++-- >> util/qemu-option.c | 2 +- >> 12 files changed, 60 insertions(+), 72 deletions(-) > > Looks like you intent is to split the application of qobject.cocci into > block [PATCH 07], tests [PATCH 08] and rest [PATCH 09, i.e. this one]. > Okay, although everything on one patch would also be okay for me. > However, this patch also contains block stuff: block.c blockdev.c > qemu-{img,io,nbd}.c. Move to PATCH 07? Can do either way, although I'd have to tweak the commit message's sample command lines I used for the split if you like it kept separate. Maybe even just a comment in patch 07 that 'only files under block/ are touched here; other block-related patches will be fixed in the remaining global cleanup'. Do you have a preference? -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org