[libvirt] [PATCH 05/10] libxl: pass ipaddr to libxl toolstack

[Jim Fehlig]

Marek Marczykowski-Górecki wrote:
> Do not silently ignore its value. LibXL support only one address, so
> refuse multiple IPs.
>
> Signed-off-by: Marek Marczykowski-Górecki <marmarek at invisiblethingslab.com>
> ---
>  src/libxl/libxl_conf.c   |  5 +++++
>  src/libxl/libxl_domain.c | 11 +++++++++++
>  2 files changed, 16 insertions(+)
>
> diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
> index c9f8ad5..4730585 100644
> --- a/src/libxl/libxl_conf.c
> +++ b/src/libxl/libxl_conf.c
> @@ -1133,6 +1133,11 @@ libxlMakeNic(virDomainDefPtr def,
>          case VIR_DOMAIN_NET_TYPE_ETHERNET:
>              if (VIR_STRDUP(x_nic->script, l_nic->script) < 0)
>                  return -1;
> +            if (l_nic->nips > 0) {
> +                x_nic->ip = virSocketAddrFormat(&l_nic->ips[0]->address);
> +                if (!x_nic->ip)
> +                    return -1;
> +            }
>   

IP address should be supported on VIR_DOMAIN_NET_TYPE_NETWORK interface
types too.  The domainXML docs even contain an example

http://libvirt.org/formatdomain.html#ipconfig

Regards,
Jim

>              break;
>          case VIR_DOMAIN_NET_TYPE_NETWORK:
>          {
> diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
> index 856cfb4..afb0b15 100644
> --- a/src/libxl/libxl_domain.c
> +++ b/src/libxl/libxl_domain.c
> @@ -482,6 +482,17 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
>          STRNEQ(def->os.type, "hvm"))
>          dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN;
>  
> +    if (dev->type == VIR_DOMAIN_DEVICE_NET &&
> +            (dev->data.net->type == VIR_DOMAIN_NET_TYPE_BRIDGE ||
> +             dev->data.net->type == VIR_DOMAIN_NET_TYPE_ETHERNET)) {
> +        if (dev->data.net->nips > 1) {
> +            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +                    _("multiple IP addresses not supported on device type %s"),
> +                    virDomainNetTypeToString(dev->data.net->type));
> +            return -1;
> +        }
> +    }
> +
>      if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV ||
>          (dev->type == VIR_DOMAIN_DEVICE_NET &&
>           dev->data.net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV)) {
>