hw/input/tsc210x: Fix building with no verbosity
PATCH 1/1 hw/input/tsc210x: Fix building with no verbosity
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 1Fix 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.
--- hw/input/tsc210x.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
hw/input/tsc210x.c +6 -12
@@ -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); } }
Signature · 1 line
2.20.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 === TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Quoted 6 lines · On 2/4/19 9:49 PM, [email protected] wrote:
Patchew URL: https://patchew.org/QEMU/[email protected]/
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
Quoted 8 lines
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 === TEST SCRIPT END ===The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Full log is weird:
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Quoted 1 line
- [tag update]
patchew/[email protected] ->
patchew/[email protected]
fatal: Unable to create '/home/patchew/.cache/patchew-git-cache/httpsgithubcompatchewprojectqemu-3c8cf5a9c21ff8782164d1def7f44bd888713384/refs/tags/patchew/[email protected]':
File exists.
If no other git process is currently running, this probably means a git process crashed in this repository earlier. Make sure no other git process is running and remove the file manually to continue. Unexpected end of command stream
error: Could not fetch 3c8cf5a9c21ff8782164d1def7f44bd888713384 Traceback (most recent call last):
File "patchew-tester/src/patchew-cli", line 521, in test_one
git_clone_repo(clone, r["repo"], r["head"], logf, True)
File "patchew-tester/src/patchew-cli", line 48, in git_clone_repo
stdout=logf, stderr=logf)
File "/usr/lib64/python3.4/subprocess.py", line 558, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'remote', 'add', '-f', '--mirror=fetch', '3c8cf5a9c21ff8782164d1def7f44bd888713384', 'https://github.com/patchew-project/qemu']' returned non-zero exit status 1
Quoted 16 lines · Philippe Mathieu-Daudé
When building with
TSC_VERBOSEnot 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
Quoted 8 lines
Fix this by replacing the culprit fprintf(stderr) calls by a more recent API:
qemu_log_mask(LOG_GUEST_ERROR). Otherfprintf()calls are left untouched.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/input/tsc210x.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
Quoted 16 lines · Philippe Mathieu-Daudé
When building with
TSC_VERBOSEnot 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
Quoted 8 lines
Fix this by replacing the culprit fprintf(stderr) calls by a more recent API:
qemu_log_mask(LOG_GUEST_ERROR). Otherfprintf()calls are left untouched.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/input/tsc210x.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
Laurent Vivier
AppliedQuoted 59 lines · Philippe Mathieu-Daudé
When building with
TSC_VERBOSEnot 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 1Fix this by replacing the culprit fprintf(stderr) calls by a more recent API:
qemu_log_mask(LOG_GUEST_ERROR). Otherfprintf()calls are left untouched.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/input/tsc210x.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)hw/input/tsc210x.c +4
-8@@ -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 ;
hw/input/tsc210x.c static void tsc2102_audio_register_write( · line 767
Quoted 10 lines
hw/input/tsc210x.c +2
-4default : -#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); } }
Applied to my trivial-patches branch.
Thanks,
Laurent