Remove some of the fprintf(stderr, "*
Subsystems (2)
v7 cover Remove some of the fprintf(stderr, "*
This is my attempt to salvage a good part of Alistair's error reporting cleanup series
[PATCH v6 00/29] Remove some of the fprintf(stderr, "*
Continue on improving QEMUs logging/error messages by removing more fprintf()'s.
Unfortunatley my Coccinelle skills aren't that great so it's all done in some nasty regex and a little bit of manual work.
It foundered on the problem that some of its fprintf() to error_report() conversions are inappropriate, see
Message-ID: <[email protected]> https://lists.gnu.org/archive/html/qemu-devel/2017-12/msg04961.html
Alistair didn't feel like checking about one hundred conversions by hand, which is understandable. But letting the work go to waste would be a shame, so I wrote an AWK script (see below) to extract a common kind of obviously good conversions: the ones where the fprintf() is followed by exit(). Judging from the diffstat, this salvages more than half of his conversion work.
v7:
* Old PATCH 02,03,21 are already in master, drop
* Conversions not obviously followed by exit() dropped Nothing left in old PATCH 06-12,16,17,22, drop R-bys dropped
* Rebased, trivial conflict in the last patch resolved
#!/usr/bin/awk -f
hunk && /^\+[ \t]*error_report/ {
n++
er_indent = match(substr($0, 2), /[^ \t]/)
er_nr = NR
plus = 0
fatal = 0
}
hunk && er_indent && /^\+/ {
plus++
}hunk && er_indent && /^[ \t]*exit/ {
d = NR - er_nr - plus
if (maxd < d)
maxd = d
fatal = 1
}
hunk && er_indent && match(substr($0, 2), /[^ \t]/) < er_indent {
if (fatal)
nf++
er_indent = 0
}
hunk && /^[-+ ]/ {
hunk = hunk "\n" $0
next
}hunk {
if (n && nf && n != nf)
print loc, "mixed hunk", n, nf >"/dev/stderr"
else if (n && !nf)
print loc, "non-fatal hunk", n, nf >"/dev/stderr"
else if (!n || nf)
print hunk
hunk = ""
}/^@@ / {
hunk = $0
loc = FILENAME ":" FNR ":"
n = nf = 0
next
}{
print
}
END {
print "max distance", maxd+0 >"/dev/stderr"
}
Alistair Francis (15):
audio: Replace AUDIO_FUNC with __func__
hw/arm: Replace fprintf(stderr, "*\n" with error_report() hw/dma: Replace fprintf(stderr, "*\n" with error_report() hw/lm32: Replace fprintf(stderr, "*\n" with error_report() hw/mips: Replace fprintf(stderr, "*\n" with error_report() hw/moxie: Replace fprintf(stderr, "*\n" with error_report() hw/openrisc: Replace fprintf(stderr, "*\n" with error_report() hw/pci*: Replace fprintf(stderr, "*\n" with error_report() hw/ppc: Replace fprintf(stderr, "*\n" with error_report() hw/sd: Replace fprintf(stderr, "*\n" with error_report() hw/sparc*: Replace fprintf(stderr, "*\n" with error_report() hw/timer: Replace fprintf(stderr, "*\n" with error_report() hw/xen*: Replace fprintf(stderr, "*\n" with error_report()
tcg: Replace fprintf(stderr, "*\n" with error_report()
target: Use qemu_log() instead of fprintf(stderr, ...)
audio/alsaaudio.c | 4 ++-- audio/audio.c | 40 +++++++++++++++---------------- audio/audio_int.h | 6 ----- audio/audio_pt_int.c | 28 +++++++++++----------- audio/audio_template.h | 26 ++++++++++---------- audio/dsoundaudio.c | 2 +- audio/mixeng.c | 2 +- audio/ossaudio.c | 10 ++++---- audio/paaudio.c | 56 ++++++++++++++++++++++---------------------- audio/sdlaudio.c | 2 +- audio/wavaudio.c | 2 +- cpus.c | 10 ++++---- dtc | 2 +- exec.c | 6 ++--- hw/arm/armv7m.c | 2 +- hw/arm/boot.c | 16 ++++++------- hw/arm/gumstix.c | 13 +++++----- hw/arm/mainstone.c | 7 +++--- hw/arm/musicpal.c | 2 +- hw/arm/omap1.c | 5 ++-- hw/arm/omap2.c | 3 ++- hw/arm/omap_sx1.c | 2 +- hw/arm/pxa2xx.c | 7 +++--- hw/arm/vexpress.c | 8 +++---- hw/arm/z2.c | 6 ++--- hw/dma/soc_dma.c | 36 ++++++++++++++-------------- hw/lm32/lm32_boards.c | 7 +++--- hw/lm32/milkymist.c | 7 +++--- hw/mips/mips_fulong2e.c | 13 +++++----- hw/mips/mips_jazz.c | 4 ++-- hw/mips/mips_malta.c | 16 ++++++------- hw/mips/mips_mipssim.c | 11 ++++----- hw/mips/mips_r4k.c | 16 ++++++------- hw/moxie/moxiesim.c | 13 +++++----- hw/openrisc/openrisc_sim.c | 4 ++-- hw/pci-host/bonito.c | 6 ++--- hw/pci/pci.c | 4 ++-- hw/ppc/e500.c | 16 ++++++------- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/ppc405_boards.c | 15 +++++------- hw/ppc/ppc440_bamboo.c | 16 ++++++------- hw/ppc/prep.c | 4 ++-- hw/ppc/virtex_ml507.c | 4 ++-- hw/sd/sd.c | 7 +++--- hw/sparc/leon3.c | 16 ++++++------- hw/sparc/sun4m.c | 16 ++++++------- hw/sparc64/niagara.c | 4 ++-- hw/sparc64/sun4u.c | 10 ++++---- hw/timer/xilinx_timer.c | 10 ++++---- hw/xen/xen-common.c | 5 ++-- hw/xenpv/xen_machine_pv.c | 9 +++---- target/cris/translate.c | 2 +- target/ppc/translate.c | 36 ++++++++-------------------- target/sh4/translate.c | 7 ++---- target/unicore32/translate.c | 2 +- vl.c | 2 +- 57 files changed, 277 insertions(+), 312 deletions(-)
Signature · 1 line
2.13.6
PATCH v7 1/15 audio: Replace AUDIO_FUNC with __func__
From: Alistair Francis <[email protected]>
Apparently we don't use __MSC_VER as a compiler anymore and we always require a C99 compiler (which means we always have __func__) so we don't need a special AUDIO_FUNC macro. We can just replace AUDIO_FUNC with __func__ instead.
Checkpatch failures were manually fixed.
--- audio/alsaaudio.c | 4 ++-- audio/audio.c | 40 ++++++++++++++++++------------------ audio/audio_int.h | 6 ------ audio/audio_pt_int.c | 28 ++++++++++++------------- audio/audio_template.h | 26 +++++++++++------------ audio/dsoundaudio.c | 2 +- audio/mixeng.c | 2 +- audio/ossaudio.c | 10 ++++----- audio/paaudio.c | 56 +++++++++++++++++++++++++------------------------- audio/sdlaudio.c | 2 +- audio/wavaudio.c | 2 +- 11 files changed, 85 insertions(+), 93 deletions(-)
audio/alsaaudio.c +2 -2
@@ -823,7 +823,7 @@ static int alsa_init_out(HWVoiceOut *hw, struct audsettings *as,audio_pcm_init_info (&hw->info, &obt_as); hw->samples = obt.samples; - alsa->pcm_buf =audio_calloc (AUDIO_FUNC , obt.samples,1 << hw->info.shift); + alsa->pcm_buf =audio_calloc (__func__, obt.samples,1 << hw->info.shift);if (!alsa->pcm_buf) {dolog ("Could not allocate DAC buffer (%d samples, each %d bytes)\n" , hw->samples,1 << hw->info.shift);
@@ -934,7 +934,7 @@ static int alsa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)audio_pcm_init_info (&hw->info, &obt_as); hw->samples = obt.samples; - alsa->pcm_buf =audio_calloc (AUDIO_FUNC , hw->samples,1 << hw->info.shift); + alsa->pcm_buf =audio_calloc (__func__, hw->samples,1 << hw->info.shift);if (!alsa->pcm_buf) {dolog ("Could not allocate ADC buffer (%d samples, each %d bytes)\n" , hw->samples,1 << hw->info.shift);
audio/audio.c +20 -20
@@ -424,12 +424,12 @@ static void audio_process_options (const char *prefix,const char qemu_prefix[] ="QEMU_" ;size_t preflen, optlen; -if (audio_bug (AUDIO_FUNC , !prefix)) { +if (audio_bug (__func__, !prefix)) {dolog ("prefix = NULL\n" );return ; } -if (audio_bug (AUDIO_FUNC , !opt)) { +if (audio_bug (__func__, !opt)) {dolog ("opt = NULL\n" );return ; }
@@ -792,7 +792,7 @@ static int audio_attach_capture (HWVoiceOut *hw)SWVoiceOut *sw;HWVoiceOut *hw_cap = &cap->hw; - sc =audio_calloc (AUDIO_FUNC ,1 ,sizeof (*sc)); + sc =audio_calloc (__func__,1 ,sizeof (*sc));if (!sc) {dolog ("Could not allocate soft capture voice (%zu bytes)\n" ,sizeof (*sc));
@@ -848,7 +848,7 @@ static int audio_pcm_hw_find_min_in (HWVoiceIn *hw)int audio_pcm_hw_get_live_in (HWVoiceIn *hw) {int live = hw->total_samples_captured -audio_pcm_hw_find_min_in (hw); -if (audio_bug (AUDIO_FUNC , live <0 || live > hw->samples)) { +if (audio_bug (__func__, live <0 || live > hw->samples)) {dolog ("live=%d hw->samples=%d\n" , live, hw->samples);return 0 ; }
@@ -886,7 +886,7 @@ static int audio_pcm_sw_get_rpos_in (SWVoiceIn *sw)int live = hw->total_samples_captured - sw->total_hw_samples_acquired;int rpos; -if (audio_bug (AUDIO_FUNC , live <0 || live > hw->samples)) { +if (audio_bug (__func__, live <0 || live > hw->samples)) {dolog ("live=%d hw->samples=%d\n" , live, hw->samples);return 0 ; }
@@ -909,7 +909,7 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int size) rpos =audio_pcm_sw_get_rpos_in (sw) % hw->samples; live = hw->total_samples_captured - sw->total_hw_samples_acquired; -if (audio_bug (AUDIO_FUNC , live <0 || live > hw->samples)) { +if (audio_bug (__func__, live <0 || live > hw->samples)) {dolog ("live_in=%d hw->samples=%d\n" , live, hw->samples);return 0 ; }
@@ -935,7 +935,7 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int size) } osamp = swlim; -if (audio_bug (AUDIO_FUNC , osamp <0 )) { +if (audio_bug (__func__, osamp <0 )) {dolog ("osamp=%d\n" , osamp);return 0 ; }
@@ -990,7 +990,7 @@ static int audio_pcm_hw_get_live_out (HWVoiceOut *hw, int *nb_live)if (nb_live1) {int live = smin; -if (audio_bug (AUDIO_FUNC , live <0 || live > hw->samples)) { +if (audio_bug (__func__, live <0 || live > hw->samples)) {dolog ("live=%d hw->samples=%d\n" , live, hw->samples);return 0 ; }
@@ -1014,7 +1014,7 @@ int audio_pcm_sw_write (SWVoiceOut *sw, void *buf, int size) hwsamples = sw->hw->samples; live = sw->total_hw_samples_mixed; -if (audio_bug (AUDIO_FUNC , live <0 || live > hwsamples)){ +if (audio_bug (__func__, live <0 || live > hwsamples)) {dolog ("live=%d hw->samples=%d\n" , live, hwsamples);return 0 ; }
@@ -1263,7 +1263,7 @@ static int audio_get_avail (SWVoiceIn *sw) } live = sw->hw->total_samples_captured - sw->total_hw_samples_acquired; -if (audio_bug (AUDIO_FUNC , live <0 || live > sw->hw->samples)) { +if (audio_bug (__func__, live <0 || live > sw->hw->samples)) {dolog ("live=%d sw->hw->samples=%d\n" , live, sw->hw->samples);return 0 ; }
@@ -1287,7 +1287,7 @@ static int audio_get_free (SWVoiceOut *sw) live = sw->total_hw_samples_mixed; -if (audio_bug (AUDIO_FUNC , live <0 || live > sw->hw->samples)) { +if (audio_bug (__func__, live <0 || live > sw->hw->samples)) {dolog ("live=%d sw->hw->samples=%d\n" , live, sw->hw->samples);return 0 ; }
@@ -1354,7 +1354,7 @@ static void audio_run_out (AudioState *s) live =0 ; } -if (audio_bug (AUDIO_FUNC , live <0 || live > hw->samples)) { +if (audio_bug (__func__, live <0 || live > hw->samples)) {dolog ("live=%d hw->samples=%d\n" , live, hw->samples);continue ; }
@@ -1389,7 +1389,7 @@ static void audio_run_out (AudioState *s) prev_rpos = hw->rpos; played = hw->pcm_ops->run_out (hw, live);replay_audio_out (&played); -if (audio_bug (AUDIO_FUNC , hw->rpos >= hw->samples)) { +if (audio_bug (__func__, hw->rpos >= hw->samples)) {dolog ("hw->rpos=%d hw->samples=%d played=%d\n" , hw->rpos, hw->samples, played); hw->rpos =0 ;
@@ -1410,7 +1410,7 @@ static void audio_run_out (AudioState *s)continue ; } -if (audio_bug (AUDIO_FUNC , played > sw->total_hw_samples_mixed)) { +if (audio_bug (__func__, played > sw->total_hw_samples_mixed)) {dolog ("played=%d sw->total_hw_samples_mixed=%d\n" , played, sw->total_hw_samples_mixed); played = sw->total_hw_samples_mixed;
@@ -1513,7 +1513,7 @@ static void audio_run_capture (AudioState *s)continue ; } -if (audio_bug (AUDIO_FUNC , captured > sw->total_hw_samples_mixed)) { +if (audio_bug (__func__, captured > sw->total_hw_samples_mixed)) {dolog ("captured=%d sw->total_hw_samples_mixed=%d\n" , captured, sw->total_hw_samples_mixed); captured = sw->total_hw_samples_mixed;
@@ -1924,7 +1924,7 @@ CaptureVoiceOut *AUD_add_capture ( goto err0; } - cb =audio_calloc (AUDIO_FUNC ,1 ,sizeof (*cb)); + cb =audio_calloc (__func__,1 ,sizeof (*cb));if (!cb) {dolog ("Could not allocate capture callback information, size %zu\n" ,sizeof (*cb));
@@ -1942,7 +1942,7 @@ CaptureVoiceOut *AUD_add_capture (HWVoiceOut *hw;CaptureVoiceOut *cap; - cap =audio_calloc (AUDIO_FUNC ,1 ,sizeof (*cap)); + cap =audio_calloc (__func__,1 ,sizeof (*cap));if (!cap) {dolog ("Could not allocate capture voice, size %zu\n" ,sizeof (*cap));
@@ -1955,8 +1955,8 @@ CaptureVoiceOut *AUD_add_capture (/* XXX find a more elegant way */ hw->samples =4096 *4 ; - hw->mix_buf =audio_calloc (AUDIO_FUNC , hw->samples, -sizeof (struct st_sample )); + hw->mix_buf =audio_calloc (__func__, hw->samples, +sizeof (struct st_sample ));if (!hw->mix_buf) {dolog ("Could not allocate capture mix buffer (%d samples)\n" , hw->samples);
@@ -1965,7 +1965,7 @@ CaptureVoiceOut *AUD_add_capture (audio_pcm_init_info (&hw->info, as); - cap->buf =audio_calloc (AUDIO_FUNC , hw->samples,1 << hw->info.shift); + cap->buf =audio_calloc (__func__, hw->samples,1 << hw->info.shift);if (!cap->buf) { dolog ("Could not allocate capture buffer " "(%d samples, each %d bytes)\n",
audio/audio_int.h +0 -6
@@ -252,10 +252,4 @@ static inline int audio_ring_dist (int dst, int src, int len)#define AUDIO_STRINGIFY_ (n) #n#define AUDIO_STRINGIFY (n) AUDIO_STRINGIFY_(n) -#if defined _MSC_VER || defined __GNUC__ -#define AUDIO_FUNC __FUNCTION__ -#else -#define AUDIO_FUNC __FILE__ ":" AUDIO_STRINGIFY (__LINE__) -#endif -#endif /* QEMU_AUDIO_INT_H */
audio/audio_pt_int.c +14 -14
@@ -31,7 +31,7 @@ int audio_pt_init (struct audio_pt *p, void *(*func) (void *), err =sigfillset (&set);if (err) { -logerr (p, errno,"%s(%s): sigfillset failed" , cap,AUDIO_FUNC ); +logerr (p, errno,"%s(%s): sigfillset failed" , cap, __func__);return -1 ; }
@@ -57,8 +57,8 @@ int audio_pt_init (struct audio_pt *p, void *(*func) (void *), err2 =pthread_sigmask (SIG_SETMASK , &old_set,NULL );if (err2) { -logerr (p, err2,"%s(%s): pthread_sigmask (restore) failed" , - cap,AUDIO_FUNC ); +logerr (p, err2,"%s(%s): pthread_sigmask (restore) failed" , + cap, __func__);/* We have failed to restore original signal mask, all bets are off, so terminate the process */ exit (EXIT_FAILURE );
@@ -74,17 +74,17 @@ int audio_pt_init (struct audio_pt *p, void *(*func) (void *), err2: err2 =pthread_cond_destroy (&p->cond);if (err2) { -logerr (p, err2,"%s(%s): pthread_cond_destroy failed" , cap,AUDIO_FUNC ); +logerr (p, err2,"%s(%s): pthread_cond_destroy failed" , cap, __func__); } err1: err2 =pthread_mutex_destroy (&p->mutex);if (err2) { -logerr (p, err2,"%s(%s): pthread_mutex_destroy failed" , cap,AUDIO_FUNC ); +logerr (p, err2,"%s(%s): pthread_mutex_destroy failed" , cap, __func__); } err0: -logerr (p, err,"%s(%s): %s failed" , cap,AUDIO_FUNC , efunc); +logerr (p, err,"%s(%s): %s failed" , cap, __func__, efunc);return -1 ; }
@@ -94,13 +94,13 @@ int audio_pt_fini (struct audio_pt *p, const char *cap) err =pthread_cond_destroy (&p->cond);if (err) { -logerr (p, err,"%s(%s): pthread_cond_destroy failed" , cap,AUDIO_FUNC ); +logerr (p, err,"%s(%s): pthread_cond_destroy failed" , cap, __func__); ret =-1 ; } err =pthread_mutex_destroy (&p->mutex);if (err) { -logerr (p, err,"%s(%s): pthread_mutex_destroy failed" , cap,AUDIO_FUNC ); +logerr (p, err,"%s(%s): pthread_mutex_destroy failed" , cap, __func__); ret =-1 ; }return ret;
@@ -112,7 +112,7 @@ int audio_pt_lock (struct audio_pt *p, const char *cap) err =pthread_mutex_lock (&p->mutex);if (err) { -logerr (p, err,"%s(%s): pthread_mutex_lock failed" , cap,AUDIO_FUNC ); +logerr (p, err,"%s(%s): pthread_mutex_lock failed" , cap, __func__);return -1 ; }return 0 ;
@@ -124,7 +124,7 @@ int audio_pt_unlock (struct audio_pt *p, const char *cap) err =pthread_mutex_unlock (&p->mutex);if (err) { -logerr (p, err,"%s(%s): pthread_mutex_unlock failed" , cap,AUDIO_FUNC ); +logerr (p, err,"%s(%s): pthread_mutex_unlock failed" , cap, __func__);return -1 ; }return 0 ;
@@ -136,7 +136,7 @@ int audio_pt_wait (struct audio_pt *p, const char *cap) err =pthread_cond_wait (&p->cond, &p->mutex);if (err) { -logerr (p, err,"%s(%s): pthread_cond_wait failed" , cap,AUDIO_FUNC ); +logerr (p, err,"%s(%s): pthread_cond_wait failed" , cap, __func__);return -1 ; }return 0 ;
@@ -148,12 +148,12 @@ int audio_pt_unlock_and_signal (struct audio_pt *p, const char *cap) err =pthread_mutex_unlock (&p->mutex);if (err) { -logerr (p, err,"%s(%s): pthread_mutex_unlock failed" , cap,AUDIO_FUNC ); +logerr (p, err,"%s(%s): pthread_mutex_unlock failed" , cap, __func__);return -1 ; } err =pthread_cond_signal (&p->cond);if (err) { -logerr (p, err,"%s(%s): pthread_cond_signal failed" , cap,AUDIO_FUNC ); +logerr (p, err,"%s(%s): pthread_cond_signal failed" , cap, __func__);return -1 ; }return 0 ;
@@ -166,7 +166,7 @@ int audio_pt_join (struct audio_pt *p, void **arg, const char *cap) err =pthread_join (p->thread, &ret);if (err) { -logerr (p, err,"%s(%s): pthread_join failed" , cap,AUDIO_FUNC ); +logerr (p, err,"%s(%s): pthread_join failed" , cap, __func__);return -1 ; } *arg = ret;
audio/audio_template.h +13 -13
@@ -57,13 +57,13 @@ static void glue (audio_init_nb_voices_, TYPE) (struct audio_driver *drv)glue (s->nb_hw_voices_,TYPE ) = max_voices; } -if (audio_bug (AUDIO_FUNC , !voice_size && max_voices)) { +if (audio_bug (__func__, !voice_size && max_voices)) {dolog ("drv=`%s' voice_size=0 max_voices=%d\n" , drv->name, max_voices);glue (s->nb_hw_voices_,TYPE ) =0 ; } -if (audio_bug (AUDIO_FUNC , voice_size && !max_voices)) { +if (audio_bug (__func__, voice_size && !max_voices)) {dolog ("drv=`%s' voice_size=%d max_voices=0\n" , drv->name, voice_size); }
@@ -77,7 +77,7 @@ static void glue (audio_pcm_hw_free_resources_, TYPE) (HW *hw)static int glue (audio_pcm_hw_alloc_resources_ ,TYPE ) (HW *hw) { -HWBUF =audio_calloc (AUDIO_FUNC , hw->samples,sizeof (struct st_sample )); +HWBUF =audio_calloc (__func__, hw->samples,sizeof (struct st_sample ));if (!HWBUF ) {dolog ("Could not allocate " NAME " buffer (%d samples)\n" , hw->samples);
@@ -105,7 +105,7 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw) samples = ((int64_t ) sw->hw->samples <<32 ) / sw->ratio; - sw->buf =audio_calloc (AUDIO_FUNC , samples,sizeof (struct st_sample )); + sw->buf =audio_calloc (__func__, samples,sizeof (struct st_sample ));if (!sw->buf) {dolog ("Could not allocate buffer for `%s' (%d samples)\n" ,SW_NAME (sw), samples);
@@ -238,17 +238,17 @@ static HW *glue (audio_pcm_hw_add_new_, TYPE) (struct audsettings *as)return NULL ; } -if (audio_bug (AUDIO_FUNC , !drv)) { +if (audio_bug (__func__, !drv)) {dolog ("No host audio driver\n" );return NULL ; } -if (audio_bug (AUDIO_FUNC , !drv->pcm_ops)) { +if (audio_bug (__func__, !drv->pcm_ops)) {dolog ("Host audio driver without pcm_ops\n" );return NULL ; } - hw =audio_calloc (AUDIO_FUNC ,1 ,glue (drv->voice_size_,TYPE )); + hw =audio_calloc (__func__,1 ,glue (drv->voice_size_,TYPE ));if (!hw) {dolog ("Can not allocate voice `%s' size %d\n" , drv->name,glue (drv->voice_size_,TYPE ));
@@ -266,7 +266,7 @@ static HW *glue (audio_pcm_hw_add_new_, TYPE) (struct audsettings *as) goto err0; } -if (audio_bug (AUDIO_FUNC , hw->samples <=0 )) { +if (audio_bug (__func__, hw->samples <=0 )) {dolog ("hw->samples=%d\n" , hw->samples); goto err1; }
@@ -339,7 +339,7 @@ static SW *glue (audio_pcm_create_voice_pair_, TYPE) ( hw_as = *as; } - sw =audio_calloc (AUDIO_FUNC ,1 ,sizeof (*sw)); + sw =audio_calloc (__func__,1 ,sizeof (*sw));if (!sw) {dolog ("Could not allocate soft voice `%s' (%zu bytes)\n" , sw_name ? sw_name :"unknown" ,sizeof (*sw));
@@ -379,7 +379,7 @@ static void glue (audio_close_, TYPE) (SW *sw)void glue (AUD_close_ ,TYPE ) (QEMUSoundCard *card,SW *sw) {if (sw) { -if (audio_bug (AUDIO_FUNC , !card)) { +if (audio_bug (__func__, !card)) {dolog ("card=%p\n" , card);return ; }
@@ -399,7 +399,7 @@ SW *glue (AUD_open_, TYPE) ( {AudioState *s = &glob_audio_state; -if (audio_bug (AUDIO_FUNC , !card || !name || !callback_fn || !as)) { +if (audio_bug (__func__, !card || !name || !callback_fn || !as)) {dolog ("card=%p name=%p callback_fn=%p as=%p\n" , card, name, callback_fn, as); goto fail;
@@ -408,12 +408,12 @@ SW *glue (AUD_open_, TYPE) (ldebug ("open %s, freq %d, nchannels %d, fmt %d\n" , name, as->freq, as->nchannels, as->fmt); -if (audio_bug (AUDIO_FUNC ,audio_validate_settings (as))) { +if (audio_bug (__func__,audio_validate_settings (as))) {audio_print_settings (as); goto fail; } -if (audio_bug (AUDIO_FUNC , !s->drv)) { +if (audio_bug (__func__, !s->drv)) {dolog ("Can not open `%s' (no host audio driver)\n" , name); goto fail; }
audio/dsoundaudio.c +1 -1
@@ -543,7 +543,7 @@ static int dsound_run_out (HWVoiceOut *hw, int live) } } -if (audio_bug (AUDIO_FUNC , len <0 || len > bufsize)) { +if (audio_bug (__func__, len <0 || len > bufsize)) {dolog ("len=%d bufsize=%d old_pos=%ld ppos=%ld\n" , len, bufsize, old_pos, ppos);return 0 ;
audio/mixeng.c +1 -1
@@ -344,7 +344,7 @@ struct rate {*/ void *st_rate_start (int inrate,int outrate) { -struct rate *rate =audio_calloc (AUDIO_FUNC ,1 ,sizeof (*rate)); +struct rate *rate =audio_calloc (__func__,1 ,sizeof (*rate));if (!rate) {dolog ("Could not allocate resampler (%zu bytes)\n" ,sizeof (*rate));
audio/ossaudio.c +4 -6
@@ -582,11 +582,9 @@ static int oss_init_out(HWVoiceOut *hw, struct audsettings *as, }if (!oss->mmapped) { - oss->pcm_buf =audio_calloc ( -AUDIO_FUNC , - hw->samples, -1 << hw->info.shift - ); + oss->pcm_buf =audio_calloc (__func__, + hw->samples, +1 << hw->info.shift);if (!oss->pcm_buf) { dolog ( "Could not allocate DAC buffer (%d samples, each %d bytes)\n",
@@ -705,7 +703,7 @@ static int oss_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) } hw->samples = (obt.nfrags * obt.fragsize) >> hw->info.shift; - oss->pcm_buf =audio_calloc (AUDIO_FUNC , hw->samples,1 << hw->info.shift); + oss->pcm_buf =audio_calloc (__func__, hw->samples,1 << hw->info.shift);if (!oss->pcm_buf) {dolog ("Could not allocate ADC buffer (%d samples, each %d bytes)\n" , hw->samples,1 << hw->info.shift);
audio/paaudio.c +28 -28
194 lines not on this page · raw message
audio/sdlaudio.c +1 -1
@@ -277,7 +277,7 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len)return ; } -if (audio_bug (AUDIO_FUNC , sdl->live <0 || sdl->live > hw->samples)) { +if (audio_bug (__func__, sdl->live <0 || sdl->live > hw->samples)) {dolog ("sdl->live=%d hw->samples=%d\n" , sdl->live, hw->samples);return ;
audio/wavaudio.c +1 -1
@@ -139,7 +139,7 @@ static int wav_init_out(HWVoiceOut *hw, struct audsettings *as,audio_pcm_init_info (&hw->info, &wav_as); hw->samples =1024 ; - wav->pcm_buf =audio_calloc (AUDIO_FUNC , hw->samples,1 << hw->info.shift); + wav->pcm_buf =audio_calloc (__func__, hw->samples,1 << hw->info.shift);if (!wav->pcm_buf) {dolog ("Could not allocate buffer (%d bytes)\n" , hw->samples << hw->info.shift);
Signature · 1 line
2.13.6
PATCH v7 2/15 hw/arm: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
The 'qemu: ' prefix was manually removed from the hw/arm/boot.c file.
Conversions that aren't followed by exit() dropped, because they might be inappropriate.
--- hw/arm/armv7m.c | 2 +- hw/arm/boot.c | 16 ++++++++-------- hw/arm/gumstix.c | 13 +++++++------ hw/arm/mainstone.c | 7 ++++--- hw/arm/musicpal.c | 2 +- hw/arm/omap1.c | 5 +++-- hw/arm/omap2.c | 3 ++- hw/arm/omap_sx1.c | 2 +- hw/arm/pxa2xx.c | 7 ++++--- hw/arm/vexpress.c | 8 ++++---- hw/arm/z2.c | 6 +++--- 11 files changed, 38 insertions(+), 33 deletions(-)
hw/arm/armv7m.c +1 -1
@@ -278,7 +278,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size)#endif if (!kernel_filename && !qtest_enabled ()) { -fprintf (stderr,"Guest image must be specified (using -kernel)\n" ); +error_report ("Guest image must be specified (using -kernel)" );exit (1 ); }
hw/arm/boot.c +8 -8
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include <libfdt.h> #include "hw/hw.h"
@@ -690,7 +691,7 @@ static void load_image_to_fw_cfg(FWCfgState *fw_cfg, uint16_t size_key,gsize length;if (!g_file_get_contents (image_name, &contents, &length,NULL )) { -fprintf (stderr,"failed to load \"%s\"\n" , image_name); +error_report ("failed to load \"%s\"" , image_name);exit (1 ); } size = length;
@@ -956,8 +957,7 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) is_linux =1 ; }if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - info->kernel_filename); +error_report ("could not load kernel '%s'" , info->kernel_filename);exit (1 ); } info->entry = entry;
@@ -976,8 +976,8 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) info->initrd_start); }if (initrd_size <0 ) { -fprintf (stderr,"qemu: could not load initrd '%s'\n" , - info->initrd_filename); +error_report ("could not load initrd '%s'" , + info->initrd_filename);exit (1 ); } }else {
@@ -1021,9 +1021,9 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data) }else { fixupcontext[FIXUP_ARGPTR ] = info->loader_start +KERNEL_ARGS_ADDR ;if (info->ram_size >= (1ULL <<32 )) { -fprintf (stderr,"qemu: RAM size must be less than 4GB to boot" -" Linux kernel using ATAGS (try passing a device tree" -" using -dtb)\n" ); +error_report ("RAM size must be less than 4GB to boot" +" Linux kernel using ATAGS (try passing a device tree" +" using -dtb)" );exit (1 ); } }
hw/arm/gumstix.c +7 -6
@@ -35,6 +35,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/arm/pxa.h" #include "net/net.h"
@@ -62,8 +63,8 @@ static void connex_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );if (!dinfo && !qtest_enabled ()) { -fprintf (stderr,"A flash image must be given with the " -"'pflash' parameter\n" ); +error_report ("A flash image must be given with the " +"'pflash' parameter" );exit (1 ); }
@@ -76,7 +77,7 @@ static void connex_init(MachineState *machine) dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, sector_len, connex_rom / sector_len, 2, 0, 0, 0, 0, be)) { -fprintf (stderr,"qemu: Error registering flash memory.\n" ); +error_report ("Error registering flash memory." );exit (1 ); }
@@ -99,8 +100,8 @@ static void verdex_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );if (!dinfo && !qtest_enabled ()) { -fprintf (stderr,"A flash image must be given with the " -"'pflash' parameter\n" ); +error_report ("A flash image must be given with the " +"'pflash' parameter" );exit (1 ); }
@@ -113,7 +114,7 @@ static void verdex_init(MachineState *machine) dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, sector_len, verdex_rom / sector_len, 2, 0, 0, 0, 0, be)) { -fprintf (stderr,"qemu: Error registering flash memory.\n" ); +error_report ("Error registering flash memory." );exit (1 ); }
hw/arm/mainstone.c +4 -3
@@ -12,6 +12,7 @@* GNU GPL, version 2 or (at your option) any later version. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/arm/pxa.h"
@@ -143,8 +144,8 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,if (qtest_enabled ()) {break ; } -fprintf (stderr,"Two flash images must be given with the " -"'pflash' parameter\n" ); +error_report ("Two flash images must be given with the " +"'pflash' parameter" );exit (1 ); }
@@ -154,7 +155,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem, blk_by_legacy_dinfo(dinfo), sector_len, MAINSTONE_FLASH / sector_len, 4, 0, 0, 0, 0, be)) { -fprintf (stderr,"qemu: Error registering flash memory.\n" ); +error_report ("Error registering flash memory." );exit (1 ); } }
hw/arm/musicpal.c +1 -1
@@ -1626,7 +1626,7 @@ static void musicpal_init(MachineState *machine) flash_size =blk_getlength (blk);if (flash_size !=8 *1024 *1024 && flash_size !=16 *1024 *1024 && flash_size !=32 *1024 *1024 ) { -fprintf (stderr,"Invalid flash image size\n" ); +error_report ("Invalid flash image size" );exit (1 ); }
hw/arm/omap1.c +3 -2
@@ -18,6 +18,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
@@ -2313,7 +2314,7 @@ void omap_uwire_attach(struct omap_uwire_s *s, uWireSlave *slave, int chipselect) {if (chipselect <0 || chipselect >3 ) { -fprintf (stderr,"%s: Bad chipselect %i\n" , __func__, chipselect); +error_report ("%s: Bad chipselect %i" , __func__, chipselect);exit (-1 ); }
@@ -3987,7 +3988,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory, dinfo =drive_get (IF_SD ,0 ,0 );if (!dinfo) { -fprintf (stderr,"qemu: missing SecureDigital device\n" ); +error_report ("missing SecureDigital device" );exit (1 ); } s->mmc = omap_mmc_init(0xfffb7800, system_memory,
hw/arm/omap2.c +2 -1
@@ -19,6 +19,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
@@ -2486,7 +2487,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, dinfo =drive_get (IF_SD ,0 ,0 );if (!dinfo) { -fprintf (stderr,"qemu: missing SecureDigital device\n" ); +error_report ("missing SecureDigital device" );exit (1 ); } s->mmc = omap2_mmc_init(omap_l4tao(s->l4, 9),
hw/arm/omap_sx1.c +1 -1
@@ -194,7 +194,7 @@ static void sx1_init(MachineState *machine, const int version) }if (!machine->kernel_filename && !fl_idx && !qtest_enabled ()) { -fprintf (stderr,"Kernel or Flash image must be specified\n" ); +error_report ("Kernel or Flash image must be specified" );exit (1 ); }
hw/arm/pxa2xx.c +4 -3
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
@@ -2062,7 +2063,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, s =g_new0 (PXA2xxState,1 );if (strncmp (cpu_type,"pxa27" ,5 )) { -fprintf (stderr,"Machine requires a PXA27x processor.\n" ); +error_report ("Machine requires a PXA27x processor." );exit (1 ); }
@@ -2095,7 +2096,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, dinfo =drive_get (IF_SD ,0 ,0 );if (!dinfo) { -fprintf (stderr,"qemu: missing SecureDigital device\n" ); +error_report ("missing SecureDigital device" );exit (1 ); } s->mmc = pxa2xx_mmci_init(address_space, 0x41100000,
@@ -2220,7 +2221,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) dinfo =drive_get (IF_SD ,0 ,0 );if (!dinfo) { -fprintf (stderr,"qemu: missing SecureDigital device\n" ); +error_report ("missing SecureDigital device" );exit (1 ); } s->mmc = pxa2xx_mmci_init(address_space, 0x41100000,
hw/arm/vexpress.c +4 -4
@@ -266,7 +266,7 @@ static void a9_daughterboard_init(const VexpressMachineState *vms,if (ram_size >0x40000000 ) {/* 1GB is the maximum the address space permits */ -fprintf (stderr,"vexpress-a9: cannot model more than 1GB RAM\n" ); +error_report ("vexpress-a9: cannot model more than 1GB RAM" );exit (1 ); }
@@ -355,7 +355,7 @@ static void a15_daughterboard_init(const VexpressMachineState *vms,*/ uint64_t rsz = ram_size;if (rsz > (30ULL *1024 *1024 *1024 )) { -fprintf (stderr,"vexpress-a15: cannot model more than 30GB RAM\n" ); +error_report ("vexpress-a15: cannot model more than 30GB RAM" );exit (1 ); } }
@@ -640,7 +640,7 @@ static void vexpress_common_init(MachineState *machine) pflash0 =ve_pflash_cfi01_register (map[VE_NORFLASH0 ],"vexpress.flash0" , dinfo);if (!pflash0) { -fprintf (stderr,"vexpress: error registering flash 0.\n" ); +error_report ("vexpress: error registering flash 0." );exit (1 ); }
@@ -655,7 +655,7 @@ static void vexpress_common_init(MachineState *machine) dinfo =drive_get_next (IF_PFLASH );if (!ve_pflash_cfi01_register (map[VE_NORFLASH1 ],"vexpress.flash1" , dinfo)) { -fprintf (stderr,"vexpress: error registering flash 1.\n" ); +error_report ("vexpress: error registering flash 1." );exit (1 ); }
hw/arm/z2.c +3 -3
@@ -319,8 +319,8 @@ static void z2_init(MachineState *machine)#endif dinfo =drive_get (IF_PFLASH ,0 ,0 );if (!dinfo && !qtest_enabled ()) { -fprintf (stderr,"Flash image must be given with the " -"'pflash' parameter\n" ); +error_report ("Flash image must be given with the " +"'pflash' parameter" );exit (1 ); }
@@ -329,7 +329,7 @@ static void z2_init(MachineState *machine) dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, sector_len, Z2_FLASH_SIZE / sector_len, 4, 0, 0, 0, 0, be)) { -fprintf (stderr,"qemu: Error registering flash memory.\n" ); +error_report ("Error registering flash memory." );exit (1 ); }
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v7 02/15] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Quoted 42 lines · Markus Armbruster
From: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.Some lines where then manually tweaked to pass checkpatch.
The 'qemu: ' prefix was manually removed from the
hw/arm/boot.cfile.Signed-off-by Alistair Francis <[email protected]>Conversions that aren't followed by
exit()dropped, because they might be inappropriate.Signed-off-by Markus Armbruster <[email protected]>---
+++
b/hw/arm/gumstix.chw/arm/gumstix.c +3
-2@@ -35,6 +35,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/arm/pxa.h" #include "net/net.h" @@ -62,8 +63,8 @@ static void connex_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );if (!dinfo && !qtest_enabled ()) { -fprintf (stderr,"A flash image must be given with the " -"'pflash' parameter\n" ); +error_report ("A flash image must be given with the " +"'pflash' parameter" );exit (1 ); }
hw/arm/gumstix.c static void connex_init(MachineState *machine) · line 80
Quoted 5 lines
hw/arm/gumstix.c +1
-1@@ -76,7 +77,7 @@ static void connex_init(MachineState *machine) dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, sector_len, connex_rom / sector_len, 2, 0, 0, 0, 0, be)) { -fprintf (stderr,"qemu: Error registering flash memory.\n" ); +error_report ("Error registering flash memory." );
Do we care about consistency on trailing dots in these conversions?
At any rate, all of these are sane rewrites of existing patterns;
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-arm] [Qemu-devel] [PATCH v7 02/15] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Quoted 42 lines · Eric Blake
Quoted 41 lines · Markus Armbruster
From: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.Some lines where then manually tweaked to pass checkpatch.
The 'qemu: ' prefix was manually removed from the
hw/arm/boot.cfile.Signed-off-by Alistair Francis <[email protected]>Conversions that aren't followed by
exit()dropped, because they might be inappropriate.Signed-off-by Markus Armbruster <[email protected]>---
+++
b/hw/arm/gumstix.chw/arm/gumstix.c +3
-2@@ -35,6 +35,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/arm/pxa.h" #include "net/net.h" @@ -62,8 +63,8 @@ static void connex_init(MachineState *machine) dinfo =drive_get (IF_PFLASH ,0 ,0 );if (!dinfo && !qtest_enabled ()) { -fprintf (stderr,"A flash image must be given with the " -"'pflash' parameter\n" ); +error_report ("A flash image must be given with the " +"'pflash' parameter" );exit (1 ); }
Quoted 8 lines
hw/arm/gumstix.c static void connex_init(MachineState *machine) · line 80
Quoted 6 lines
hw/arm/gumstix.c +1
-1@@ -76,7 +77,7 @@ static void connex_init(MachineState *machine) dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, sector_len, connex_rom / sector_len, 2, 0, 0, 0, 0, be)) { -fprintf (stderr,"qemu: Error registering flash memory.\n" ); +error_report ("Error registering flash memory." );Do we care about consistency on trailing dots in these conversions?
Good opportunity to get rid of trailing punctuation in converted error messages.
Quoted 2 lines
At any rate, all of these are sane rewrites of existing patterns;
Reviewed-by Eric Blake <[email protected]>
Thanks!
PATCH v7 3/15 hw/dma: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
Conversions that aren't followed by exit() dropped, because they might be inappropriate.
--- hw/dma/soc_dma.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
hw/dma/soc_dma.c +18 -18
@@ -18,6 +18,7 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/timer.h" #include "hw/arm/soc_dma.h"
@@ -270,11 +271,11 @@ void soc_dma_port_add_fifo(struct soc_dma_s *soc, hwaddr virt_base,if (entry->type == soc_dma_port_mem) {if (entry->addr <= virt_base && entry->addr + entry->u.mem.size > virt_base) { -fprintf (stderr,"%s: FIFO at %" PRIx64 -" collides with RAM region at %" PRIx64 -"-%" PRIx64"\n" , __func__, - virt_base, entry->addr, - (entry->addr + entry->u.mem.size)); +error_report ("%s: FIFO at %" PRIx64 +" collides with RAM region at %" PRIx64 +"-%" PRIx64, __func__, + virt_base, entry->addr, + (entry->addr + entry->u.mem.size));exit (-1 ); }
@@ -284,9 +285,9 @@ void soc_dma_port_add_fifo(struct soc_dma_s *soc, hwaddr virt_base,while (entry < dma->memmap + dma->memmap_size && entry->addr <= virt_base) {if (entry->addr == virt_base && entry->u.fifo.out == out) { -fprintf (stderr,"%s: FIFO at %" PRIx64 -" collides FIFO at %" PRIx64"\n" , - __func__, virt_base, entry->addr); +error_report ("%s: FIFO at %" PRIx64 +" collides FIFO at %" PRIx64, + __func__, virt_base, entry->addr);exit (-1 ); }
@@ -321,11 +322,11 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint8_t *phys_base,if ((entry->addr >= virt_base && entry->addr < virt_base + size) || (entry->addr <= virt_base && entry->addr + entry->u.mem.size > virt_base)) { -fprintf (stderr,"%s: RAM at %" PRIx64"-%" PRIx64 -" collides with RAM region at %" PRIx64 -"-%" PRIx64"\n" , __func__, - virt_base, virt_base + size, - entry->addr, entry->addr + entry->u.mem.size); +error_report ("%s: RAM at %" PRIx64"-%" PRIx64 +" collides with RAM region at %" PRIx64 +"-%" PRIx64, __func__, + virt_base, virt_base + size, + entry->addr, entry->addr + entry->u.mem.size);exit (-1 ); }
@@ -334,11 +335,10 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint8_t *phys_base, }else {if (entry->addr >= virt_base && entry->addr < virt_base + size) { -fprintf (stderr,"%s: RAM at %" PRIx64"-%" PRIx64 -" collides with FIFO at %" PRIx64 -"\n" , __func__, - virt_base, virt_base + size, - entry->addr); +error_report ("%s: RAM at %" PRIx64"-%" PRIx64 +" collides with FIFO at %" PRIx64, + __func__, virt_base, virt_base + size, + entry->addr);exit (-1 ); }
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v7 03/15] hw/dma: Replace fprintf(stderr, "*\n" with error_report()
Quoted 5 lines · Markus Armbruster
From: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
[...]
Quoted 11 lines
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by Alistair Francis <[email protected]>Conversions that aren't followed by
exit()dropped, because they might be inappropriate.Signed-off-by Markus Armbruster <[email protected]>--- hw/dma/soc_dma.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
PATCH v7 4/15 hw/lm32: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
--- hw/lm32/lm32_boards.c | 7 +++---- hw/lm32/milkymist.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-)
hw/lm32/lm32_boards.c +3 -4
@@ -18,6 +18,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h"
@@ -148,8 +149,7 @@ static void lm32_evr_init(MachineState *machine) }if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - kernel_filename); +error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); } }
@@ -242,8 +242,7 @@ static void lm32_uclinux_init(MachineState *machine) }if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - kernel_filename); +error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); } }
hw/lm32/milkymist.c +3 -4
@@ -18,6 +18,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h"
@@ -145,8 +146,7 @@ milkymist_init(MachineState *machine)/* if no kernel is given no valid bios rom is a fatal error */ if (!kernel_filename && !dinfo && !bios_filename && !qtest_enabled ()) { -fprintf (stderr,"qemu: could not load Milkymist One bios '%s'\n" , - bios_name); +error_report ("could not load Milkymist One bios '%s'" , bios_name);exit (1 ); }g_free (bios_filename);
@@ -184,8 +184,7 @@ milkymist_init(MachineState *machine) }if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - kernel_filename); +error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); } }
Signature · 1 line
2.13.6
PATCH v7 5/15 hw/mips: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
Conversions that aren't followed by exit() dropped, because they might be inappropriate.
--- hw/mips/mips_fulong2e.c | 13 ++++++------- hw/mips/mips_jazz.c | 4 ++-- hw/mips/mips_malta.c | 16 +++++++--------- hw/mips/mips_mipssim.c | 11 +++++------ hw/mips/mips_r4k.c | 16 +++++++--------- 5 files changed, 27 insertions(+), 33 deletions(-)
hw/mips/mips_fulong2e.c +6 -7
@@ -120,7 +120,7 @@ static int64_t load_kernel (CPUMIPSState *env) (uint64_t *)&kernel_low, (uint64_t *)&kernel_high, 0, EM_MIPS, 1, 0);if (kernel_size <0 ) { -error_report ("qemu: could not load kernel '%s': %s" , +error_report ("could not load kernel '%s': %s" , loaderparams.kernel_filename,load_elf_strerror (kernel_size));exit (1 );
@@ -134,17 +134,16 @@ static int64_t load_kernel (CPUMIPSState *env)if (initrd_size >0 ) { initrd_offset = (kernel_high + ~INITRD_PAGE_MASK ) &INITRD_PAGE_MASK ;if (initrd_offset + initrd_size > ram_size) { -fprintf (stderr, -"qemu: memory too small for initial ram disk '%s'\n" , - loaderparams.initrd_filename); +error_report ("memory too small for initial ram disk '%s'" , + loaderparams.initrd_filename);exit (1 ); } initrd_size =load_image_targphys (loaderparams.initrd_filename, initrd_offset, ram_size - initrd_offset); }if (initrd_size == (target_ulong) -1 ) { -fprintf (stderr,"qemu: could not load initial ram disk '%s'\n" , - loaderparams.initrd_filename); +error_report ("could not load initial ram disk '%s'" , + loaderparams.initrd_filename);exit (1 ); } }
@@ -338,7 +337,7 @@ static void mips_fulong2e_init(MachineState *machine) isa_bus =vt82c686b_init (pci_bus,PCI_DEVFN (FULONG2E_VIA_SLOT ,0 ));if (!isa_bus) { -fprintf (stderr,"vt82c686b_init error\n" ); +error_report ("vt82c686b_init error" );exit (1 ); }
hw/mips/mips_jazz.c +2 -2
@@ -268,10 +268,10 @@ static void mips_jazz_init(MachineState *machine,sysbus_connect_irq (sysbus,0 ,qdev_get_gpio_in (rc4030,4 ));break ; }else if (is_help_option (nd->model)) { -fprintf (stderr,"qemu: Supported NICs: dp83932\n" ); +error_report ("Supported NICs: dp83932" );exit (1 ); }else { -fprintf (stderr,"qemu: Unsupported NIC: %s\n" , nd->model); +error_report ("Unsupported NIC: %s" , nd->model);exit (1 ); } }
hw/mips/mips_malta.c +7 -9
@@ -812,7 +812,7 @@ static int64_t load_kernel (void)NULL , (uint64_t *)&kernel_entry,NULL , (uint64_t *)&kernel_high, big_endian, EM_MIPS, 1, 0);if (kernel_size <0 ) { -error_report ("qemu: could not load kernel '%s': %s" , +error_report ("could not load kernel '%s': %s" , loaderparams.kernel_filename,load_elf_strerror (kernel_size));exit (1 );
@@ -846,9 +846,8 @@ static int64_t load_kernel (void) initrd_offset = (loaderparams.ram_low_size - initrd_size -131072 - ~INITRD_PAGE_MASK ) &INITRD_PAGE_MASK ;if (kernel_high >= initrd_offset) { -fprintf (stderr, -"qemu: memory too small for initial ram disk '%s'\n" , - loaderparams.initrd_filename); +error_report ("memory too small for initial ram disk '%s'" , + loaderparams.initrd_filename);exit (1 ); } initrd_size = load_image_targphys(loaderparams.initrd_filename,
@@ -856,8 +855,8 @@ static int64_t load_kernel (void) ram_size - initrd_offset); }if (initrd_size == (target_ulong) -1 ) { -fprintf (stderr,"qemu: could not load initial ram disk '%s'\n" , - loaderparams.initrd_filename); +error_report ("could not load initial ram disk '%s'" , + loaderparams.initrd_filename);exit (1 ); } }
@@ -1034,9 +1033,8 @@ void mips_malta_init(MachineState *machine)/* allocate RAM */ if (ram_size > (2048u <<20 )) { -fprintf (stderr, -"qemu: Too much memory for this machine: %d MB, maximum 2048 MB\n" , - ((unsigned int )ram_size / (1 <<20 ))); +error_report ("Too much memory for this machine: %dMB, maximum 2048MB" , + ((unsigned int )ram_size / (1 <<20 )));exit (1 ); }
hw/mips/mips_mipssim.c +5 -6
@@ -78,7 +78,7 @@ static int64_t load_kernel(void)if ((entry & ~0x7fffffffULL ) ==0x80000000 ) entry = (int32_t )entry; }else { -error_report ("qemu: could not load kernel '%s': %s" , +error_report ("could not load kernel '%s': %s" , loaderparams.kernel_filename,load_elf_strerror (kernel_size));exit (1 );
@@ -92,17 +92,16 @@ static int64_t load_kernel(void)if (initrd_size >0 ) { initrd_offset = (kernel_high + ~INITRD_PAGE_MASK ) &INITRD_PAGE_MASK ;if (initrd_offset + initrd_size > loaderparams.ram_size) { -fprintf (stderr, -"qemu: memory too small for initial ram disk '%s'\n" , - loaderparams.initrd_filename); +error_report ("memory too small for initial ram disk '%s'" , + loaderparams.initrd_filename);exit (1 ); } initrd_size =load_image_targphys (loaderparams.initrd_filename, initrd_offset, loaderparams.ram_size - initrd_offset); }if (initrd_size == (target_ulong) -1 ) { -fprintf (stderr,"qemu: could not load initial ram disk '%s'\n" , - loaderparams.initrd_filename); +error_report ("could not load initial ram disk '%s'" , + loaderparams.initrd_filename);exit (1 ); } }
hw/mips/mips_r4k.c +7 -9
@@ -98,7 +98,7 @@ static int64_t load_kernel(void)if ((entry & ~0x7fffffffULL ) ==0x80000000 ) entry = (int32_t )entry; }else { -error_report ("qemu: could not load kernel '%s': %s" , +error_report ("could not load kernel '%s': %s" , loaderparams.kernel_filename,load_elf_strerror (kernel_size));exit (1 );
@@ -112,9 +112,8 @@ static int64_t load_kernel(void)if (initrd_size >0 ) { initrd_offset = (kernel_high + ~INITRD_PAGE_MASK ) &INITRD_PAGE_MASK ;if (initrd_offset + initrd_size > ram_size) { -fprintf (stderr, -"qemu: memory too small for initial ram disk '%s'\n" , - loaderparams.initrd_filename); +error_report ("memory too small for initial ram disk '%s'" , + loaderparams.initrd_filename);exit (1 ); } initrd_size = load_image_targphys(loaderparams.initrd_filename,
@@ -122,8 +121,8 @@ static int64_t load_kernel(void) ram_size - initrd_offset); }if (initrd_size == (target_ulong) -1 ) { -fprintf (stderr,"qemu: could not load initial ram disk '%s'\n" , - loaderparams.initrd_filename); +error_report ("could not load initial ram disk '%s'" , + loaderparams.initrd_filename);exit (1 ); } }
@@ -196,9 +195,8 @@ void mips_r4k_init(MachineState *machine)/* allocate RAM */ if (ram_size > (256 <<20 )) { -fprintf (stderr, -"qemu: Too much memory for this machine: %d MB, maximum 256 MB\n" , - ((unsigned int )ram_size / (1 <<20 ))); +error_report ("Too much memory for this machine: %dMB, maximum 256MB" , + ((unsigned int )ram_size / (1 <<20 )));exit (1 ); }memory_region_allocate_system_memory (ram,NULL ,"mips_r4k.ram" , ram_size);
Signature · 1 line
2.13.6
PATCH v7 6/15 hw/moxie: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
--- hw/moxie/moxiesim.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
hw/moxie/moxiesim.c +6 -7
@@ -63,8 +63,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) 0, 0);if (kernel_size <=0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - loader_params->kernel_filename); +error_report ("could not load kernel '%s'" , + loader_params->kernel_filename);exit (1 ); }
@@ -77,9 +77,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) initrd_offset = (kernel_high + ~TARGET_PAGE_MASK ) &TARGET_PAGE_MASK ;if (initrd_offset + initrd_size > loader_params->ram_size) { -fprintf (stderr, -"qemu: memory too small for initial ram disk '%s'\n" , - loader_params->initrd_filename); +error_report ("memory too small for initial ram disk '%s'" , + loader_params->initrd_filename);exit (1 ); } initrd_size = load_image_targphys(loader_params->initrd_filename,
@@ -87,8 +86,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params) ram_size); }if (initrd_size == (target_ulong)-1 ) { -fprintf (stderr,"qemu: could not load initial ram disk '%s'\n" , - loader_params->initrd_filename); +error_report ("could not load initial ram disk '%s'" , + loader_params->initrd_filename);exit (1 ); } }
Signature · 1 line
2.13.6
PATCH v7 7/15 hw/openrisc: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
--- hw/openrisc/openrisc_sim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/openrisc/openrisc_sim.c +2 -2
@@ -19,6 +19,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
@@ -114,8 +115,7 @@ static void openrisc_load_kernel(ram_addr_t ram_size, }if (kernel_size <0 ) { -fprintf (stderr,"QEMU: couldn't load the kernel '%s'\n" , - kernel_filename); +error_report ("couldn't load the kernel '%s'" , kernel_filename);exit (1 ); } boot_info.bootstrap_pc = entry;
Signature · 1 line
2.13.6
PATCH v7 8/15 hw/pci*: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
A trailing '.' was removed in hw/pci/pci.c
Conversions that aren't followed by exit() dropped, because they might be inappropriate.
--- hw/pci-host/bonito.c | 6 +++--- hw/pci/pci.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
hw/pci-host/bonito.c +3 -3
@@ -38,7 +38,7 @@*/ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/i386/pc.h"
@@ -449,8 +449,8 @@ static uint32_t bonito_sbridge_pciaddr(void *opaque, hwaddr addr) regno = (cfgaddr &BONITO_PCICONF_REG_MASK ) >>BONITO_PCICONF_REG_OFFSET ;if (idsel ==0 ) { -fprintf (stderr,"error in bonito pci config address " TARGET_FMT_plx -",pcimap_cfg=%x\n" , addr, s->regs[BONITO_PCIMAP_CFG ]); +error_report ("error in bonito pci config address " TARGET_FMT_plx +",pcimap_cfg=%x" , addr, s->regs[BONITO_PCIMAP_CFG ]);exit (1 ); } pciaddr =PCI_ADDR (pci_bus_num (phb->bus), devno, funno, regno);
hw/pci/pci.c +2 -2
@@ -1115,8 +1115,8 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,assert (region_num >=0 );assert (region_num <PCI_NUM_REGIONS );if (size & (size-1 )) { -fprintf (stderr,"ERROR: PCI region size must be pow2 " -"type=0x%x, size=0x%" FMT_PCIBUS "\n" , type, size); +error_report ("ERROR: PCI region size must be pow2 " +"type=0x%x, size=0x%" FMT_PCIBUS "" , type, size);exit (1 ); }
Signature · 1 line
2.13.6
PATCH v7 9/15 hw/ppc: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines were then manually tweaked to pass checkpatch and some curly braces were added to match QEMU style.
Conversions that aren't followed by exit() dropped, because they might be inappropriate.
--- hw/ppc/e500.c | 16 ++++++++-------- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/ppc405_boards.c | 15 ++++++--------- hw/ppc/ppc440_bamboo.c | 16 ++++++++-------- hw/ppc/prep.c | 4 ++-- hw/ppc/virtex_ml507.c | 4 ++-- 7 files changed, 28 insertions(+), 31 deletions(-)
hw/ppc/e500.c +8 -8
@@ -811,8 +811,8 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) cs =CPU (cpu);if (env->mmu_model !=POWERPC_MMU_BOOKE206 ) { -fprintf (stderr,"MMU model %i not supported by this machine.\n" , - env->mmu_model); +error_report ("MMU model %i not supported by this machine." , + env->mmu_model);exit (1 ); }
@@ -959,8 +959,8 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) cur_base, ram_size - cur_base);if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - machine->kernel_filename); +error_report ("could not load kernel '%s'" , + machine->kernel_filename);exit (1 ); }
@@ -974,8 +974,8 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) ram_size - initrd_base);if (initrd_size <0 ) { -fprintf (stderr,"qemu: could not load initial ram disk '%s'\n" , - machine->initrd_filename); +error_report ("could not load initial ram disk '%s'" , + machine->initrd_filename);exit (1 ); }
@@ -1016,7 +1016,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) kernel_size =load_uimage (filename, &bios_entry, &loadaddr,NULL ,NULL ,NULL );if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load firmware '%s'\n" , filename); +error_report ("could not load firmware '%s'" , filename);exit (1 ); } }
@@ -1029,7 +1029,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) initrd_base, initrd_size, kernel_base, kernel_size);if (dt_size <0 ) { -fprintf (stderr,"couldn't load device tree\n" ); +error_report ("couldn't load device tree" );exit (1 ); }assert (dt_size <DTB_MAX_SIZE );
hw/ppc/mac_newworld.c +1 -1
@@ -270,7 +270,7 @@ static void ppc_core99_init(MachineState *machine) } }if (ppc_boot_device =='\0' ) { -fprintf (stderr,"No valid boot device for Mac99 machine\n" ); +error_report ("No valid boot device for Mac99 machine" );exit (1 ); } }
hw/ppc/mac_oldworld.c +1 -1
@@ -218,7 +218,7 @@ static void ppc_heathrow_init(MachineState *machine)#endif }if (ppc_boot_device =='\0' ) { -fprintf (stderr,"No valid boot device for G3 Beige machine\n" ); +error_report ("No valid boot device for G3 Beige machine" );exit (1 ); } }
hw/ppc/ppc405_boards.c +6 -9
@@ -324,8 +324,7 @@ static void ref405ep_init(MachineState *machine) kernel_size =load_image_targphys (kernel_filename, kernel_base, ram_size - kernel_base);if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - kernel_filename); +error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); } printf("Load kernel size %ld at " TARGET_FMT_lx,
@@ -336,8 +335,8 @@ static void ref405ep_init(MachineState *machine) initrd_size =load_image_targphys (initrd_filename, initrd_base, ram_size - initrd_base);if (initrd_size <0 ) { -fprintf (stderr,"qemu: could not load initial ram disk '%s'\n" , - initrd_filename); +error_report ("could not load initial ram disk '%s'" , + initrd_filename);exit (1 ); } }else {
@@ -607,8 +606,7 @@ static void taihu_405ep_init(MachineState *machine) kernel_size =load_image_targphys (kernel_filename, kernel_base, ram_size - kernel_base);if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - kernel_filename); +error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); }/* load initrd */
@@ -617,9 +615,8 @@ static void taihu_405ep_init(MachineState *machine) initrd_size =load_image_targphys (initrd_filename, initrd_base, ram_size - initrd_base);if (initrd_size <0 ) { -fprintf (stderr, -"qemu: could not load initial ram disk '%s'\n" , - initrd_filename); +error_report ("could not load initial ram disk '%s'" , + initrd_filename);exit (1 ); } }else {
hw/ppc/ppc440_bamboo.c +8 -8
@@ -12,6 +12,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "net/net.h" #include "hw/hw.h"
@@ -186,8 +187,8 @@ static void bamboo_init(MachineState *machine) env = &cpu->env;if (env->mmu_model !=POWERPC_MMU_BOOKE ) { -fprintf (stderr,"MMU model %i not supported by this machine.\n" , - env->mmu_model); +error_report ("MMU model %i not supported by this machine." , + env->mmu_model);exit (1 ); }
@@ -220,7 +221,7 @@ static void bamboo_init(MachineState *machine) NULL); pcibus = (PCIBus *)qdev_get_child_bus (dev,"pci.0" );if (!pcibus) { -fprintf (stderr,"couldn't create PCI controller!\n" ); +error_report ("couldn't create PCI controller!" );exit (1 ); }
@@ -261,8 +262,7 @@ static void bamboo_init(MachineState *machine) }/* XXX try again as binary */ if (success <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - kernel_filename); +error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); } }
@@ -273,8 +273,8 @@ static void bamboo_init(MachineState *machine) ram_size - RAMDISK_ADDR);if (initrd_size <0 ) { -fprintf (stderr,"qemu: could not load ram disk '%s' at %x\n" , - initrd_filename,RAMDISK_ADDR ); +error_report ("could not load ram disk '%s' at %x" , + initrd_filename,RAMDISK_ADDR );exit (1 ); } }
@@ -283,7 +283,7 @@ static void bamboo_init(MachineState *machine)if (kernel_filename) {if (bamboo_load_device_tree (FDT_ADDR , ram_size,RAMDISK_ADDR , initrd_size, kernel_cmdline) <0 ) { -fprintf (stderr,"couldn't load device tree\n" ); +error_report ("couldn't load device tree" );exit (1 ); } }
hw/ppc/prep.c +2 -2
@@ -574,7 +574,7 @@ static void ppc_prep_init(MachineState *machine) } }if (ppc_boot_device =='\0' ) { -fprintf (stderr,"No valid boot device for Mac99 machine\n" ); +error_report ("No valid boot device for Mac99 machine" );exit (1 ); } }
@@ -595,7 +595,7 @@ static void ppc_prep_init(MachineState *machine)qdev_init_nofail (dev); pci_bus = (PCIBus *)qdev_get_child_bus (dev,"pci.0" );if (pci_bus ==NULL ) { -fprintf (stderr,"Couldn't create PCI host controller.\n" ); +error_report ("Couldn't create PCI host controller." );exit (1 ); } sysctrl->contiguous_map_irq =qdev_get_gpio_in (dev,0 );
hw/ppc/virtex_ml507.c +2 -2
@@ -215,8 +215,8 @@ static void virtex_init(MachineState *machine) env = &cpu->env;if (env->mmu_model !=POWERPC_MMU_BOOKE ) { -fprintf (stderr,"MMU model %i not supported by this machine.\n" , - env->mmu_model); +error_report ("MMU model %i not supported by this machine." , + env->mmu_model);exit (1 ); }
Signature · 1 line
2.13.6
PATCH v7 10/15 hw/sd: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
Some of the prints in hw/sd/sd.c were manually converted to using DPRINTF() instead.
Conversions that aren't followed by exit() dropped, because they might be inappropriate.
--- hw/sd/sd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
hw/sd/sd.c +4 -3
@@ -1564,9 +1564,10 @@ send_response:if (rsplen) {int i;DPRINTF ("Response:" ); -for (i =0 ; i < rsplen; i++) -fprintf (stderr," %02x" , response[i]); -fprintf (stderr," state %d\n" , sd->state); +for (i =0 ; i < rsplen; i++) { +DPRINTF (" %02x" , response[i]); + } +DPRINTF (" state %d\n" , sd->state); }else {DPRINTF ("No response %d\n" , sd->state); }
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v7 10/15] hw/sd: Replace fprintf(stderr, "*\n" with error_report()
Quoted 40 lines · Markus Armbruster
From: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} +
Quoted 1 line
Some lines where then manually tweaked to pass checkpatch.
I think you could pretty much ditch the original patch description since nothing gets converted to error_report here anymore...
Quoted 2 lines
Some of the prints in
hw/sd/sd.cwere manually converted to usingDPRINTF()instead.
... and just use the above sentence (in a maybe slightly adapted way).
Quoted 19 lines
Signed-off-by Alistair Francis <[email protected]>Conversions that aren't followed by
exit()dropped, because they might be inappropriate.Signed-off-by Markus Armbruster <[email protected]>--- hw/sd/sd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)hw/sd/sd.c +0
-0@@ -1564,9 +1564,10 @@ send_response:if (rsplen) {int i;DPRINTF ("Response:" );
hw/sd/sd.c send_response: · line 1573
Quoted 10 lines
hw/sd/sd.c +4
-3-for (i =0 ; i < rsplen; i++) -fprintf (stderr," %02x" , response[i]); -fprintf (stderr," state %d\n" , sd->state); +for (i =0 ; i < rsplen; i++) { +DPRINTF (" %02x" , response[i]); + } +DPRINTF (" state %d\n" , sd->state); }else {DPRINTF ("No response %d\n" , sd->state); }
With the patch description updated:
Re: [Qemu-devel] [PATCH v7 10/15] hw/sd: Replace fprintf(stderr, "*\n" with error_report()
Quoted 43 lines · Thomas Huth
Quoted 40 lines · Markus Armbruster
From: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} +Quoted 1 line
Some lines where then manually tweaked to pass checkpatch.
Quoted 7 lines
I think you could pretty much ditch the original patch description since nothing gets converted to
error_reporthere anymore...Quoted 2 lines
Some of the prints in
hw/sd/sd.cwere manually converted to usingDPRINTF()instead.... and just use the above sentence (in a maybe slightly adapted way).
Done in v8.
Quoted 32 lines
Quoted 19 lines
Signed-off-by Alistair Francis <[email protected]>Conversions that aren't followed by
exit()dropped, because they might be inappropriate.Signed-off-by Markus Armbruster <[email protected]>--- hw/sd/sd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)hw/sd/sd.c +0
-0@@ -1564,9 +1564,10 @@ send_response:if (rsplen) {int i;DPRINTF ("Response:" );hw/sd/sd.c send_response: · line 1573
Quoted 10 lines
hw/sd/sd.c +4
-3-for (i =0 ; i < rsplen; i++) -fprintf (stderr," %02x" , response[i]); -fprintf (stderr," state %d\n" , sd->state); +for (i =0 ; i < rsplen; i++) { +DPRINTF (" %02x" , response[i]); + } +DPRINTF (" state %d\n" , sd->state); }else {DPRINTF ("No response %d\n" , sd->state); }With the patch description updated:
Quoted 1 line
Reviewed-by Thomas Huth <[email protected]>
Thanks!
PATCH v7 11/15 hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
--- hw/sparc/leon3.c | 16 +++++++--------- hw/sparc/sun4m.c | 16 +++++++--------- hw/sparc64/niagara.c | 4 ++-- hw/sparc64/sun4u.c | 10 +++++----- 4 files changed, 21 insertions(+), 25 deletions(-)
hw/sparc/leon3.c +7 -9
@@ -22,6 +22,7 @@* THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
@@ -139,9 +140,8 @@ static void leon3_generic_hw_init(MachineState *machine)/* Allocate RAM */ if ((uint64_t )ram_size > (1UL <<30 )) { -fprintf (stderr, -"qemu: Too much memory for this machine: %d, maximum 1G\n" , - (unsigned int )(ram_size / (1024 *1024 ))); +error_report ("Too much memory for this machine: %d, maximum 1G" , + (unsigned int )(ram_size / (1024 *1024 )));exit (1 ); }
@@ -167,19 +167,18 @@ static void leon3_generic_hw_init(MachineState *machine) }if (bios_size > prom_size) { -fprintf (stderr,"qemu: could not load prom '%s': file too big\n" , - filename); +error_report ("could not load prom '%s': file too big" , filename);exit (1 ); }if (bios_size >0 ) { ret =load_image_targphys (filename,0x00000000 , bios_size);if (ret <0 || ret > prom_size) { -fprintf (stderr,"qemu: could not load prom '%s'\n" , filename); +error_report ("could not load prom '%s'" , filename);exit (1 ); } }else if (kernel_filename ==NULL && !qtest_enabled ()) { -fprintf (stderr,"Can't read bios image %s\n" , filename); +error_report ("Can't read bios image %s" , filename);exit (1 ); }g_free (filename);
@@ -192,8 +191,7 @@ static void leon3_generic_hw_init(MachineState *machine) kernel_size =load_elf (kernel_filename,NULL ,NULL , &entry,NULL ,NULL ,1 /* big endian */ ,EM_SPARC ,0 ,0 );if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - kernel_filename); +error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); }if (bios_size <=0 ) {
hw/sparc/sun4m.c +7 -9
@@ -259,8 +259,7 @@ static unsigned long sun4m_load_kernel(const char *kernel_filename,KERNEL_LOAD_ADDR , RAM_size - KERNEL_LOAD_ADDR);if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - kernel_filename); +error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); }
@@ -271,8 +270,8 @@ static unsigned long sun4m_load_kernel(const char *kernel_filename,INITRD_LOAD_ADDR , RAM_size - INITRD_LOAD_ADDR);if (initrd_size <0 ) { -fprintf (stderr,"qemu: could not load initial ram disk '%s'\n" , - initrd_filename); +error_report ("could not load initial ram disk '%s'" , + initrd_filename);exit (1 ); } }
@@ -680,7 +679,7 @@ static void prom_init(hwaddr addr, const char *bios_name) ret =-1 ; }if (ret <0 || ret >PROM_SIZE_MAX ) { -fprintf (stderr,"qemu: could not load prom '%s'\n" , bios_name); +error_report ("could not load prom '%s'" , bios_name);exit (1 ); } }
@@ -746,10 +745,9 @@ static void ram_init(hwaddr addr, ram_addr_t RAM_size,/* allocate RAM */ if ((uint64_t )RAM_size > max_mem) { -fprintf (stderr, -"qemu: Too much memory for this machine: %d, maximum %d\n" , - (unsigned int )(RAM_size / (1024 *1024 )), - (unsigned int )(max_mem / (1024 *1024 ))); +error_report ("Too much memory for this machine: %d, maximum %d" , + (unsigned int )(RAM_size / (1024 *1024 )), + (unsigned int )(max_mem / (1024 *1024 )));exit (1 ); } dev =qdev_create (NULL ,"memory" );
hw/sparc64/niagara.c +2 -2
@@ -152,8 +152,8 @@ static void niagara_init(MachineState *machine) dinfo->is_default =1 ;rom_add_file_fixed (blk_bs (blk)->filename,NIAGARA_VDISK_BASE ,-1 ); }else { -fprintf (stderr,"qemu: could not load ram disk '%s'\n" , -blk_bs (blk)->filename); +error_report ("could not load ram disk '%s'" , +blk_bs (blk)->filename);exit (1 ); } }
hw/sparc64/sun4u.c +5 -5
@@ -22,6 +22,7 @@* THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
@@ -168,8 +169,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, RAM_size - KERNEL_LOAD_ADDR); }if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - kernel_filename); +error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); }/* load initrd above kernel */
@@ -181,8 +181,8 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, *initrd_addr, RAM_size - *initrd_addr);if ((int )*initrd_size <0 ) { -fprintf (stderr,"qemu: could not load initial ram disk '%s'\n" , - initrd_filename); +error_report ("could not load initial ram disk '%s'" , + initrd_filename);exit (1 ); } }
@@ -422,7 +422,7 @@ static void prom_init(hwaddr addr, const char *bios_name) ret =-1 ; }if (ret <0 || ret >PROM_SIZE_MAX ) { -fprintf (stderr,"qemu: could not load prom '%s'\n" , bios_name); +error_report ("could not load prom '%s'" , bios_name);exit (1 ); } }
Signature · 1 line
2.13.6
PATCH v7 12/15 hw/timer: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
Conversions that aren't followed by exit() dropped, because they might be inappropriate.
--- hw/timer/xilinx_timer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
hw/timer/xilinx_timer.c +5 -5
@@ -127,7 +127,7 @@ timer_read(void *opaque, hwaddr addr, unsigned int size)break ; } -D (fprintf (stderr,"%s timer=%d %x=%x\n" , __func__, timer, addr *4 , r)); +D (error_report ("%s timer=%d %x=%x" , __func__, timer, addr *4 , r));return r; }
@@ -135,8 +135,8 @@ static void timer_enable(struct xlx_timer *xt) {uint64_t count; -D (fprintf (stderr,"%s timer=%d down=%d\n" , __func__, - xt->nr, xt->regs[R_TCSR ] &TCSR_UDT )); +D (error_report ("%s timer=%d down=%d" , __func__, + xt->nr, xt->regs[R_TCSR ] &TCSR_UDT ));ptimer_stop (xt->ptimer);
@@ -160,7 +160,7 @@ timer_write(void *opaque, hwaddr addr, addr >>=2 ; timer =timer_from_addr (addr); xt = &t->timers[timer]; -D (fprintf (stderr,"%s addr=%x val=%x (timer=%d off=%d)\n" , +D (error_report ("%s addr=%x val=%x (timer=%d off=%d)" , __func__, addr *4 , value, timer, addr &3 ));/* Further decoding to address a specific timers reg. */ addr &=3 ;
@@ -197,7 +197,7 @@ static void timer_hit(void *opaque) {struct xlx_timer *xt = opaque;struct timerblock *t = xt->parent; -D (fprintf (stderr,"%s %d\n" , __func__, xt->nr)); +D (error_report ("%s %d" , __func__, xt->nr)); xt->regs[R_TCSR ] |=TCSR_TINT ;if (xt->regs[R_TCSR ] &TCSR_ARHT )
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v7 12/15] hw/timer: Replace fprintf(stderr, "*\n" with error_report()
Quoted 57 lines · Markus Armbruster
From: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} +Some lines where then manually tweaked to pass checkpatch.
Signed-off-by Alistair Francis <[email protected]>Conversions that aren't followed by
exit()dropped, because they might be inappropriate.Signed-off-by Markus Armbruster <[email protected]>--- hw/timer/xilinx_timer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)hw/timer/xilinx_timer.c +0
-0
hw/timer/xilinx_timer.c timer_read(void *opaque, hwaddr addr, unsigned int size) · line 130
Quoted 5 lines
hw/timer/xilinx_timer.c +1
-1@@ -127,7 +127,7 @@ timer_read(void *opaque, hwaddr addr, unsigned int size)break ; } -D (fprintf (stderr,"%s timer=%d %x=%x\n" , __func__, timer, addr *4 , r)); +D (error_report ("%s timer=%d %x=%x" , __func__, timer, addr *4 , r));
Not sure what we gain here, since those aren't error messages but trace event.
Can you drop this patch from your series? I'll convert to tracepoints and send a patch for this file.
Quoted 33 lines
hw/timer/xilinx_timer.c +4
-4return r; }@@ -135,8 +135,8 @@ static void timer_enable(struct xlx_timer *xt) {uint64_t count; -D (fprintf (stderr,"%s timer=%d down=%d\n" , __func__, - xt->nr, xt->regs[R_TCSR ] &TCSR_UDT )); +D (error_report ("%s timer=%d down=%d" , __func__, + xt->nr, xt->regs[R_TCSR ] &TCSR_UDT ));ptimer_stop (xt->ptimer);@@ -160,7 +160,7 @@ timer_write(void *opaque, hwaddr addr, addr >>=2 ; timer =timer_from_addr (addr); xt = &t->timers[timer]; -D (fprintf (stderr,"%s addr=%x val=%x (timer=%d off=%d)\n" , +D (error_report ("%s addr=%x val=%x (timer=%d off=%d)" , __func__, addr *4 , value, timer, addr &3 ));/* Further decoding to address a specific timers reg. */ addr &=3 ;@@ -197,7 +197,7 @@ static void timer_hit(void *opaque) {struct xlx_timer *xt = opaque;struct timerblock *t = xt->parent; -D (fprintf (stderr,"%s %d\n" , __func__, xt->nr)); +D (error_report ("%s %d" , __func__, xt->nr)); xt->regs[R_TCSR ] |=TCSR_TINT ;if (xt->regs[R_TCSR ] &TCSR_ARHT )
Re: [Qemu-devel] [PATCH v7 12/15] hw/timer: Replace fprintf(stderr, "*\n" with error_report()
Quoted 60 lines · Philippe Mathieu-Daudé
Quoted 59 lines · Markus Armbruster
From: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} +Some lines where then manually tweaked to pass checkpatch.
Signed-off-by Alistair Francis <[email protected]>Conversions that aren't followed by
exit()dropped, because they might be inappropriate.Signed-off-by Markus Armbruster <[email protected]>--- hw/timer/xilinx_timer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)hw/timer/xilinx_timer.c +0
-0@@ -127,7 +127,7 @@ timer_read(void *opaque, hwaddr addr, unsigned int size)break ;
Quoted 8 lines
hw/timer/xilinx_timer.c timer_read(void *opaque, hwaddr addr, unsigned int size) · line 130
Quoted 3 lines
hw/timer/xilinx_timer.c +1
-1} -D (fprintf (stderr,"%s timer=%d %x=%x\n" , __func__, timer, addr *4 , r)); +D (error_report ("%s timer=%d %x=%x" , __func__, timer, addr *4 , r));Not sure what we gain here, since those aren't error messages but trace event.
Can you drop this patch from your series? I'll convert to tracepoints and send a patch for this file.
Done. Thanks!
PATCH v7 13/15 hw/xen*: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Some lines where then manually tweaked to pass checkpatch.
xen_pt_log() was left with an fprintf(stderr,
Conversions that aren't followed by exit() dropped, because they might be inappropriate.
--- hw/xen/xen-common.c | 5 +++-- hw/xenpv/xen_machine_pv.c | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-)
hw/xen/xen-common.c +3 -2
@@ -9,6 +9,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" #include "chardev/char.h"
@@ -96,13 +97,13 @@ static void xenstore_record_dm_state(struct xs_handle *xs, const char *state)char path[50 ];if (xs ==NULL ) { -fprintf (stderr,"xenstore connection not initialized\n" ); +error_report ("xenstore connection not initialized" );exit (1 ); }snprintf (path,sizeof (path),"device-model/%u/state" , xen_domid);if (!xs_write (xs,XBT_NULL , path, state,strlen (state))) { -fprintf (stderr,"error recording dm state\n" ); +error_report ("error recording dm state" );exit (1 ); } }
hw/xenpv/xen_machine_pv.c +5 -4
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/boards.h" #include "hw/xen/xen_backend.h"
@@ -36,7 +37,7 @@ static void xen_init_pv(MachineState *machine)/* Initialize backend core & drivers */ if (xen_be_init () !=0 ) { -fprintf (stderr,"%s: xen backend core setup failed\n" , __func__); +error_report ("%s: xen backend core setup failed" , __func__);exit (1 ); }
@@ -51,18 +52,18 @@ static void xen_init_pv(MachineState *machine)const char *initrd_filename = machine->initrd_filename;if (xen_domain_build_pv (kernel_filename, initrd_filename, kernel_cmdline) <0 ) { -fprintf (stderr,"xen pv domain creation failed\n" ); +error_report ("xen pv domain creation failed" );exit (1 ); } break; }#endif case XEN_EMULATE : -fprintf (stderr,"xen emulation not implemented (yet)\n" ); +error_report ("xen emulation not implemented (yet)" );exit (1 );break ;default : -fprintf (stderr,"unhandled xen_mode %d\n" , xen_mode); +error_report ("unhandled xen_mode %d" , xen_mode);exit (1 );break ; }
Signature · 1 line
2.13.6
PATCH v7 14/15 tcg: Replace fprintf(stderr, "*\n" with error_report()
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +Conversions that aren't followed by exit() dropped, because they might be inappropriate.
--- cpus.c | 10 +++++----- exec.c | 6 +++--- vl.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)
cpus.c +5 -5
@@ -259,7 +259,7 @@ int64_t cpu_get_icount_raw(void)if (cpu && cpu->running) {if (!cpu->can_do_io) { -fprintf (stderr,"Bad icount read\n" ); +error_report ("Bad icount read" );exit (1 ); }/* Take into account what has run */
@@ -1181,7 +1181,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) r =kvm_init_vcpu (cpu);if (r <0 ) { -fprintf (stderr,"kvm_init_vcpu failed: %s\n" ,strerror (-r)); +error_report ("kvm_init_vcpu failed: %s" ,strerror (-r));exit (1 ); }
@@ -1211,7 +1211,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)static void *qemu_dummy_cpu_thread_fn (void *arg) {#ifdef _WIN32 -fprintf (stderr,"qtest is not supported under Windows\n" ); +error_report ("qtest is not supported under Windows" );exit (1 );#else CPUState *cpu = arg;
@@ -1631,8 +1631,8 @@ static void qemu_cpu_kick_thread(CPUState *cpu)#else /* _WIN32 */ if (!qemu_cpu_is_self (cpu)) {if (!QueueUserAPC (dummy_apc_func, cpu->hThread,0 )) { -fprintf (stderr,"%s: QueueUserAPC failed with error %lu\n" , - __func__,GetLastError ()); +error_report ("%s: QueueUserAPC failed with error %lu" , __func__, +GetLastError ());exit (1 ); } }
exec.c +3 -3
@@ -2216,9 +2216,9 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) flags, -1, 0); }if (area != vaddr) { -fprintf (stderr,"Could not remap addr: " -RAM_ADDR_FMT "@" RAM_ADDR_FMT "\n" , - length, addr); +error_report ("Could not remap addr: " +RAM_ADDR_FMT "@" RAM_ADDR_FMT "" , + length, addr);exit (1 ); }memory_try_enable_merging (vaddr, length);
vl.c +1 -1
@@ -2172,7 +2172,7 @@ static DisplayType select_display(const char *p) display_opengl =1 ; display =DT_EGL ;#else -fprintf (stderr,"egl support is disabled\n" ); +error_report ("egl support is disabled" );exit (1 );#endif }else if (strstart (p,"curses" , &opts)) {
Signature · 1 line
2.13.6
PATCH v7 15/15 target: Use qemu_log() instead of fprintf(stderr, ...)
In reply to Markus ArmbrusterFrom: Alistair Francis <[email protected]>
Convert fprintf(stderr, ...) to use qemu_log(). Double prints in target/ppc/translate.c were manually remove. A fprintf() in target/sh4/translate.c was kept as it's inside a #if 0. The #if 0 and fflush() was removed around the unimplemented log in target/sh4/translate.c as well.
--- dtc | 2 +- target/cris/translate.c | 2 +- target/ppc/translate.c | 36 ++++++++++-------------------------- target/sh4/translate.c | 7 ++----- target/unicore32/translate.c | 2 +- 5 files changed, 15 insertions(+), 34 deletions(-)
dtc +1 -1
@@ -1 +1 @@ -Subproject commit e54388015af1fb4bf04d0bca99caba1074d9cc42 +Subproject commit 558cd81bdd432769b59bff01240c44f82cfb1a9d
target/cris/translate.c +1 -1
@@ -137,7 +137,7 @@ typedef struct DisasContext {static void gen_BUG (DisasContext *dc,const char *file,int line) { -fprintf (stderr,"BUG: pc=%x %s %d\n" , dc->pc, file, line); +qemu_log ("BUG: pc=%x %s %d\n" , dc->pc, file, line);if (qemu_log_separate ()) {qemu_log ("BUG: pc=%x %s %d\n" , dc->pc, file, line); }
target/ppc/translate.c +10 -26
@@ -3933,12 +3933,8 @@ static inline void gen_op_mfspr(DisasContext *ctx)* allowing userland application to read the PVR */ if (sprn !=SPR_PVR ) { -fprintf (stderr,"Trying to read privileged spr %d (0x%03x) at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); -if (qemu_log_separate ()) { -qemu_log ("Trying to read privileged spr %d (0x%03x) at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); - } +qemu_log ("Trying to read privileged spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); }gen_priv_exception (ctx,POWERPC_EXCP_PRIV_REG ); }
@@ -3950,12 +3946,8 @@ static inline void gen_op_mfspr(DisasContext *ctx)return ; }/* Not defined */ -fprintf (stderr,"Trying to read invalid spr %d (0x%03x) at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); -if (qemu_log_separate ()) { -qemu_log ("Trying to read invalid spr %d (0x%03x) at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); - } +qemu_log ("Trying to read invalid spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 );/* The behaviour depends on MSR:PR and SPR# bit 0x10, * it can generate a priv, a hv emu or a no-op
@@ -4096,12 +4088,8 @@ static void gen_mtspr(DisasContext *ctx) (*write_cb)(ctx, sprn,rS (ctx->opcode)); }else {/* Privilege exception */ -fprintf (stderr,"Trying to write privileged spr %d (0x%03x) at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); -if (qemu_log_separate ()) { -qemu_log ("Trying to write privileged spr %d (0x%03x) at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); - } +qemu_log ("Trying to write privileged spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 );gen_priv_exception (ctx,POWERPC_EXCP_PRIV_REG ); } }else {
@@ -4113,12 +4101,8 @@ static void gen_mtspr(DisasContext *ctx) }/* Not defined */ -if (qemu_log_separate ()) { -qemu_log ("Trying to write invalid spr %d (0x%03x) at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); - } -fprintf (stderr,"Trying to write invalid spr %d (0x%03x) at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); +qemu_log ("Trying to write invalid spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 );/* The behaviour depends on MSR:PR and SPR# bit 0x10,
@@ -7381,8 +7365,8 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)break ; }if (tcg_check_temp_count ()) { -fprintf (stderr,"Opcode %02x %02x %02x %02x (%08x) leaked " -"temporaries\n" ,opc1 (ctx.opcode),opc2 (ctx.opcode), +qemu_log ("Opcode %02x %02x %02x %02x (%08x) leaked " +"temporaries\n" ,opc1 (ctx.opcode),opc2 (ctx.opcode),opc3 (ctx.opcode),opc4 (ctx.opcode), ctx.opcode);exit (1 ); }
target/sh4/translate.c +2 -5
@@ -1827,11 +1827,8 @@ static void _decode_opc(DisasContext * ctx) }break ; } -#if 0 -fprintf (stderr,"unknown instruction 0x%04x at pc 0x%08x\n" , - ctx->opcode, ctx->base.pc_next); -fflush (stderr); -#endif +qemu_log_mask (LOG_UNIMP ,"unknown instruction 0x%04x at pc 0x%08x\n" , + ctx->opcode, ctx->base.pc_next); do_illegal:if (ctx->envflags &DELAY_SLOT_MASK ) { do_illegal_slot:
target/unicore32/translate.c +1 -1
@@ -1936,7 +1936,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)disas_uc32_insn (env, dc);if (num_temps) { -fprintf (stderr,"Internal resource leak before %08x\n" , dc->pc); +qemu_log ("Internal resource leak before %08x\n" , dc->pc); num_temps =0 ; }
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v7 15/15] target: Use qemu_log() instead of fprintf(stderr, ...)
Quoted 24 lines · Markus Armbruster
From: Alistair Francis <[email protected]>
Convert
fprintf(stderr, ...)to useqemu_log(). Double prints intarget/ppc/translate.cwere manually remove. Afprintf()intarget/sh4/translate.cwas kept as it's inside a #if 0. The #if 0 andfflush()was removed around the unimplemented log intarget/sh4/translate.cas well.Signed-off-by Alistair Francis <[email protected]>[Trivial conflict with 6f1c2af641d resolved]Signed-off-by Markus Armbruster <[email protected]>--- dtc | 2 +- target/cris/translate.c | 2 +- target/ppc/translate.c | 36 ++++++++++-------------------------- target/sh4/translate.c | 7 ++----- target/unicore32/translate.c | 2 +- 5 files changed, 15 insertions(+), 34 deletions(-)dtc +0
-0
dtc line 1
Quoted 2 lines
dtc +1
-1@@ -1 +1 @@ -Subproject commit e54388015af1fb4bf04d0bca99caba1074d9cc42 +Subproject commit 558cd81bdd432769b59bff01240c44f82cfb1a9d
Intentional?
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v7 15/15] target: Use qemu_log() instead of fprintf(stderr, ...)
Quoted 20 lines · Eric Blake
Quoted 19 lines · Markus Armbruster
From: Alistair Francis <[email protected]>
Convert
fprintf(stderr, ...)to useqemu_log(). Double prints intarget/ppc/translate.cwere manually remove. Afprintf()intarget/sh4/translate.cwas kept as it's inside a #if 0. The #if 0 andfflush()was removed around the unimplemented log intarget/sh4/translate.cas well.Signed-off-by Alistair Francis <[email protected]>[Trivial conflict with 6f1c2af641d resolved]Signed-off-by Markus Armbruster <[email protected]>--- dtc | 2 +- target/cris/translate.c | 2 +- target/ppc/translate.c | 36 ++++++++++-------------------------- target/sh4/translate.c | 7 ++----- target/unicore32/translate.c | 2 +- 5 files changed, 15 insertions(+), 34 deletions(-)
Quoted 9 lines
dtc line 1
Quoted 7 lines
dtc +1
-1@@ -1 +1 @@ -Subproject commit e54388015af1fb4bf04d0bca99caba1074d9cc42 +Subproject commit 558cd81bdd432769b59bff01240c44f82cfb1a9dIntentional?
Rebase accident, good catch!
Quoted 81 lines · Markus Armbruster
This is my attempt to salvage a good part of Alistair's error reporting cleanup series
[PATCH v6 00/29] Remove some of the fprintf(stderr, "*
Continue on improving QEMUs logging/error messages by removing more fprintf()'s.
Unfortunatley my Coccinelle skills aren't that great so it's all done in some nasty regex and a little bit of manual work.
It foundered on the problem that some of its
fprintf()toerror_report()conversions are inappropriate, seeMessage-ID: <[email protected]> https://lists.gnu.org/archive/html/qemu-devel/2017-12/msg04961.htmlAlistair didn't feel like checking about one hundred conversions by hand, which is understandable. But letting the work go to waste would be a shame, so I wrote an AWK script (see below) to extract a common kind of obviously good conversions: the ones where the
fprintf()is followed byexit(). Judging from the diffstat, this salvages more than half of his conversion work.v7:
* Old PATCH 02,03,21 are already in master, drop
* Conversions not obviously followed byexit()dropped Nothing left in old PATCH 06-12,16,17,22, drop R-bys dropped
* Rebased, trivial conflict in the last patch resolved#!/usr/bin/awk -f
hunk && /^\+[ \t]*error_report/ {
n++
er_indent=match(substr($0, 2), /[^ \t]/)
er_nr= NR
plus = 0
fatal = 0
}hunk && er_indent && /^\+/ { plus++ }hunk &&
er_indent&& /^[ \t]*exit/ {
d = NR -er_nr- plus
if (maxd < d)
maxd = d
fatal = 1
}hunk &&
er_indent&&match(substr($0, 2), /[^ \t]/)<er_indent{
if (fatal)
nf++
er_indent= 0
}hunk && /^[-+ ]/ { hunk = hunk "\n" $0 next }hunk { if (n && nf && n != nf) print loc, "mixed hunk", n, nf >"/dev/stderr" else if (n && !nf) print loc, "non-fatal hunk", n, nf >"/dev/stderr" else if (!n || nf) print hunk hunk = "" }/^@@ / { hunk = $0 loc = FILENAME ":" FNR ":" n = nf = 0 next }
Quoted 7 lines
{
}END {
print "max distance", maxd+0 >"/dev/stderr"
}
Awesome!
I'm glad this isn't being wasted.
Alistair
Quoted 81 lines
Alistair Francis (15):
audio: ReplaceAUDIO_FUNCwith__func__
hw/arm: Replace fprintf(stderr, "*\n" witherror_report()hw/dma: Replace fprintf(stderr, "*\n" witherror_report()hw/lm32: Replace fprintf(stderr, "*\n" witherror_report()hw/mips: Replace fprintf(stderr, "*\n" witherror_report()hw/moxie: Replace fprintf(stderr, "*\n" witherror_report()hw/openrisc: Replace fprintf(stderr, "*\n" witherror_report()hw/pci*: Replace fprintf(stderr, "*\n" witherror_report()hw/ppc: Replace fprintf(stderr, "*\n" witherror_report()hw/sd: Replace fprintf(stderr, "*\n" witherror_report()hw/sparc*: Replace fprintf(stderr, "*\n" witherror_report()hw/timer: Replace fprintf(stderr, "*\n" witherror_report()hw/xen*: Replace fprintf(stderr, "*\n" witherror_report()
tcg: Replace fprintf(stderr, "*\n" witherror_report()
target: Useqemu_log()instead offprintf(stderr, ...)audio/alsaaudio.c | 4 ++-- audio/audio.c | 40 +++++++++++++++---------------- audio/audio_int.h | 6 ----- audio/audio_pt_int.c | 28 +++++++++++----------- audio/audio_template.h | 26 ++++++++++---------- audio/dsoundaudio.c | 2 +- audio/mixeng.c | 2 +- audio/ossaudio.c | 10 ++++---- audio/paaudio.c | 56 ++++++++++++++++++++++---------------------- audio/sdlaudio.c | 2 +- audio/wavaudio.c | 2 +- cpus.c | 10 ++++---- dtc | 2 +- exec.c | 6 ++--- hw/arm/armv7m.c | 2 +- hw/arm/boot.c | 16 ++++++------- hw/arm/gumstix.c | 13 +++++----- hw/arm/mainstone.c | 7 +++--- hw/arm/musicpal.c | 2 +- hw/arm/omap1.c | 5 ++-- hw/arm/omap2.c | 3 ++- hw/arm/omap_sx1.c | 2 +- hw/arm/pxa2xx.c | 7 +++--- hw/arm/vexpress.c | 8 +++---- hw/arm/z2.c | 6 ++--- hw/dma/soc_dma.c | 36 ++++++++++++++-------------- hw/lm32/lm32_boards.c | 7 +++--- hw/lm32/milkymist.c | 7 +++--- hw/mips/mips_fulong2e.c | 13 +++++----- hw/mips/mips_jazz.c | 4 ++-- hw/mips/mips_malta.c | 16 ++++++------- hw/mips/mips_mipssim.c | 11 ++++----- hw/mips/mips_r4k.c | 16 ++++++------- hw/moxie/moxiesim.c | 13 +++++----- hw/openrisc/openrisc_sim.c | 4 ++-- hw/pci-host/bonito.c | 6 ++--- hw/pci/pci.c | 4 ++-- hw/ppc/e500.c | 16 ++++++------- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/ppc405_boards.c | 15 +++++------- hw/ppc/ppc440_bamboo.c | 16 ++++++------- hw/ppc/prep.c | 4 ++-- hw/ppc/virtex_ml507.c | 4 ++-- hw/sd/sd.c | 7 +++--- hw/sparc/leon3.c | 16 ++++++------- hw/sparc/sun4m.c | 16 ++++++------- hw/sparc64/niagara.c | 4 ++-- hw/sparc64/sun4u.c | 10 ++++---- hw/timer/xilinx_timer.c | 10 ++++---- hw/xen/xen-common.c | 5 ++-- hw/xenpv/xen_machine_pv.c | 9 +++---- target/cris/translate.c | 2 +- target/ppc/translate.c | 36 ++++++++-------------------- target/sh4/translate.c | 7 ++---- target/unicore32/translate.c | 2 +- vl.c | 2 +- 57 files changed, 277 insertions(+), 312 deletions(-)--
2.13.6
Quoted 17 lines · Markus Armbruster
This is my attempt to salvage a good part of Alistair's error reporting cleanup series
[PATCH v6 00/29] Remove some of the fprintf(stderr, "*
Continue on improving QEMUs logging/error messages by removing more fprintf()'s.
Unfortunatley my Coccinelle skills aren't that great so it's all done in some nasty regex and a little bit of manual work.
It foundered on the problem that some of its
fprintf()toerror_report()conversions are inappropriate, seeMessage-ID: <[email protected]> https://lists.gnu.org/archive/html/qemu-devel/2017-12/msg04961.html
Quoted 6 lines
Alistair didn't feel like checking about one hundred conversions by hand, which is understandable. But letting the work go to waste would be a shame, so I wrote an AWK script (see below) to extract a common kind of obviously good conversions: the ones where the
fprintf()is followed byexit(). Judging from the diffstat, this salvages more than half of his conversion work.
Thanks for this :)
except patch 12 and the dtc submodule change reported by Eric in patch 15, series:
Quoted 142 lines
v7:
* Old PATCH 02,03,21 are already in master, drop
* Conversions not obviously followed byexit()dropped Nothing left in old PATCH 06-12,16,17,22, drop R-bys dropped
* Rebased, trivial conflict in the last patch resolved#!/usr/bin/awk -f
hunk && /^\+[ \t]*error_report/ {
n++
er_indent=match(substr($0, 2), /[^ \t]/)
er_nr= NR
plus = 0
fatal = 0
}hunk && er_indent && /^\+/ { plus++ }hunk &&
er_indent&& /^[ \t]*exit/ {
d = NR -er_nr- plus
if (maxd < d)
maxd = d
fatal = 1
}hunk &&
er_indent&&match(substr($0, 2), /[^ \t]/)<er_indent{
if (fatal)
nf++
er_indent= 0
}hunk && /^[-+ ]/ { hunk = hunk "\n" $0 next }hunk { if (n && nf && n != nf) print loc, "mixed hunk", n, nf >"/dev/stderr" else if (n && !nf) print loc, "non-fatal hunk", n, nf >"/dev/stderr" else if (!n || nf) print hunk hunk = "" }/^@@ / { hunk = $0 loc = FILENAME ":" FNR ":" n = nf = 0 next }{
}END {
print "max distance", maxd+0 >"/dev/stderr"
}Alistair Francis (15):
audio: ReplaceAUDIO_FUNCwith__func__
hw/arm: Replace fprintf(stderr, "*\n" witherror_report()hw/dma: Replace fprintf(stderr, "*\n" witherror_report()hw/lm32: Replace fprintf(stderr, "*\n" witherror_report()hw/mips: Replace fprintf(stderr, "*\n" witherror_report()hw/moxie: Replace fprintf(stderr, "*\n" witherror_report()hw/openrisc: Replace fprintf(stderr, "*\n" witherror_report()hw/pci*: Replace fprintf(stderr, "*\n" witherror_report()hw/ppc: Replace fprintf(stderr, "*\n" witherror_report()hw/sd: Replace fprintf(stderr, "*\n" witherror_report()hw/sparc*: Replace fprintf(stderr, "*\n" witherror_report()hw/timer: Replace fprintf(stderr, "*\n" witherror_report()hw/xen*: Replace fprintf(stderr, "*\n" witherror_report()
tcg: Replace fprintf(stderr, "*\n" witherror_report()
target: Useqemu_log()instead offprintf(stderr, ...)audio/alsaaudio.c | 4 ++-- audio/audio.c | 40 +++++++++++++++---------------- audio/audio_int.h | 6 ----- audio/audio_pt_int.c | 28 +++++++++++----------- audio/audio_template.h | 26 ++++++++++---------- audio/dsoundaudio.c | 2 +- audio/mixeng.c | 2 +- audio/ossaudio.c | 10 ++++---- audio/paaudio.c | 56 ++++++++++++++++++++++---------------------- audio/sdlaudio.c | 2 +- audio/wavaudio.c | 2 +- cpus.c | 10 ++++---- dtc | 2 +- exec.c | 6 ++--- hw/arm/armv7m.c | 2 +- hw/arm/boot.c | 16 ++++++------- hw/arm/gumstix.c | 13 +++++----- hw/arm/mainstone.c | 7 +++--- hw/arm/musicpal.c | 2 +- hw/arm/omap1.c | 5 ++-- hw/arm/omap2.c | 3 ++- hw/arm/omap_sx1.c | 2 +- hw/arm/pxa2xx.c | 7 +++--- hw/arm/vexpress.c | 8 +++---- hw/arm/z2.c | 6 ++--- hw/dma/soc_dma.c | 36 ++++++++++++++-------------- hw/lm32/lm32_boards.c | 7 +++--- hw/lm32/milkymist.c | 7 +++--- hw/mips/mips_fulong2e.c | 13 +++++----- hw/mips/mips_jazz.c | 4 ++-- hw/mips/mips_malta.c | 16 ++++++------- hw/mips/mips_mipssim.c | 11 ++++----- hw/mips/mips_r4k.c | 16 ++++++------- hw/moxie/moxiesim.c | 13 +++++----- hw/openrisc/openrisc_sim.c | 4 ++-- hw/pci-host/bonito.c | 6 ++--- hw/pci/pci.c | 4 ++-- hw/ppc/e500.c | 16 ++++++------- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/ppc405_boards.c | 15 +++++------- hw/ppc/ppc440_bamboo.c | 16 ++++++------- hw/ppc/prep.c | 4 ++-- hw/ppc/virtex_ml507.c | 4 ++-- hw/sd/sd.c | 7 +++--- hw/sparc/leon3.c | 16 ++++++------- hw/sparc/sun4m.c | 16 ++++++------- hw/sparc64/niagara.c | 4 ++-- hw/sparc64/sun4u.c | 10 ++++---- hw/timer/xilinx_timer.c | 10 ++++---- hw/xen/xen-common.c | 5 ++-- hw/xenpv/xen_machine_pv.c | 9 +++---- target/cris/translate.c | 2 +- target/ppc/translate.c | 36 ++++++++-------------------- target/sh4/translate.c | 7 ++---- target/unicore32/translate.c | 2 +- vl.c | 2 +- 57 files changed, 277 insertions(+), 312 deletions(-)