[libvirt] [PATCH 1/9] conf: eliminate hardcoded indent from all xml

Laine Stump laine at laine.org
Thu Mar 6 15:24:23 UTC 2014


Many of the domain xml format functions (including all of the device
format functions) had hard-coded spaces, which made for incorrect
indentation when those functions were called in a different context
(for example, commit 2122cf39 added <interface> XML into the document
provided to a network hook script, and in this case it should have
been indented by 2 spaces, but was instead indented by 6 spaces).

In that patch I mentioned doing a followup patch to make the device
xml formatters more consistent. After doing that patch, it felt
incomplete to not give the same treatment to the entire directory.

The one downside to this series is that it may create merge conflicts
during backports, but fortunately the conflicts should all be fairly
easy to resolve.

Laine Stump (9):
  conf: eliminate hardcoded indent from domain xml
  conf: eliminate hardcoded indent from domain snapshot xml
  conf: eliminate hardcoded indent from network xml
  conf: eliminate outmoded/odd indent method from interface xml
  conf: eliminate hardcoded indentation in nwfilter xml
  conf: eliminate hardcoded indentation in capabilities xml
  conf: eliminate hardcoded indentation in node device xml
  conf: eliminate hardcoded indent in volume/pool xml
  conf: eliminate hardcoded indentation in all remaining xml

 src/conf/capabilities.c              | 183 ++++++-----
 src/conf/cpu_conf.c                  |  11 +-
 src/conf/domain_conf.c               | 599 +++++++++++++++++++----------------
 src/conf/interface_conf.c            | 137 ++++----
 src/conf/netdev_bandwidth_conf.c     |   6 +-
 src/conf/netdev_vlan_conf.c          |   6 +-
 src/conf/netdev_vport_profile_conf.c |   6 +-
 src/conf/network_conf.c              |   8 +-
 src/conf/node_device_conf.c          | 207 ++++++------
 src/conf/nwfilter_conf.c             |  94 ++----
 src/conf/nwfilter_params.c           |   6 +-
 src/conf/secret_conf.c               |  20 +-
 src/conf/snapshot_conf.c             |  48 +--
 src/conf/storage_conf.c              | 174 +++++-----
 src/conf/storage_encryption_conf.c   |   6 +-
 15 files changed, 811 insertions(+), 700 deletions(-)

-- 
1.8.5.3




More information about the libvir-list mailing list