1. 14 3月, 2014 3 次提交
    • 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 37 次提交