Commit e6f53fd5 authored by Markus Armbruster's avatar Markus Armbruster Committed by Anthony Liguori
Browse files

Fix warnings suppressors to honor --disable-werror 



Replace

    #pragma GCC diagnostic ignored FOO
    [Troublesome code...]
    #pragma GCC diagnostic error FOO

by

    #pragma GCC diagnostic push
    #pragma GCC diagnostic ignored FOO
    [Troublesome code...]
    #pragma GCC diagnostic pop

Broken in commit 3f4349dc, commit 092bb306, and commit c95e3080.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Tested-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1366113066-1340-1-git-send-email-armbru@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent bf2a38d4

configure

+2 −0
Original line number Diff line number Diff line
@@ -3268,8 +3268,10 @@ fi 


pragma_disable_unused_but_set=no

cat > $TMPC << EOF

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wunused-but-set-variable"

#pragma GCC diagnostic ignored "-Wstrict-prototypes"

#pragma GCC diagnostic pop



int main(void) {

    return 0;

coroutine-ucontext.c

+2 −1
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ Coroutine *qemu_coroutine_new(void) 
#ifdef CONFIG_VALGRIND_H

#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE

/* Work around an unused variable in the valgrind.h macro... */

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wunused-but-set-variable"

#endif

static inline void valgrind_stack_deregister(CoroutineUContext *co)
@@ -176,7 +177,7 @@ static inline void valgrind_stack_deregister(CoroutineUContext *co) 
    VALGRIND_STACK_DEREGISTER(co->valgrind_stack_id);

}

#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE

#pragma GCC diagnostic error "-Wunused-but-set-variable"

#pragma GCC diagnostic pop

#endif

#endif

include/ui/qemu-pixman.h

+2 −1
Original line number Diff line number Diff line
@@ -8,11 +8,12 @@ 


/* pixman-0.16.0 headers have a redundant declaration */

#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wredundant-decls"

#endif

#include <pixman.h>

#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE

#pragma GCC diagnostic error "-Wredundant-decls"

#pragma GCC diagnostic pop

#endif



#include "qemu/typedefs.h"

ui/gtk.c

+2 −1
Original line number Diff line number Diff line
@@ -38,11 +38,12 @@ 


#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE

/* Work around an -Wstrict-prototypes warning in GTK headers */

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wstrict-prototypes"

#endif

#include <gtk/gtk.h>

#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE

#pragma GCC diagnostic error "-Wstrict-prototypes"

#pragma GCC diagnostic pop

#endif