Re: [PATCH 05 of 10] libxl: Set libxl_device_nic->domid when looking up by devid

[Ian Campbell <Ian.Campbell@eu.citrix.com>]

On Sat, 2011-06-04 at 00:24 +0100, Marek Marczykowski wrote:
> On 03.06.2011 10:11, Ian Campbell wrote:
> > On Thu, 2011-06-02 at 23:35 +0100, Marek Marczykowski wrote:
> >> # HG changeset patch
> >> # User Marek Marczykowski <marmarek@mimuw.edu.pl>
> >> # Date 1306962980 -7200
> >> # Node ID 3e5e8eaf2fe8352e584e7498fde21d6e76c3475b
> >> # Parent  df639d3eef683460b6d5ab38296cbd90b26f60f0
> >> libxl: Set libxl_device_nic->domid when looking up by devid
> >>
> >> Fixes xl network-detach with device specified by id, not MAC
> > 
> > Please rebase onto xen-unstable.hg, the libxl_device_* structures no
> > longer contain a domid in that tree, it is passed as a parameter to the
> > relevant functions now.
> 
> Ok, but in 4.1 tree still domid field exists and is used. So this should
> be fixed somehow (by applying this patch, or by backporting some other
> patches from unstable)...

IMHO the patch which removes domid is not suitable for backporting
(since it changes libxl API). So this patch seems suitable for 4.1
directly, I think.

Thanks,Ian.

> 
> > 
> > Ian.
> > 
> >>
> >> Signed-off-by: Marek Marczykowski <marmarek@mimuw.edu.pl>
> >>
> >> diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c
> >> --- a/tools/libxl/libxl_utils.c
> >> +++ b/tools/libxl/libxl_utils.c
> >> @@ -512,6 +512,7 @@
> >>      }
> >>      nic->backend_domid = strtoul(val, NULL, 10);
> >>      nic->devid = strtoul(devid, NULL, 10);
> >> +    nic->domid = domid;
> >>  
> >>      val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/mac", nic_path_fe));
> >>      for (i = 0, tok = strtok(val, ":"); tok && (i < 6);
> >>
> >>
> >>
> >> _______________________________________________
> >> Xen-devel mailing list
> >> Xen-devel@lists.xensource.com
> >> http://lists.xensource.com/xen-devel
> > 
> > 
> 
>