[libvirt] [PATCH] Parse ipaddr for bridge network types

[Jim Meyering]

john.levon at sun.com wrote:
> Parse ipaddr for bridge network types
>
> As well as supporting round-tripping of the IP address, this fixes a
> leak if ipaddr was specified in the Xen domain config.
>
> diff --git a/src/domain_conf.c b/src/domain_conf.c

At first glance it looks fine.
I do appreciate the accompanying tests.  However, ...
Please rebase and repost.
I went to apply/test and got 5 failed hunks in 3 files:

  patching file src/domain_conf.c
  Hunk #1 FAILED at 289.
  Hunk #2 succeeded at 887 (offset -1 lines).
  Hunk #3 succeeded at 932 with fuzz 2 (offset -23 lines).
  Hunk #4 FAILED at 2872.
  2 out of 4 hunks FAILED -- saving rejects to file src/domain_conf.c.rej
  patching file src/domain_conf.h
  Hunk #1 FAILED at 155.
  1 out of 1 hunk FAILED -- saving rejects to file src/domain_conf.h.rej
  patching file src/xend_internal.c
  Hunk #1 FAILED at 1756.
  Hunk #2 succeeded at 1787 with fuzz 2 (offset -14 lines).
  Hunk #3 FAILED at 5093.
  2 out of 3 hunks FAILED -- saving rejects to file src/xend_internal.c.rej
  patching file src/xm_internal.c
  Hunk #1 succeeded at 1084 with fuzz 2 (offset 13 lines).
  Hunk #2 succeeded at 1868 (offset 33 lines).
  patching file tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
  patching file tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
  patching file tests/sexpr2xmltest.c
  patching file tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
  patching file tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
  patching file tests/xml2sexprtest.c