[Xen-changelog] [xen stable-4.3] libxl: Have READ_LIBXLDEV use libxl_path rather than be_path

[patchbot@xxxxxxx]

commit 399dabb4e0b75f9c324c6325f48eed6423ad561f
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Tue May 3 15:40:18 2016 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Jun 6 17:21:52 2016 +0100

    libxl: Have READ_LIBXLDEV use libxl_path rather than be_path
    
    Fix the just-introduced bug in this macro: now it reads the
    trustworthy libxl_path.  Change the variable name in the two functions
    (nic and channel) which use it.
    
    Shuffling the bump in the carpet along, we now introduce three new
    bugs: the three call sites pass a backend path where a frontend path
    is expected.
    
    No functional change.
    
    This is part of XSA-178.
    
    Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Reviewed-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/libxl/libxl.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 5e184c5..42cc24e 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2991,7 +2991,7 @@ out:
 }
 
 static void libxl__device_nic_from_xenstore(libxl__gc *gc,
-                                         const char *be_path,
+                                        const char *libxl_path,
                                          libxl_device_nic *nic)
 {
     libxl_ctx *ctx = libxl__gc_owner(gc);
@@ -3002,7 +3002,7 @@ static void libxl__device_nic_from_xenstore(libxl__gc *gc,
     libxl_device_nic_init(nic);
 
     tmp = xs_read(ctx->xsh, XBT_NULL,
-                  libxl__sprintf(gc, "%s/handle", be_path), &len);
+                  libxl__sprintf(gc, "%s/handle", libxl_path), &len);
     if ( tmp )
         nic->devid = atoi(tmp);
     else
@@ -3011,19 +3011,19 @@ static void libxl__device_nic_from_xenstore(libxl__gc 
*gc,
     /* nic->mtu = */
 
     tmp = xs_read(ctx->xsh, XBT_NULL,
-                  libxl__sprintf(gc, "%s/mac", be_path), &len);
+                  libxl__sprintf(gc, "%s/mac", libxl_path), &len);
     rc = libxl__parse_mac(tmp, nic->mac);
     if (rc)
         memset(nic->mac, 0, sizeof(nic->mac));
 
     nic->ip = xs_read(ctx->xsh, XBT_NULL,
-                      libxl__sprintf(gc, "%s/ip", be_path), &len);
+                      libxl__sprintf(gc, "%s/ip", libxl_path), &len);
 
     nic->bridge = xs_read(ctx->xsh, XBT_NULL,
-                      libxl__sprintf(gc, "%s/bridge", be_path), &len);
+                      libxl__sprintf(gc, "%s/bridge", libxl_path), &len);
 
     nic->script = xs_read(ctx->xsh, XBT_NULL,
-                      libxl__sprintf(gc, "%s/script", be_path), &len);
+                      libxl__sprintf(gc, "%s/script", libxl_path), &len);
 
     /* vif_ioemu nics use the same xenstore entries as vif interfaces */
     nic->nictype = LIBXL_NIC_TYPE_VIF;
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.3

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog