[libvirt] [PATCH] openvz: fix bridge devices parsing in openvzReadNetworkConf()

[Matthias Bolte]

2011/5/31 Jean-Baptiste Rouault <jean-baptiste.rouault at diateam.net>:
> strchrnul() was called on the wrong string so it returned
> the same result for each iteration.
> ---
>  src/openvz/openvz_conf.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
> index 5f33f75..6e32242 100644
> --- a/src/openvz/openvz_conf.c
> +++ b/src/openvz/openvz_conf.c
> @@ -237,7 +237,7 @@ openvzReadNetworkConf(virDomainDefPtr def,
>
>             /*parse string*/
>             do {
> -                char *next = strchrnul (token, ',');
> +                char *next = strchrnul (p, ',');
>                 if (STRPREFIX(p, "ifname=")) {
>                     /* skip in libvirt */
>                 } else if (STRPREFIX(p, "host_ifname=")) {
> --
> 1.7.1

ACK and applied, thanks.

I also added a testcase and looked at the other config parsing code in
the OpenVZ driver. I thing that openvzLoadDomains is missing this
line:

  dom->def->virtType = VIR_DOMAIN_VIRT_OPENVZ;

Could you do a virsh dumpxml for an OpenVZ guest and check the first
line of XML? I think it currently reads

  <domain type='qemu'>

but should actually read

  <domain type='openvz'>

and we need to fix this.

Matthias