[Xen-changelog] [xen stable-4.6] libxl: compilation warning fix for arm & aarch64

[patchbot@xxxxxxx]

commit 6ebcc5b28d5f80e3b04c96d691577833fdae215a
Author:     Chris Patterson <pattersonc@xxxxxxxxxxxx>
AuthorDate: Wed Jul 27 16:01:26 2016 -0400
Commit:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CommitDate: Thu May 30 13:56:24 2019 +0100

    libxl: compilation warning fix for arm & aarch64
    
    GCC 6 will warn on unused static const variables in c modules:
    https://gcc.gnu.org/ml/gcc-patches/2015-09/msg00847.html
    
    When compiling with LIBXL_HAVE_NO_SUSPEND_RESUME set (arm & aarch64),
    the compiler emits the following errors:
      xl_cmdimpl.c:101:19: error: 'migrate_report'
          defined but not used [-Werror=unused-const-variable=]
      xl_cmdimpl.c:99:19: error: 'migrate_permission_to_go'
          defined but not used [-Werror=unused-const-variable=]
      xl_cmdimpl.c:97:19: error: 'migrate_receiver_ready'
          defined but not used [-Werror=unused-const-variable=]
      xl_cmdimpl.c:95:19: error: 'migrate_receiver_banner'
          defined but not used [-Werror=unused-const-variable=]
    
    These unused const variables are only used in functions which exist between
    the ifndef block:
       #ifndef LIBXL_HAVE_NO_SUSPEND_RESUME
       ...
       #endif
    
    Wrap the same ifndef around these variables.
    
    Signed-off-by: Chris Patterson <pattersonc@xxxxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    (cherry picked from commit 5f28de0b0e474e01931b719fa27ca30b8aa446e0)
    (cherry picked from commit c51a3a5826a64f0807545460bfc35022dc9c8428)
---
 tools/libxl/xl_cmdimpl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index b01d6f7700..201b337b09 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -92,6 +92,7 @@ static int fd_lock = -1;
 static const char savefileheader_magic[32]=
     "Xen saved domain, xl format\n \0 \r";
 
+#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME
 static const char migrate_receiver_banner[]=
     "xl migration receiver ready, send binary domain data.\n";
 static const char migrate_receiver_ready[]=
@@ -100,6 +101,8 @@ static const char migrate_permission_to_go[]=
     "domain is yours, you are cleared to unpause";
 static const char migrate_report[]=
     "my copy unpause results are as follows";
+#endif
+
   /* followed by one byte:
    *     0: everything went well, domain is running
    *            next thing is we all exit
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog