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>
---
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
Patchew URL: https://patchew.org/QEMU/20190204204517.23698-1-philmd@redhat.com/ 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/20190204204517.23698-1-philmd@redhat.com/testing.docker-mingw@fedora/?type=message. --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
On 2/4/19 9:49 PM, no-reply@patchew.org wrote: > Patchew URL: https://patchew.org/QEMU/20190204204517.23698-1-philmd@redhat.com/ > > 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/20190204204517.23698-1-philmd@redhat.com/testing.docker-mingw@fedora/?type=message. > --- Full log is weird: Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 >From https://github.com/patchew-project/qemu - [tag update] patchew/20190117215300.29694-1-brijesh.singh@amd.com -> patchew/20190117215300.29694-1-brijesh.singh@amd.com fatal: Unable to create '/home/patchew/.cache/patchew-git-cache/httpsgithubcompatchewprojectqemu-3c8cf5a9c21ff8782164d1def7f44bd888713384/refs/tags/patchew/20190204204517.23698-1-philmd@redhat.com.lock': 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 _______________________________________________ Patchew-devel mailing list Patchew-devel@redhat.com https://www.redhat.com/mailman/listinfo/patchew-devel
On 2019-02-04 21:45, Philippe Mathieu-Daudé wrote: > 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> > --- > hw/input/tsc210x.c | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
On 04/02/2019 21:45, Philippe Mathieu-Daudé wrote: > 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> > --- > 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); > } > } > > Applied to my trivial-patches branch. Thanks, Laurent
On Mon, Feb 04, 2019 at 09:45:17PM +0100, Philippe Mathieu-Daudé wrote: > 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> > --- > hw/input/tsc210x.c | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
© 2016 - 2024 Red Hat, Inc.