On Thu, Jul 07, 2011 at 03:55:01AM -0400, Laine Stump wrote: > On 07/07/2011 03:24 AM, Matthias Bolte wrote: > >No functional change included. > >--- > > python/libvirt-override.c | 1 - > > src/conf/domain_conf.c | 1 - > > src/conf/interface_conf.c | 1 - > > src/conf/network_conf.c | 1 - > > src/conf/node_device_conf.c | 4 - > > src/conf/storage_conf.c | 1 - > > src/interface/netcf_driver.c | 16 ++---- > > src/libxl/libxl_driver.c | 2 +- > > src/lxc/lxc_driver.c | 2 +- > > src/node_device/node_device_driver.c | 2 - > > src/node_device/node_device_linux_sysfs.c | 2 - > > src/nwfilter/nwfilter_ebiptables_driver.c | 2 - > > src/openvz/openvz_driver.c | 87 ++++++++++++++--------------- > > src/qemu/qemu_capabilities.c | 2 +- > > src/qemu/qemu_command.c | 2 +- > > src/qemu/qemu_driver.c | 10 +-- > > src/qemu/qemu_process.c | 1 - > > src/rpc/virnetclient.c | 2 - > > src/rpc/virnetserverservice.c | 2 - > > src/uml/uml_driver.c | 2 - > > src/xen/xen_driver.c | 1 - > > src/xen/xs_internal.c | 12 ++-- > > src/xenxs/xen_xm.c | 1 - > > tests/virnetsockettest.c | 3 - > > 24 files changed, 60 insertions(+), 100 deletions(-) > > > >diff --git a/python/libvirt-override.c b/python/libvirt-override.c > > True, there don't appear to be any functional changes, and it's nice > to have a consistent style to the code. My only problem with this > type of commit is that it increases the chances of merge conflicts > now and in the future (when someone tries to backport a bugfix to > some stable downstream release.) (I periodically have a desire to > make similar changes, but then discourage myself for that reason; > maybe I'm just too conservative) > > I assume these were found by an automated tool - do just these > changes make all of the source in libvirt consistent to "the style"? > Especially if that's the case, I lean more towards pushing them than > not; hopefully any merge conflicts that come up will be easy to > solve (definitely easier than the ones caused by actual functional > changes in the code!), and we can start enforcing the style. > > So, 1/2 ACK, but wait for someone else to give their 1/2 ACK. ACK. Yes it causes merge pain, but we're usually better off over the long term with this sort of thing. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list