qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <laurent@vivier.eu>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	qemu-trivial@nongnu.org, "Anthony Green" <green@moxielogic.com>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	qemu-arm@nongnu.org, "Andrzej Zaborowski" <balrogg@gmail.com>,
	"Guan Xuetao" <gxt@mprc.pku.edu.cn>,
	"Michael Tokarev" <mjt@tls.msk.ru>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Artyom Tarasenko" <atar4qemu@gmail.com>,
	"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [Qemu-devel] [PULL 7/7] hw/input/tsc210x: Fix building with no verbosity
Date: Wed,  6 Feb 2019 16:28:07 +0100	[thread overview]
Message-ID: <20190206152807.31896-8-laurent@vivier.eu> (raw)
In-Reply-To: <20190206152807.31896-1-laurent@vivier.eu>

From: Philippe Mathieu-Daudé <philmd@redhat.com>

When building with TSC_VERBOSE not defined, we get:
      CC      arm-softmmu/hw/input/tsc210x.o
    hw/input/tsc210x.c: In function ‘tsc2102_data_register_write’:
    hw/input/tsc210x.c:554:5: error: label at end of compound statement
         default:
         ^~~~~~~
    hw/input/tsc210x.c: In function ‘tsc2102_control_register_write’:
    hw/input/tsc210x.c:638:5: error: label at end of compound statement
         bad_reg:
         ^~~~~~~
    hw/input/tsc210x.c: In function ‘tsc2102_audio_register_write’:
    hw/input/tsc210x.c:766:5: error: label at end of compound statement
         default:
         ^~~~~~~
    make[1]: *** [rules.mak:69: hw/input/tsc210x.o] Error 1

Fix this by replacing the culprit fprintf(stderr) calls by a more
recent API: qemu_log_mask(LOG_GUEST_ERROR). Other fprintf() calls
are left untouched.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20190204204517.23698-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/input/tsc210x.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index ded0db9351..2eb3cb9518 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -552,10 +552,8 @@ static void tsc2102_data_register_write(
         return;
 
     default:
-#ifdef TSC_VERBOSE
-        fprintf(stderr, "tsc2102_data_register_write: "
-                        "no such register: 0x%02x\n", reg);
-#endif
+        qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_data_register_write: "
+                                       "no such register: 0x%02x\n", reg);
     }
 }
 
@@ -636,10 +634,8 @@ static void tsc2102_control_register_write(
 
     default:
     bad_reg:
-#ifdef TSC_VERBOSE
-        fprintf(stderr, "tsc2102_control_register_write: "
-                        "no such register: 0x%02x\n", reg);
-#endif
+        qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_control_register_write: "
+                                       "no such register: 0x%02x\n", reg);
     }
 }
 
@@ -764,10 +760,8 @@ static void tsc2102_audio_register_write(
         return;
 
     default:
-#ifdef TSC_VERBOSE
-        fprintf(stderr, "tsc2102_audio_register_write: "
-                        "no such register: 0x%02x\n", reg);
-#endif
+        qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_audio_register_write: "
+                                       "no such register: 0x%02x\n", reg);
     }
 }
 
-- 
2.20.1

  parent reply	other threads:[~2019-02-06 15:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-06 15:28 [Qemu-devel] [PULL 0/7] Trivial patches patches Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 1/7] qemu-common.h: Update copyright string for 2019 Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 2/7] target/moxie: Fix LGPL information in the file headers Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 3/7] configure: Avoid non-portable 'test -o/-a' Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 4/7] hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h" Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 5/7] hw/unicore32/puv3: " Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 6/7] hw/cpu/cluster: Mark the cpu-cluster device with user_creatable = false Laurent Vivier
2019-02-06 15:28 ` Laurent Vivier [this message]
2019-02-07 16:49 ` [Qemu-devel] [PULL 0/7] Trivial patches patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190206152807.31896-8-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=atar4qemu@gmail.com \
    --cc=balrogg@gmail.com \
    --cc=ehabkost@redhat.com \
    --cc=green@moxielogic.com \
    --cc=gxt@mprc.pku.edu.cn \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mark.cave-ayland@ilande.co.uk \
    --cc=mjt@tls.msk.ru \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=sgarzare@redhat.com \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).