| Message ID | 1473067564-4092-1-git-send-email-marmarek@invisiblethingslab.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Sep 05, 2016 at 11:26:04AM +0200, Marek Marczykowski-Górecki wrote: > Fill backend_domid field based on backend path. > > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Wei Liu <wei.liu2@citrix.com> > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> Acked-by: Wei Liu <wei.liu2@citrix.com> I think this is a backport candidate? > --- > tools/libxl/libxl_nic.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/tools/libxl/libxl_nic.c b/tools/libxl/libxl_nic.c > index c34b7ba..d1caa90 100644 > --- a/tools/libxl/libxl_nic.c > +++ b/tools/libxl/libxl_nic.c > @@ -309,6 +309,18 @@ static int libxl__device_nic_from_xenstore(libxl__gc *gc, > else > nic->devid = 0; > > + rc = libxl__xs_read_checked(gc, XBT_NULL, > + GCSPRINTF("%s/backend", libxl_path), &tmp); > + if (rc) goto out; > + > + if (!tmp) { > + LOG(ERROR, "nic %s does not exist (no backend path)", libxl_path); > + rc = ERROR_FAIL; > + goto out; > + } > + rc = libxl__backendpath_parse_domid(gc, tmp, &nic->backend_domid); > + if (rc) goto out; > + > /* nic->mtu = */ > > rc = libxl__xs_read_checked(gc, XBT_NULL, > -- > 2.5.5 >
On Mon, Sep 05, 2016 at 10:39:16AM +0100, Wei Liu wrote: > On Mon, Sep 05, 2016 at 11:26:04AM +0200, Marek Marczykowski-Górecki wrote: > > Fill backend_domid field based on backend path. > > > > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > > Cc: Wei Liu <wei.liu2@citrix.com> > > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> > > Acked-by: Wei Liu <wei.liu2@citrix.com> > > I think this is a backport candidate? Yes, certainly. If you want I can send a 4.7 version (function is in libxl.c there). In general, should I somehow somehow request a backport in the patch itself? How? > > --- > > tools/libxl/libxl_nic.c | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/tools/libxl/libxl_nic.c b/tools/libxl/libxl_nic.c > > index c34b7ba..d1caa90 100644 > > --- a/tools/libxl/libxl_nic.c > > +++ b/tools/libxl/libxl_nic.c > > @@ -309,6 +309,18 @@ static int libxl__device_nic_from_xenstore(libxl__gc *gc, > > else > > nic->devid = 0; > > > > + rc = libxl__xs_read_checked(gc, XBT_NULL, > > + GCSPRINTF("%s/backend", libxl_path), &tmp); > > + if (rc) goto out; > > + > > + if (!tmp) { > > + LOG(ERROR, "nic %s does not exist (no backend path)", libxl_path); > > + rc = ERROR_FAIL; > > + goto out; > > + } > > + rc = libxl__backendpath_parse_domid(gc, tmp, &nic->backend_domid); > > + if (rc) goto out; > > + > > /* nic->mtu = */ > > > > rc = libxl__xs_read_checked(gc, XBT_NULL, > > -- > > 2.5.5 > >
On Mon, Sep 05, 2016 at 11:44:46AM +0200, Marek Marczykowski-Górecki wrote: > On Mon, Sep 05, 2016 at 10:39:16AM +0100, Wei Liu wrote: > > On Mon, Sep 05, 2016 at 11:26:04AM +0200, Marek Marczykowski-Górecki wrote: > > > Fill backend_domid field based on backend path. > > > > > > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > > > Cc: Wei Liu <wei.liu2@citrix.com> > > > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> > > > > Acked-by: Wei Liu <wei.liu2@citrix.com> > > > > I think this is a backport candidate? > > Yes, certainly. If you want I can send a 4.7 version (function is in > libxl.c there). > That would be helpful. Please use PATCH for-4.7 tag and use the technique I describe below to add postscript that you don't wish to be in commit message. > In general, should I somehow somehow request a backport in the patch > itself? How? State between the three dashes anything you wish to say --- the content would be automatically stripped out when committing. I normally do like this in commit message libxl: fix foo Foo is broken because of X, fix it by doing Y. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Please backport to version Z of Xen. > > > > --- > > > tools/libxl/libxl_nic.c | 12 ++++++++++++ > > > 1 file changed, 12 insertions(+) > > > > > > diff --git a/tools/libxl/libxl_nic.c b/tools/libxl/libxl_nic.c > > > index c34b7ba..d1caa90 100644 > > > --- a/tools/libxl/libxl_nic.c > > > +++ b/tools/libxl/libxl_nic.c > > > @@ -309,6 +309,18 @@ static int libxl__device_nic_from_xenstore(libxl__gc *gc, > > > else > > > nic->devid = 0; > > > > > > + rc = libxl__xs_read_checked(gc, XBT_NULL, > > > + GCSPRINTF("%s/backend", libxl_path), &tmp); > > > + if (rc) goto out; > > > + > > > + if (!tmp) { > > > + LOG(ERROR, "nic %s does not exist (no backend path)", libxl_path); > > > + rc = ERROR_FAIL; > > > + goto out; > > > + } > > > + rc = libxl__backendpath_parse_domid(gc, tmp, &nic->backend_domid); > > > + if (rc) goto out; > > > + > > > /* nic->mtu = */ > > > > > > rc = libxl__xs_read_checked(gc, XBT_NULL, > > > -- > > > 2.5.5 > > > > > -- > Best Regards, > Marek Marczykowski-Górecki > Invisible Things Lab > A: Because it messes up the order in which people normally read text. > Q: Why is top-posting such a bad thing?
Wei Liu writes ("Re: [PATCH] libxl: do not assume Dom0 backend while getting nic info"):
> On Mon, Sep 05, 2016 at 11:44:46AM +0200, Marek Marczykowski-Górecki wrote:
> > Yes, certainly. If you want I can send a 4.7 version (function is in
> > libxl.c there).
Thanks for the backport.
Wei, can you mail me here (or tell me on irc) when the unstable fix
goes into staging ?
Thanks,
Ian.
On Mon, Sep 05, 2016 at 11:39:22AM +0100, Ian Jackson wrote: > Wei Liu writes ("Re: [PATCH] libxl: do not assume Dom0 backend while getting nic info"): > > On Mon, Sep 05, 2016 at 11:44:46AM +0200, Marek Marczykowski-Górecki wrote: > > > Yes, certainly. If you want I can send a 4.7 version (function is in > > > libxl.c there). > > Thanks for the backport. > > Wei, can you mail me here (or tell me on irc) when the unstable fix > goes into staging ? > This patch is now in staging. Wei. > Thanks, > Ian.
diff --git a/tools/libxl/libxl_nic.c b/tools/libxl/libxl_nic.c index c34b7ba..d1caa90 100644 --- a/tools/libxl/libxl_nic.c +++ b/tools/libxl/libxl_nic.c @@ -309,6 +309,18 @@ static int libxl__device_nic_from_xenstore(libxl__gc *gc, else nic->devid = 0; + rc = libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/backend", libxl_path), &tmp); + if (rc) goto out; + + if (!tmp) { + LOG(ERROR, "nic %s does not exist (no backend path)", libxl_path); + rc = ERROR_FAIL; + goto out; + } + rc = libxl__backendpath_parse_domid(gc, tmp, &nic->backend_domid); + if (rc) goto out; + /* nic->mtu = */ rc = libxl__xs_read_checked(gc, XBT_NULL,
Fill backend_domid field based on backend path. Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> --- tools/libxl/libxl_nic.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)