[Xen-changelog] [xen stable-4.6] libxl: don't shadow global "socket" in psr code

[patchbot@xxxxxxx]

commit a15b47f4ce37c3ff0ea6d68418fbb88517fcdb9c
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Wed Sep 30 15:54:11 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Sep 30 16:41:42 2015 +0100

    libxl: don't shadow global "socket" in psr code
    
    SLES11 and OpenSUSE 11.4 complain:
    
    [ 1227s] libxl_psr.c: In function 'libxl_psr_cat_get_l3_info':
    [ 1227s] libxl_psr.c:342: error: declaration of 'socket' shadows a > global 
declaration
    
    Change "socket" to "socketid" to fix the problem.
    
    Reported-by: Olaf Hering <olaf@xxxxxxxxx>
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Cc: Chao Peng <chao.p.peng@xxxxxxxxxxxxxxx>
    Tested-by: Olaf Hering <olaf@xxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    (cherry picked from commit d776ffe95324a45626a635cf46e9e9b436083a12)
---
 tools/libxl/libxl_psr.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c
index 30740a1..000d748 100644
--- a/tools/libxl/libxl_psr.c
+++ b/tools/libxl/libxl_psr.c
@@ -339,7 +339,7 @@ int libxl_psr_cat_get_l3_info(libxl_ctx *ctx, 
libxl_psr_cat_info **info,
 {
     GC_INIT(ctx);
     int rc;
-    int i = 0, socket, nr_sockets;
+    int i = 0, socketid, nr_sockets;
     libxl_bitmap socketmap;
     libxl_psr_cat_info *ptr;
 
@@ -360,10 +360,10 @@ int libxl_psr_cat_get_l3_info(libxl_ctx *ctx, 
libxl_psr_cat_info **info,
 
     ptr = libxl__malloc(NOGC, nr_sockets * sizeof(libxl_psr_cat_info));
 
-    libxl_for_each_set_bit(socket, socketmap) {
-        ptr[i].id = socket;
-        if (xc_psr_cat_get_l3_info(ctx->xch, socket, &ptr[i].cos_max,
-                                                     &ptr[i].cbm_len)) {
+    libxl_for_each_set_bit(socketid, socketmap) {
+        ptr[i].id = socketid;
+        if (xc_psr_cat_get_l3_info(ctx->xch, socketid, &ptr[i].cos_max,
+                                   &ptr[i].cbm_len)) {
             libxl__psr_cat_log_err_msg(gc, errno);
             rc = ERROR_FAIL;
             free(ptr);
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

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