Skip to contentSkip to conversation

migration: Silence compiler warning in global_state_store_running()

PATCH Superseded Thomas Huth 3 participants 5 messages Sep 16, 2020 – Sep 17, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 migration: Silence compiler warning in global_state_store_running()

GCC 9.3.0 on Ubuntu complains:

In file included from /usr/include/string.h:495,

                 from /home/travis/build/huth/qemu/include/qemu/osdep.h:87,
                 from ../migration/global_state.c:13:
In function ‘strncpy’,
    inlined from ‘global_state_store_running’ at ../migration/global_state.c:47:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 100 equals destination size [-Werror=stringop-truncation]
  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... but we apparently really want to do the strncpy here. Silence the warning with QEMU_NONSTRING.

---
 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
migration/global_state.c +2 -2
index 25311479a4..f1355d7d97 100644
@@ -43,9 +43,9 @@ int global_state_store(void)
 void global_state_store_running(void)
 {
     const char *state = RunState_str(RUN_STATE_RUNNING);
+    QEMU_NONSTRING char *dest = (char *)global_state.runstate;
     assert(strlen(state) < sizeof(global_state.runstate));
-    strncpy((char *)global_state.runstate,
-           state, sizeof(global_state.runstate));
+    strncpy(dest, state, sizeof(global_state.runstate));
 }
 
 bool global_state_received(void)
Signature · 1 line
2.18.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 24 lines · Thomas Huth

GCC 9.3.0 on Ubuntu complains:

In file included from /usr/include/string.h:495,

                  from /home/travis/build/huth/qemu/include/qemu/osdep.h:87,
                  from ../migration/global_state.c:13:
In function ‘strncpy’,
     inlined from ‘global_state_store_running’ at ../migration/global_state.c:47:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 100 equals destination size [-Werror=stringop-truncation]
   106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... but we apparently really want to do the strncpy here. Silence the warning with QEMU_NONSTRING.

---
  migration/global_state.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
migration/global_state.c +0 -0
index 25311479a4..f1355d7d97 100644

migration/global_state.c int global_state_store(void) · line 46

Quoted 4 lines
migration/global_state.c +1 -0
@@ -43,9 +43,9 @@ int global_state_store(void)
  void global_state_store_running(void)
  {
      const char *state = RunState_str(RUN_STATE_RUNNING);
+    QEMU_NONSTRING char *dest = (char *)global_state.runstate;

Do we still need the cast to char*?

migration/global_state.c int global_state_store(void) · line 50

Quoted 6 lines
migration/global_state.c +1 -2
      assert(strlen(state) < sizeof(global_state.runstate));
-    strncpy((char *)global_state.runstate,
-           state, sizeof(global_state.runstate));
+    strncpy(dest, state, sizeof(global_state.runstate));
  }
 

Otherwise,

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#2 lore raw
In reply to Thomas Huth
Quoted 24 lines · Thomas Huth

GCC 9.3.0 on Ubuntu complains:

In file included from /usr/include/string.h:495,

                 from /home/travis/build/huth/qemu/include/qemu/osdep.h:87,
                 from ../migration/global_state.c:13:
In function ‘strncpy’,
    inlined from ‘global_state_store_running’ at ../migration/global_state.c:47:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 100 equals destination size [-Werror=stringop-truncation]
  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... but we apparently really want to do the strncpy here. Silence the warning with QEMU_NONSTRING.

---
 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
migration/global_state.c +0 -0
index 25311479a4..f1355d7d97 100644

migration/global_state.c int global_state_store(void) · line 49

Quoted 9 lines
migration/global_state.c +2 -2
@@ -43,9 +43,9 @@ int global_state_store(void)
 void global_state_store_running(void)
 {
     const char *state = RunState_str(RUN_STATE_RUNNING);
+    QEMU_NONSTRING char *dest = (char *)global_state.runstate;
     assert(strlen(state) < sizeof(global_state.runstate));
-    strncpy((char *)global_state.runstate,
-           state, sizeof(global_state.runstate));
+    strncpy(dest, state, sizeof(global_state.runstate));
 }

Darn, I was sending too fast here, sorry, but seems like this does *not* fix the issue with GCC 9.3:

https://travis-ci.com/github/huth/qemu/jobs/385871010#L2930

... so maybe we should simply switch to strpadcpy() instead?

Thomas

#3 lore raw
Quoted 38 lines · Thomas Huth
Quoted 24 lines · Thomas Huth

GCC 9.3.0 on Ubuntu complains:

In file included from /usr/include/string.h:495,

                 from /home/travis/build/huth/qemu/include/qemu/osdep.h:87,
                 from ../migration/global_state.c:13:
In function ‘strncpy’,
    inlined from ‘global_state_store_running’ at ../migration/global_state.c:47:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 100 equals destination size [-Werror=stringop-truncation]
  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... but we apparently really want to do the strncpy here. Silence the warning with QEMU_NONSTRING.

---
 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
migration/global_state.c +0 -0
index 25311479a4..f1355d7d97 100644

migration/global_state.c int global_state_store(void) · line 49

Quoted 9 lines
migration/global_state.c +2 -2
@@ -43,9 +43,9 @@ int global_state_store(void)
 void global_state_store_running(void)
 {
     const char *state = RunState_str(RUN_STATE_RUNNING);
+    QEMU_NONSTRING char *dest = (char *)global_state.runstate;
     assert(strlen(state) < sizeof(global_state.runstate));
-    strncpy((char *)global_state.runstate,
-           state, sizeof(global_state.runstate));
+    strncpy(dest, state, sizeof(global_state.runstate));
 }

Darn, I was sending too fast here, sorry, but seems like this does *not* fix the issue with GCC 9.3:

Quoted 3 lines

https://travis-ci.com/github/huth/qemu/jobs/385871010#L2930

... so maybe we should simply switch to strpadcpy() instead?

Yes, and probably do so everywhere that strncpy is used.

Paolo

#4 lore raw
Quoted 39 lines · Paolo Bonzini
Quoted 38 lines · Thomas Huth
Quoted 24 lines · Thomas Huth

GCC 9.3.0 on Ubuntu complains:

In file included from /usr/include/string.h:495,

                 from /home/travis/build/huth/qemu/include/qemu/osdep.h:87,
                 from ../migration/global_state.c:13:
In function ‘strncpy’,
    inlined from ‘global_state_store_running’ at ../migration/global_state.c:47:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 100 equals destination size [-Werror=stringop-truncation]
  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... but we apparently really want to do the strncpy here. Silence the warning with QEMU_NONSTRING.

---
 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
migration/global_state.c +0 -0
index 25311479a4..f1355d7d97 100644

migration/global_state.c int global_state_store(void) · line 49

Quoted 9 lines
migration/global_state.c +2 -2
@@ -43,9 +43,9 @@ int global_state_store(void)
 void global_state_store_running(void)
 {
     const char *state = RunState_str(RUN_STATE_RUNNING);
+    QEMU_NONSTRING char *dest = (char *)global_state.runstate;
     assert(strlen(state) < sizeof(global_state.runstate));
-    strncpy((char *)global_state.runstate,
-           state, sizeof(global_state.runstate));
+    strncpy(dest, state, sizeof(global_state.runstate));
 }

Darn, I was sending too fast here, sorry, but seems like this does *not* fix the issue with GCC 9.3:

Quoted 5 lines
Quoted 3 lines

https://travis-ci.com/github/huth/qemu/jobs/385871010#L2930

... so maybe we should simply switch to strpadcpy() instead?

Yes, and probably do so everywhere that strncpy is used.

I think the trick with QEMU_NONSTRING should work fine in all cases where we have a real array, see e.g. buf[] in find_vdi_name() in block/sheepdog.c. It just does not seem to work in case you have a char* pointer instead of an array...

Thomas