1. 14 3月, 2014 10 次提交
    • L
      conf: eliminate hardcoded indent in volume/pool xml · 5f845437
      Laine Stump 提交于
      Again completely mechanical, but a lot of lines.
      5f845437
    • L
      conf: eliminate hardcoded indentation in node device xml · f728155f
      Laine Stump 提交于
      Completely mechanical changes, but there were a lot of lines so I made
      it a separate patch.
      f728155f
    • L
      conf: eliminate hardcoded indentation in capabilities xml · 75f0b66c
      Laine Stump 提交于
      There were a lot of changes here, but all very mechanical. For some
      reason, the virBufferPtr had been named "xml" instead of "buf" in this
      file, so since the indentation changing touched almost every line
      using the buffer, I took this chance to change its name for "buf" for
      consistency with every other file.
      75f0b66c
    • L
      conf: eliminate hardcoded indentation in nwfilter xml · d3679928
      Laine Stump 提交于
      This file was using multiple virBuffers, inserting the contents of
      buf3 into buf2, then inserting the contents of buf2 into buf1, rather
      than the more conventional method of just passing around a single
      virBufferPtr and streaming everything into that single buffer. This
      was unnecessary, and also made it more difficult to make indentation
      relative, because when you insert a string into a buffer, the
      indentation of the buffer is only applied once at the beginning of the
      string, *not* each time a newline is encountered in the string.
      d3679928
    • L
      conf: eliminate outmoded/odd indent method from interface xml · 257e62df
      Laine Stump 提交于
      These format functions needed the ability to be indented by an
      arbitrary amount, but were written before the introduction of
      virBufferAdjustIndent(). They instead used the much more clunky method
      of adding a "level" arg to every format function, and padding with
      spaces using the "%*s" printf format specifier (giving it the level,
      and "", which has the effect of adding level spaces to the output).
      
      While eliminating the hardcoded indentation in other xml, I decided it
      was finally time to also modernize the interface formatter code to
      make it more consistent.
      257e62df
    • L
      conf: eliminate hardcoded indent from network xml · b1258b27
      Laine Stump 提交于
      This was very simple, since the only place that had hardcoded
      indentation was a few items in the network status xml.
      b1258b27
    • L
      conf: eliminate hardcoded indent from domain snapshot xml · b9e9b76e
      Laine Stump 提交于
      All leading spaces in domain snapshot xml format functions have been
      replaced with appropriate calls to virBufferAdjustIndent(). This will
      make it easier to call other similarly fixed format functions
      (e.g. domain device format functions).
      b9e9b76e
    • L
      conf: eliminate hardcoded indent from domain xml · ca6dc7b5
      Laine Stump 提交于
      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).
      
      To make it possible to insert a properly indented device anywhere into
      an XML document, this patch removes hardcoded spaces from the
      formatting functions, and calls virBufferAdjustIndent() at appropriate
      places instead. (a regex search of domain_conf.c was done to assure
      that all occurrences of hardcoded spaces were removed).
      
      virDomainDiskSourceDefFormatInternal() is also called from
      snapshot_conf.c, so two virBufferAdjustIndent() calls were temporarily
      added around that call - those functions will have hardcoded spaces
      removed in a separate patch.
      
      This could cause some conflicts when backporting future changes to the
      formatting functions to older branches, but fortunately the changes
      are almost all trivial, so conflict resolution will be obvious.
      ca6dc7b5
    • S
      nwfilter: Add ARP src/dst IP mask for ebtables ARP · a81756f1
      Stefan Berger 提交于
      Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=862887
      
      Add a netmask for the source and destination IP address for the
      ebtables --arp-ip-src and --arp-ip-dst options. Extend the XML
      parser with support for XML attributes for these netmasks similar
      to already supported netmasks. Extend the documentation.
      Signed-off-by: NStefan Berger <stefanb@linux.vnet.ibm.com>
      a81756f1
    • S
      nwfilter: Fix rule priority problem · 5a2b17be
      Stefan Berger 提交于
      Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1072292
      
      Fix a problem related to rule priorities that did not allow to
      have rules applied that had a higher priority than the chain they
      were in. In this case the chain did not exist yet when the rule
      was instantiated. The solution is to adjust the priority of rules
      if the priority of the chain is of higher value. That way the chain
      will be created before the rule.
      Signed-off-by: NStefan Berger <stefanb@linux.vnet.ibm.com>
      5a2b17be
  2. 13 3月, 2014 30 次提交