[Qemu-devel] [PATCH] coverity-model: Fix replay_get_byte()

[Qemu-devel] [PATCH] coverity-model: Fix replay_get_byte()

[Markus Armbruster]

Coverity 2018.06 chokes on replay_get_byte():

    $ cov-make-library -of scripts/coverity-model.xmldb scripts/coverity-model.c
    output file: scripts/coverity-model.xmldb
    Compiling scripts/coverity-model.c with command /opt/cov-sa-2018.06/bin/cov-emit --dir /tmp/cov-armbru/930a6fb31e5f464fc1a53354b2deb66b/cov-make-library-emit -w --no_error_recovery --emit_header_functions --no_implicit_decl --preinclude /opt/cov-sa-2018.06/library/decls.h --c scripts/coverity-model.c
    "scripts/coverity-model.c", line 110: error #20: identifier "replay_file" is
              undefined
           if (replay_file) {
               ^

    Emit for file '/work/armbru/qemu/scripts/coverity-model.c' complete.
    [ERROR] 1 error detected in the compilation of "scripts/coverity-model.c".
    ERROR: cov-emit returned with code 1

Broken in commit 04a0afe5285.  Fix by dumbing down.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 scripts/coverity-model.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c
index 48b112393b..2c0346ff25 100644
--- a/scripts/coverity-model.c
+++ b/scripts/coverity-model.c
@@ -106,12 +106,8 @@ static int get_keysym(const name2keysym_t *table,
 /* Replay data is considered trusted.  */
 uint8_t replay_get_byte(void)
 {
-     uint8_t byte = 0;
-     if (replay_file) {
-         uint8_t c;
-         byte = c;
-     }
-     return byte;
+    uint8_t byte;
+    return byte;
 }
 
 
-- 
2.17.1

Re: [Qemu-devel] [PATCH] coverity-model: Fix replay_get_byte()

[Paolo Bonzini]

On 26/06/2018 10:56, Markus Armbruster wrote:
> Coverity 2018.06 chokes on replay_get_byte():
> 
>     $ cov-make-library -of scripts/coverity-model.xmldb scripts/coverity-model.c
>     output file: scripts/coverity-model.xmldb
>     Compiling scripts/coverity-model.c with command /opt/cov-sa-2018.06/bin/cov-emit --dir /tmp/cov-armbru/930a6fb31e5f464fc1a53354b2deb66b/cov-make-library-emit -w --no_error_recovery --emit_header_functions --no_implicit_decl --preinclude /opt/cov-sa-2018.06/library/decls.h --c scripts/coverity-model.c
>     "scripts/coverity-model.c", line 110: error #20: identifier "replay_file" is
>               undefined
>            if (replay_file) {
>                ^
> 
>     Emit for file '/work/armbru/qemu/scripts/coverity-model.c' complete.
>     [ERROR] 1 error detected in the compilation of "scripts/coverity-model.c".
>     ERROR: cov-emit returned with code 1
> 
> Broken in commit 04a0afe5285.  Fix by dumbing down.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  scripts/coverity-model.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c
> index 48b112393b..2c0346ff25 100644
> --- a/scripts/coverity-model.c
> +++ b/scripts/coverity-model.c
> @@ -106,12 +106,8 @@ static int get_keysym(const name2keysym_t *table,
>  /* Replay data is considered trusted.  */
>  uint8_t replay_get_byte(void)
>  {
> -     uint8_t byte = 0;
> -     if (replay_file) {
> -         uint8_t c;
> -         byte = c;
> -     }
> -     return byte;
> +    uint8_t byte;
> +    return byte;
>  }
>  
>  
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>