[libvirt] [PATCHv2 0/6] Introduce syntax-check rule for incorrect indentation and blank first line in function body

Shi Lei posted 6 patches 5 years, 7 months ago
Failed in applying to current master (apply log)
build-aux/check-spacing.pl             |  22 +++++
src/bhyve/bhyve_command.c              |   3 -
src/bhyve/bhyve_conf.c                 |   6 +-
src/bhyve/bhyve_driver.c               |  33 ++++---
src/bhyve/bhyve_monitor.c              |   1 -
src/bhyve/bhyve_process.c              |   1 -
src/conf/cpu_conf.c                    |   1 -
src/conf/domain_capabilities.c         |   1 -
src/conf/domain_conf.c                 |  12 +--
src/conf/network_conf.c                |   2 -
src/cpu/cpu_s390.c                     |  84 ++++++++--------
src/cpu/cpu_x86.c                      |   1 -
src/esx/esx_vi_types.c                 |   2 +-
src/locking/lock_driver_nop.c          |   1 -
src/network/bridge_driver.c            |   1 -
src/network/bridge_driver_linux.c      |   1 -
src/nwfilter/nwfilter_learnipaddr.c    |   1 -
src/phyp/phyp_driver.c                 |   1 -
src/qemu/qemu_alias.c                  |   1 -
src/qemu/qemu_domain_address.c         |  86 ++++++++---------
src/qemu/qemu_driver.c                 |   1 -
src/qemu/qemu_monitor.c                |   1 -
src/qemu/qemu_monitor_json.c           |   1 -
src/qemu/qemu_process.c                |   1 -
src/storage/storage_backend_sheepdog.c |   3 -
src/storage/storage_driver.c           |   1 -
src/storage/storage_util.c             |   1 -
src/test/test_driver.c                 |   2 -
src/util/vircommand.c                  |   6 +-
src/util/virdnsmasq.c                  |   1 -
src/util/virfile.c                     |   1 -
src/util/virnetdev.c                   |  49 +++++-----
src/util/virnetdevmacvlan.c            |  11 +--
src/util/virnetdevvportprofile.c       |   2 +-
src/util/virstoragefile.c              |   1 -
src/util/virutil.c                     |   3 +-
src/vbox/vbox_storage.c                |   1 -
src/vbox/vbox_tmpl.c                   |   8 +-
src/vz/vz_driver.c                     |   1 -
src/vz/vz_sdk.c                        |   1 -
src/xenapi/xenapi_driver.c             |   2 -
src/xenconfig/xen_common.c             |  11 +--
tests/qemuxml2argvmock.c               |   2 +-
tests/sexpr2xmltest.c                  |  44 ++++-----
tests/virnetdevmock.c                  |   1 -
tests/virnettlshelpers.c               |  18 ++--
tests/virshtest.c                      | 128 ++++++++++++-------------
tests/vshtabletest.c                   |   3 -
tests/xml2sexprtest.c                  |  36 +++----
tools/virsh-volume.c                   |   1 -
tools/virt-admin.c                     |   1 -
51 files changed, 284 insertions(+), 320 deletions(-)
[libvirt] [PATCHv2 0/6] Introduce syntax-check rule for incorrect indentation and blank first line in function body
Posted by Shi Lei 5 years, 7 months ago
v1 here:
https://www.redhat.com/archives/libvir-list/2018-September/msg00497.html

Diff from v1: (according to the comments from Jano)
  - Change build-aux/check-spacing.pl rather than cfg.mk
  - Don't exempt '/' (which matches comments in function) in the rule
  - Split these two type of error messages and only output the relevant one
  - Patch 2/4 of v1 divide into two patches by the type of error messages

Shi Lei (6):
  build-aux:check-spacing.pl: Introduce syntax-check rule for incorrect
    indentation and blank first line in function body
  src: fix incorrect indentation in function body by checking first line
  tests: fix incorrect indentation in function body by checking first
    line
  src: remove blank first line in function body
  tests: remove blank first line in function body
  tools: remove blank first line in function body

 build-aux/check-spacing.pl             |  22 +++++
 src/bhyve/bhyve_command.c              |   3 -
 src/bhyve/bhyve_conf.c                 |   6 +-
 src/bhyve/bhyve_driver.c               |  33 ++++---
 src/bhyve/bhyve_monitor.c              |   1 -
 src/bhyve/bhyve_process.c              |   1 -
 src/conf/cpu_conf.c                    |   1 -
 src/conf/domain_capabilities.c         |   1 -
 src/conf/domain_conf.c                 |  12 +--
 src/conf/network_conf.c                |   2 -
 src/cpu/cpu_s390.c                     |  84 ++++++++--------
 src/cpu/cpu_x86.c                      |   1 -
 src/esx/esx_vi_types.c                 |   2 +-
 src/locking/lock_driver_nop.c          |   1 -
 src/network/bridge_driver.c            |   1 -
 src/network/bridge_driver_linux.c      |   1 -
 src/nwfilter/nwfilter_learnipaddr.c    |   1 -
 src/phyp/phyp_driver.c                 |   1 -
 src/qemu/qemu_alias.c                  |   1 -
 src/qemu/qemu_domain_address.c         |  86 ++++++++---------
 src/qemu/qemu_driver.c                 |   1 -
 src/qemu/qemu_monitor.c                |   1 -
 src/qemu/qemu_monitor_json.c           |   1 -
 src/qemu/qemu_process.c                |   1 -
 src/storage/storage_backend_sheepdog.c |   3 -
 src/storage/storage_driver.c           |   1 -
 src/storage/storage_util.c             |   1 -
 src/test/test_driver.c                 |   2 -
 src/util/vircommand.c                  |   6 +-
 src/util/virdnsmasq.c                  |   1 -
 src/util/virfile.c                     |   1 -
 src/util/virnetdev.c                   |  49 +++++-----
 src/util/virnetdevmacvlan.c            |  11 +--
 src/util/virnetdevvportprofile.c       |   2 +-
 src/util/virstoragefile.c              |   1 -
 src/util/virutil.c                     |   3 +-
 src/vbox/vbox_storage.c                |   1 -
 src/vbox/vbox_tmpl.c                   |   8 +-
 src/vz/vz_driver.c                     |   1 -
 src/vz/vz_sdk.c                        |   1 -
 src/xenapi/xenapi_driver.c             |   2 -
 src/xenconfig/xen_common.c             |  11 +--
 tests/qemuxml2argvmock.c               |   2 +-
 tests/sexpr2xmltest.c                  |  44 ++++-----
 tests/virnetdevmock.c                  |   1 -
 tests/virnettlshelpers.c               |  18 ++--
 tests/virshtest.c                      | 128 ++++++++++++-------------
 tests/vshtabletest.c                   |   3 -
 tests/xml2sexprtest.c                  |  36 +++----
 tools/virsh-volume.c                   |   1 -
 tools/virt-admin.c                     |   1 -
 51 files changed, 284 insertions(+), 320 deletions(-)

-- 
2.17.1


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCHv2 0/6] Introduce syntax-check rule for incorrect indentation and blank first line in function body
Posted by Michal Privoznik 5 years, 7 months ago
On 09/13/2018 10:55 AM, Shi Lei wrote:
> v1 here:
> https://www.redhat.com/archives/libvir-list/2018-September/msg00497.html
> 
> Diff from v1: (according to the comments from Jano)
>   - Change build-aux/check-spacing.pl rather than cfg.mk
>   - Don't exempt '/' (which matches comments in function) in the rule
>   - Split these two type of error messages and only output the relevant one
>   - Patch 2/4 of v1 divide into two patches by the type of error messages
> 
> Shi Lei (6):
>   build-aux:check-spacing.pl: Introduce syntax-check rule for incorrect
>     indentation and blank first line in function body
>   src: fix incorrect indentation in function body by checking first line
>   tests: fix incorrect indentation in function body by checking first
>     line
>   src: remove blank first line in function body
>   tests: remove blank first line in function body
>   tools: remove blank first line in function body

There is this rule that 'make all syntax-check check' has to pass after
every single commit (because it helps during bisect). Your patch
ordering breaks this rule.

> 
>  build-aux/check-spacing.pl             |  22 +++++
>  src/bhyve/bhyve_command.c              |   3 -
>  src/bhyve/bhyve_conf.c                 |   6 +-
>  src/bhyve/bhyve_driver.c               |  33 ++++---
>  src/bhyve/bhyve_monitor.c              |   1 -
>  src/bhyve/bhyve_process.c              |   1 -
>  src/conf/cpu_conf.c                    |   1 -
>  src/conf/domain_capabilities.c         |   1 -
>  src/conf/domain_conf.c                 |  12 +--
>  src/conf/network_conf.c                |   2 -
>  src/cpu/cpu_s390.c                     |  84 ++++++++--------
>  src/cpu/cpu_x86.c                      |   1 -
>  src/esx/esx_vi_types.c                 |   2 +-
>  src/locking/lock_driver_nop.c          |   1 -
>  src/network/bridge_driver.c            |   1 -
>  src/network/bridge_driver_linux.c      |   1 -
>  src/nwfilter/nwfilter_learnipaddr.c    |   1 -
>  src/phyp/phyp_driver.c                 |   1 -
>  src/qemu/qemu_alias.c                  |   1 -
>  src/qemu/qemu_domain_address.c         |  86 ++++++++---------
>  src/qemu/qemu_driver.c                 |   1 -
>  src/qemu/qemu_monitor.c                |   1 -
>  src/qemu/qemu_monitor_json.c           |   1 -
>  src/qemu/qemu_process.c                |   1 -
>  src/storage/storage_backend_sheepdog.c |   3 -
>  src/storage/storage_driver.c           |   1 -
>  src/storage/storage_util.c             |   1 -
>  src/test/test_driver.c                 |   2 -
>  src/util/vircommand.c                  |   6 +-
>  src/util/virdnsmasq.c                  |   1 -
>  src/util/virfile.c                     |   1 -
>  src/util/virnetdev.c                   |  49 +++++-----
>  src/util/virnetdevmacvlan.c            |  11 +--
>  src/util/virnetdevvportprofile.c       |   2 +-
>  src/util/virstoragefile.c              |   1 -
>  src/util/virutil.c                     |   3 +-
>  src/vbox/vbox_storage.c                |   1 -
>  src/vbox/vbox_tmpl.c                   |   8 +-
>  src/vz/vz_driver.c                     |   1 -
>  src/vz/vz_sdk.c                        |   1 -
>  src/xenapi/xenapi_driver.c             |   2 -
>  src/xenconfig/xen_common.c             |  11 +--
>  tests/qemuxml2argvmock.c               |   2 +-
>  tests/sexpr2xmltest.c                  |  44 ++++-----
>  tests/virnetdevmock.c                  |   1 -
>  tests/virnettlshelpers.c               |  18 ++--
>  tests/virshtest.c                      | 128 ++++++++++++-------------
>  tests/vshtabletest.c                   |   3 -
>  tests/xml2sexprtest.c                  |  36 +++----
>  tools/virsh-volume.c                   |   1 -
>  tools/virt-admin.c                     |   1 -
>  51 files changed, 284 insertions(+), 320 deletions(-)
> 

Fixed ordering, ACKed and pushed.

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list