[xen master] tools/kdd: alternative way of muting spurious gcc warning

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] tools/kdd: alternative way of muting spurious gcc warning

patchbot
commit 2de2b10b2252761baa5dd0077df384dbfcca8212
Author:     Marek Marczykowski-Górecki <[hidden email]>
AuthorDate: Tue May 22 21:47:45 2018 +0200
Commit:     Ian Jackson <[hidden email]>
CommitDate: Tue May 29 10:51:02 2018 +0100

    tools/kdd: alternative way of muting spurious gcc warning
   
    Older gcc does not support #pragma GCC diagnostics, so use alternative
    approach - change variable type to uint32_t (this code handle 32-bit
    requests only anyway), which apparently also avoid gcc complaining about
    this (otherwise correct) code.
   
    Fixes 437e00fea04becc91c1b6bc1c0baa636b067a5cc "tools/kdd: mute spurious
    gcc warning"
   
    Signed-off-by: Marek Marczykowski-Górecki <[hidden email]>
    Acked-by: Wei Liu <[hidden email]>
    Release-acked-by: Juergen Gross <[hidden email]>
    Acked-by: Tim Deegan <[hidden email]>
---
 tools/debugger/kdd/kdd.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/debugger/kdd/kdd.c b/tools/debugger/kdd/kdd.c
index 61d769ece9..5a019a0a0c 100644
--- a/tools/debugger/kdd/kdd.c
+++ b/tools/debugger/kdd/kdd.c
@@ -687,7 +687,7 @@ static void kdd_handle_read_ctrl(kdd_state *s)
         }
     } else {
         /* 32-bit control-register space starts at 0x[2]cc, for 84 bytes */
-        uint64_t offset = addr;
+        uint32_t offset = addr;
         if (offset > 0x200)
             offset -= 0x200;
         offset -= 0xcc;
@@ -695,10 +695,7 @@ static void kdd_handle_read_ctrl(kdd_state *s)
             KDD_LOG(s, "Request outside of known control space\n");
             len = 0;
         } else {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Warray-bounds"
             memcpy(buf, ((uint8_t *)&ctrl.c32) + offset, len);
-#pragma GCC diagnostic pop
         }
     }
 
--
generated by git-patchbot for /home/xen/git/xen.git#master


_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog