Remove some of the fprintf(stderr, "*
Subsystems (2)
v6 cover Remove some of the fprintf(stderr, "*
This is a smaller version of my original series, to hopefully get something merged (although it's getting late for 2.11 now).
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.
V6:
- Indentation fixes
V5:
- Small fixes
- Remove a lot of patches
V4:
- Reorder patch 3 (the audio func patch)
- Add all tags
- Small fixes
V3:
- Rebase
- All sorts of style fixes
- Remove "qemu: " prefixes from print messages
V2:
- Fix build issues
- Drop block patches
- Split the hw patches into subdirectories
- Remove AUDIO_FUNC macro as well
- Add some __FUNCTION__ rename fixes in a seperate patch
- Create a qemu_log() conversion patch for target/
Alistair Francis (29):
audio: Replace AUDIO_FUNC with __func__
Replace all occurances of __FUNCTION__ with __func__ Fixes after renaming __FUNCTION__ to __func__ hw/arm: Replace fprintf(stderr, "*\n" with error_report() hw/dma: Replace fprintf(stderr, "*\n" with error_report() hw/gpio: Replace fprintf(stderr, "*\n" with error_report() hw/i2c: Replace fprintf(stderr, "*\n" with error_report() hw/i386: Replace fprintf(stderr, "*\n" with error_report() hw/ide: Replace fprintf(stderr, "*\n" with error_report() hw/intc: Replace fprintf(stderr, "*\n" with error_report() hw/ipmi: Replace fprintf(stderr, "*\n" with error_report() hw/isa: 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/nios2: Replace fprintf(stderr, "*\n" with error_report() hw/nvram: 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/s390x: Replace fprintf(stderr, "*\n" with error_report() hw/scsi: 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/ssi: 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 +++---- exec.c | 20 +++++++------- hw/arm/armv7m.c | 2 +- hw/arm/boot.c | 37 ++++++++++++------------- hw/arm/gumstix.c | 13 +++++---- hw/arm/mainstone.c | 7 +++-- hw/arm/musicpal.c | 2 +- hw/arm/nseries.c | 2 +- hw/arm/omap1.c | 49 ++++++++++++++++----------------- hw/arm/omap2.c | 23 ++++++++-------- hw/arm/omap_sx1.c | 8 ++---- hw/arm/palm.c | 20 +++++++------- hw/arm/pxa2xx.c | 53 +++++++++++++++++------------------ hw/arm/pxa2xx_gpio.c | 6 ++-- hw/arm/pxa2xx_pic.c | 4 +-- hw/arm/stellaris.c | 3 +- hw/arm/tosa.c | 26 +++++++++--------- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 8 +++--- hw/arm/z2.c | 6 ++-- hw/audio/hda-codec.c | 10 +++---- hw/audio/intel-hda.c | 28 +++++++++---------- hw/audio/wm8750.c | 4 +-- hw/block/nand.c | 4 +-- hw/block/onenand.c | 8 +++--- hw/bt/core.c | 10 +++---- hw/bt/hci-csr.c | 14 +++++----- hw/bt/hci.c | 26 +++++++++--------- hw/bt/hid.c | 2 +- hw/bt/l2cap.c | 22 +++++++-------- hw/bt/sdp.c | 6 ++-- hw/display/blizzard.c | 18 ++++++------ hw/display/omap_dss.c | 6 ++-- hw/display/pxa2xx_lcd.c | 14 +++++----- hw/display/qxl-render.c | 6 ++-- hw/display/qxl.h | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/xenfb.c | 2 +- hw/dma/omap_dma.c | 38 +++++++++++++------------ hw/dma/pxa2xx_dma.c | 14 +++++----- hw/dma/soc_dma.c | 36 ++++++++++++------------ hw/gpio/max7310.c | 8 +++--- hw/gpio/omap_gpio.c | 2 +- hw/i2c/omap_i2c.c | 10 +++---- hw/i386/kvm/apic.c | 15 +++++----- hw/i386/kvm/clock.c | 7 +++-- hw/i386/kvm/i8254.c | 11 ++++---- hw/i386/kvm/i8259.c | 5 ++-- hw/i386/kvm/ioapic.c | 5 ++-- hw/i386/multiboot.c | 21 +++++++------- hw/i386/pc.c | 24 ++++++++-------- hw/i386/pc_piix.c | 2 +- hw/i386/pc_sysfw.c | 4 +-- hw/i386/xen/xen-hvm.c | 34 ++++++++++++----------- hw/i386/xen/xen-mapcache.c | 12 ++++---- hw/i386/xen/xen_apic.c | 3 +- hw/ide/ahci.c | 6 ++-- hw/ide/core.c | 3 +- hw/ide/microdrive.c | 4 +-- hw/input/lm832x.c | 6 ++-- hw/input/pxa2xx_keypad.c | 6 ++-- hw/input/tsc2005.c | 8 +++--- hw/input/tsc210x.c | 4 +-- hw/intc/arm_gic_kvm.c | 12 ++++---- hw/intc/omap_intc.c | 4 +-- hw/intc/openpic.c | 1 + hw/intc/openpic_kvm.c | 8 +++--- hw/intc/s390_flic_kvm.c | 4 +-- hw/ipmi/ipmi_bmc_extern.c | 5 ++-- hw/isa/isa-bus.c | 7 +++-- hw/isa/vt82c686.c | 2 +- hw/lm32/lm32_boards.c | 7 ++--- hw/lm32/milkymist.c | 7 ++--- hw/mips/boston.c | 4 +-- hw/mips/gt64xxx_pci.c | 2 +- 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 | 18 ++++++------ hw/misc/cbus.c | 12 ++++---- hw/misc/omap_clk.c | 4 +-- hw/misc/omap_gpmc.c | 6 ++-- hw/misc/omap_l4.c | 4 +-- hw/misc/omap_sdrc.c | 2 +- hw/misc/omap_tap.c | 6 ++-- hw/misc/tmp105.c | 2 +- hw/moxie/moxiesim.c | 14 +++++----- hw/nios2/boot.c | 2 +- hw/nvram/eeprom93xx.c | 7 +++-- hw/nvram/fw_cfg.c | 4 +-- hw/openrisc/openrisc_sim.c | 4 +-- hw/pci-host/bonito.c | 8 +++--- hw/pci/pci.c | 12 ++++---- hw/ppc/e500.c | 28 +++++++++---------- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/mpc8544_guts.c | 7 +++-- hw/ppc/ppc405_boards.c | 15 ++++------ hw/ppc/ppc440_bamboo.c | 27 +++++++++--------- hw/ppc/ppc4xx_pci.c | 3 +- hw/ppc/prep.c | 4 +-- hw/ppc/virtex_ml507.c | 9 +++--- hw/s390x/virtio-ccw.c | 5 ++-- hw/scsi/lsi53c895a.c | 4 +-- hw/scsi/spapr_vscsi.c | 61 +++++++++++++++++++++-------------------- hw/scsi/virtio-scsi-dataplane.c | 7 ++--- hw/sd/pl181.c | 5 ++-- hw/sd/pxa2xx_mmci.c | 6 ++-- hw/sd/sd.c | 15 +++++----- hw/sparc/leon3.c | 16 +++++------ hw/sparc/sun4m.c | 16 +++++------ hw/sparc64/niagara.c | 4 +-- hw/sparc64/sun4u.c | 10 +++---- hw/ssi/omap_spi.c | 9 +++--- hw/timer/omap_gptimer.c | 12 ++++---- hw/timer/twl92230.c | 7 ++--- hw/timer/xilinx_timer.c | 10 +++---- hw/usb/desc.c | 2 +- hw/usb/dev-bluetooth.c | 4 +-- hw/usb/hcd-musb.c | 4 +-- hw/usb/tusb6010.c | 14 +++++----- hw/xen/xen-common.c | 11 ++++---- hw/xenpv/xen_domainbuild.c | 32 ++++++++++----------- hw/xenpv/xen_machine_pv.c | 9 +++--- include/hw/arm/omap.h | 10 +++---- include/hw/arm/sharpsl.h | 2 +- memory_mapping.c | 2 +- migration/block.c | 4 +-- target/cris/translate.c | 2 +- target/ppc/translate.c | 36 +++++++----------------- target/sh4/translate.c | 7 ++--- target/unicore32/translate.c | 2 +- tcg/optimize.c | 8 +++--- tcg/tcg.c | 2 +- tcg/tcg.h | 3 +- tcg/tci.c | 3 +- tcg/tci/tcg-target.inc.c | 7 ++--- ui/cursor.c | 6 ++-- ui/spice-display.c | 4 +-- vl.c | 2 +- 152 files changed, 802 insertions(+), 821 deletions(-)
Signature · 1 line
2.14.1
PATCH v6 1/29 audio: Replace AUDIO_FUNC with __func__
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.
Signed-off-by Alistair Francis <[email protected]>
Cc Gerd Hoffmann <[email protected]>
Reviewed-by Thomas Huth <[email protected]>
Reviewed-by Eric Blake <[email protected]>
Reviewed-by Gerd Hoffmann <[email protected]>
---
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.14.1
PATCH v6 2/29 Replace all occurances of __FUNCTION__ with __func__
In reply to Alistair FrancisReplace all occurs of __FUNCTION__ except for the check in checkpatch with the non GCC specific __func__.
One line in hcd-musb.c was manually tweaked to pass checkpatch.
Signed-off-by Alistair Francis <[email protected]>
Cc Gerd Hoffmann <[email protected]>
Cc Andrzej Zaborowski <[email protected]>
Cc Stefano Stabellini <[email protected]>
Cc Anthony Perard <[email protected]>
Cc John Snow <[email protected]>
Cc Aurelien Jarno <[email protected]>
Cc Yongbok Kim <[email protected]>
Cc Peter Crosthwaite <[email protected]>
Cc Stefan Hajnoczi <[email protected]>
Cc Fam Zheng <[email protected]>
Cc Juan Quintela <[email protected]>
Cc "Dr. David Alan Gilbert" <[email protected]>
Reviewed-by Eric Blake <[email protected]>
Reviewed-by Stefan Hajnoczi <[email protected]>
Reviewed-by Anthony PERARD <[email protected]>
Reviewed-by Juan Quintela <[email protected]>
Reviewed-by Gerd Hoffmann <[email protected]>
---
hw/arm/nseries.c | 2 +- hw/arm/omap1.c | 42 +++++++++++++++++++++--------------------- hw/arm/omap2.c | 12 ++++++------ hw/arm/palm.c | 14 +++++++------- hw/arm/pxa2xx.c | 46 +++++++++++++++++++++++----------------------- hw/arm/pxa2xx_gpio.c | 6 +++--- hw/arm/pxa2xx_pic.c | 4 ++-- hw/arm/tosa.c | 10 +++++----- hw/audio/hda-codec.c | 10 +++++----- hw/audio/intel-hda.c | 28 ++++++++++++++-------------- hw/audio/wm8750.c | 4 ++-- hw/block/nand.c | 4 ++-- hw/block/onenand.c | 8 ++++---- hw/bt/core.c | 10 +++++----- hw/bt/hci-csr.c | 14 +++++++------- hw/bt/hci.c | 26 +++++++++++++------------- hw/bt/hid.c | 2 +- hw/bt/l2cap.c | 22 +++++++++++----------- hw/bt/sdp.c | 6 +++--- hw/display/blizzard.c | 18 +++++++++--------- hw/display/omap_dss.c | 6 +++--- hw/display/pxa2xx_lcd.c | 14 +++++++------- hw/display/qxl-render.c | 6 +++--- hw/display/qxl.h | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/xenfb.c | 2 +- hw/dma/omap_dma.c | 26 +++++++++++++------------- hw/dma/pxa2xx_dma.c | 14 +++++++------- hw/gpio/max7310.c | 8 ++++---- hw/gpio/omap_gpio.c | 2 +- hw/i2c/omap_i2c.c | 6 +++--- hw/ide/ahci.c | 2 +- hw/ide/microdrive.c | 4 ++-- hw/input/lm832x.c | 6 +++--- hw/input/pxa2xx_keypad.c | 6 +++--- hw/input/tsc2005.c | 8 ++++---- hw/input/tsc210x.c | 4 ++-- hw/intc/omap_intc.c | 2 +- hw/isa/vt82c686.c | 2 +- hw/mips/gt64xxx_pci.c | 2 +- hw/misc/cbus.c | 12 ++++++------ hw/misc/omap_clk.c | 4 ++-- hw/misc/omap_gpmc.c | 6 +++--- hw/misc/omap_l4.c | 4 ++-- hw/misc/omap_sdrc.c | 2 +- hw/misc/omap_tap.c | 6 +++--- hw/misc/tmp105.c | 2 +- hw/pci-host/bonito.c | 2 +- hw/sd/pxa2xx_mmci.c | 6 +++--- hw/ssi/omap_spi.c | 6 +++--- hw/timer/omap_gptimer.c | 6 +++--- hw/timer/twl92230.c | 6 +++--- hw/usb/desc.c | 2 +- hw/usb/dev-bluetooth.c | 4 ++-- hw/usb/hcd-musb.c | 4 ++-- hw/usb/tusb6010.c | 14 +++++++------- hw/xenpv/xen_domainbuild.c | 16 ++++++++-------- hw/xenpv/xen_machine_pv.c | 2 +- include/hw/arm/omap.h | 10 +++++----- include/hw/arm/sharpsl.h | 2 +- memory_mapping.c | 2 +- migration/block.c | 4 ++-- ui/cursor.c | 6 +++--- ui/spice-display.c | 4 ++-- 64 files changed, 272 insertions(+), 272 deletions(-)
hw/arm/nseries.c +1 -1
@@ -463,7 +463,7 @@ static uint32_t mipid_txrx(void *opaque, uint32_t cmd, int len)uint8_t ret;if (len >9 ) { -hw_error ("%s: FIXME: bad SPI word width %i\n" , __FUNCTION__, len); +hw_error ("%s: FIXME: bad SPI word width %i\n" , __func__, len); }if (s->p >=ARRAY_SIZE (s->resp)) {
hw/arm/omap1.c +21 -21
162 lines not on this page · raw message
hw/arm/omap2.c +6 -6
@@ -1312,7 +1312,7 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s)if (mode[0 ] ==1 || mode[0 ] ==2 || mode[1 ] ==1 || mode[1 ] ==2 )fprintf (stderr,"%s: bad EN_54M_PLL or bad EN_96M_PLL\n" , - __FUNCTION__); + __func__); }static void omap_prcm_dpll_update (struct omap_prcm_s *s)
@@ -1331,7 +1331,7 @@ static void omap_prcm_dpll_update(struct omap_prcm_s *s) s->dpll_lock =0 ;switch (mode) {case 0 : -fprintf (stderr,"%s: bad EN_DPLL\n" , __FUNCTION__); +fprintf (stderr,"%s: bad EN_DPLL\n" , __func__);break ;case 1 :/* Low-power bypass mode (Default) */ case 2 :/* Fast-relock bypass mode */
@@ -1358,7 +1358,7 @@ static void omap_prcm_dpll_update(struct omap_prcm_s *s)omap_clk_reparent (core, dpll_x2);break ;case 3 : -fprintf (stderr,"%s: bad CORE_CLK_SRC\n" , __FUNCTION__); +fprintf (stderr,"%s: bad CORE_CLK_SRC\n" , __func__);break ; } }
@@ -1628,7 +1628,7 @@ static void omap_prcm_write(void *opaque, hwaddr addr,case 0x500 :/* CM_CLKEN_PLL */ if (value &0xffffff30 )fprintf (stderr,"%s: write 0s in CM_CLKEN_PLL for " -"future compatibility\n" , __FUNCTION__); +"future compatibility\n" , __func__);if ((s->clken[9 ] ^ value) &0xcc ) { s->clken[9 ] &= ~0xcc ; s->clken[9 ] |= value &0xcc ;
@@ -1647,7 +1647,7 @@ static void omap_prcm_write(void *opaque, hwaddr addr,case 0x540 :/* CM_CLKSEL1_PLL */ if (value &0xfc4000d7 )fprintf (stderr,"%s: write 0s in CM_CLKSEL1_PLL for " -"future compatibility\n" , __FUNCTION__); +"future compatibility\n" , __func__);if ((s->clksel[5 ] ^ value) &0x003fff00 ) { s->clksel[5 ] = value &0x03bfff28 ;omap_prcm_dpll_update (s);
@@ -1659,7 +1659,7 @@ static void omap_prcm_write(void *opaque, hwaddr addr,case 0x544 :/* CM_CLKSEL2_PLL */ if (value & ~3 )fprintf (stderr,"%s: write 0s in CM_CLKSEL2_PLL[31:2] for " -"future compatibility\n" , __FUNCTION__); +"future compatibility\n" , __func__);if (s->clksel[6 ] != (value &3 )) { s->clksel[6 ] = value &3 ;omap_prcm_dpll_update (s);
hw/arm/palm.c +7 -7
@@ -44,7 +44,7 @@ static void static_write(void *opaque, hwaddr offset, uint64_t value, {#ifdef SPY printf ("%s: value %08lx written at " PA_FMT "\n" , - __FUNCTION__, value, offset); + __func__, value, offset);#endif }
@@ -127,11 +127,11 @@ static void palmte_onoff_gpios(void *opaque, int line, int level)switch (line) {case 0 :printf ("%s: current to MMC/SD card %sabled.\n" , - __FUNCTION__, level ?"dis" :"en" ); + __func__, level ?"dis" :"en" );break ;case 1 :printf ("%s: internal speaker amplifier %s.\n" , - __FUNCTION__, level ?"down" :"on" ); + __func__, level ?"down" :"on" );break ;/* These LCD & Audio output signals have not been identified yet. */
@@ -139,12 +139,12 @@ static void palmte_onoff_gpios(void *opaque, int line, int level)case 3 :case 4 :printf ("%s: LCD GPIO%i %s.\n" , - __FUNCTION__, line -1 , level ?"high" :"low" ); + __func__, line -1 , level ?"high" :"low" );break ;case 5 :case 6 :printf ("%s: Audio GPIO%i %s.\n" , - __FUNCTION__, line -4 , level ?"high" :"low" ); + __func__, line -4 , level ?"high" :"low" );break ; } }
@@ -234,7 +234,7 @@ static void palmte_init(MachineState *machine) rom_size =get_image_size (option_rom[0 ].name);if (rom_size > flash_size) {fprintf (stderr,"%s: ROM image too big (%x > %x)\n" , - __FUNCTION__, rom_size, flash_size); + __func__, rom_size, flash_size); rom_size =0 ; }if (rom_size >0 ) {
@@ -244,7 +244,7 @@ static void palmte_init(MachineState *machine) }if (rom_size <0 ) {fprintf (stderr,"%s: error loading '%s'\n" , - __FUNCTION__, option_rom[0 ].name); + __func__, option_rom[0 ].name); } }
hw/arm/pxa2xx.c +23 -23
179 lines not on this page · raw message
hw/arm/pxa2xx_gpio.c +3 -3
@@ -107,7 +107,7 @@ static void pxa2xx_gpio_set(void *opaque, int line, int level)uint32_t mask;if (line >= s->lines) { -printf ("%s: No GPIO pin %i\n" , __FUNCTION__, line); +printf ("%s: No GPIO pin %i\n" , __func__, line);return ; }
@@ -195,7 +195,7 @@ static uint64_t pxa2xx_gpio_read(void *opaque, hwaddr offset,return s->status[bank];default : -hw_error ("%s: Bad offset " REG_FMT "\n" , __FUNCTION__, offset); +hw_error ("%s: Bad offset " REG_FMT "\n" , __func__, offset); }return 0 ;
@@ -248,7 +248,7 @@ static void pxa2xx_gpio_write(void *opaque, hwaddr offset,break ;default : -hw_error ("%s: Bad offset " REG_FMT "\n" , __FUNCTION__, offset); +hw_error ("%s: Bad offset " REG_FMT "\n" , __func__, offset); } }
hw/arm/pxa2xx_pic.c +2 -2
@@ -165,7 +165,7 @@ static uint64_t pxa2xx_pic_mem_read(void *opaque, hwaddr offset,case ICHP :/* Highest Priority register */ return pxa2xx_pic_highest (s);default : -printf ("%s: Bad register offset " REG_FMT "\n" , __FUNCTION__, offset); +printf ("%s: Bad register offset " REG_FMT "\n" , __func__, offset);return 0 ; } }
@@ -198,7 +198,7 @@ static void pxa2xx_pic_mem_write(void *opaque, hwaddr offset, s->priority[32 + ((offset -IPR32 ) >>2 )] = value &0x8000003f ;break ;default : -printf ("%s: Bad register offset " REG_FMT "\n" , __FUNCTION__, offset); +printf ("%s: Bad register offset " REG_FMT "\n" , __func__, offset);return ; }pxa2xx_pic_update (opaque);
hw/arm/tosa.c +5 -5
@@ -159,7 +159,7 @@ static int tosa_dac_send(I2CSlave *i2c, uint8_t data) s->buf[s->len] = data;if (s->len ++ >2 ) {#ifdef VERBOSE -fprintf (stderr,"%s: message too long (%i bytes)\n" , __FUNCTION__, s->len); +fprintf (stderr,"%s: message too long (%i bytes)\n" , __func__, s->len);#endif return 1 ; }
@@ -181,14 +181,14 @@ static int tosa_dac_event(I2CSlave *i2c, enum i2c_event event)case I2C_START_SEND :break ;case I2C_START_RECV : -printf ("%s: recv not supported!!!\n" , __FUNCTION__); +printf ("%s: recv not supported!!!\n" , __func__);break ;case I2C_FINISH :#ifdef VERBOSE if (s->len <2 ) -printf ("%s: message too short (%i bytes)\n" , __FUNCTION__, s->len); +printf ("%s: message too short (%i bytes)\n" , __func__, s->len);if (s->len >2 ) -printf ("%s: message too long\n" , __FUNCTION__); +printf ("%s: message too long\n" , __func__);#endif break ;default :
@@ -200,7 +200,7 @@ static int tosa_dac_event(I2CSlave *i2c, enum i2c_event event)static int tosa_dac_recv (I2CSlave *s) { -printf ("%s: recv not supported!!!\n" , __FUNCTION__); +printf ("%s: recv not supported!!!\n" , __func__);return -1 ; }
hw/audio/hda-codec.c +5 -5
@@ -316,7 +316,7 @@ static void hda_audio_command(HDACodecDevice *hda, uint32_t nid, uint32_t data) goto fail; }dprint (a,2 ,"%s: nid %d (%s), verb 0x%x, payload 0x%x\n" , - __FUNCTION__, nid, node->name, verb, payload); + __func__, nid, node->name, verb, payload);switch (verb) {/* all nodes */
@@ -449,7 +449,7 @@ static void hda_audio_command(HDACodecDevice *hda, uint32_t nid, uint32_t data) fail:dprint (a,1 ,"%s: not handled: nid %d (%s), verb 0x%x, payload 0x%x\n" , - __FUNCTION__, nid, node ? node->name :"?" , verb, payload); + __func__, nid, node ? node->name :"?" , verb, payload);hda_codec_response (hda, true,0 ); }
@@ -484,7 +484,7 @@ static int hda_audio_init(HDACodecDevice *hda, const struct desc_codec *desc) a->desc = desc; a->name =object_get_typename (OBJECT (a)); -dprint (a,1 ,"%s: cad %d\n" , __FUNCTION__, a->hda.cad); +dprint (a,1 ,"%s: cad %d\n" , __func__, a->hda.cad);AUD_register_card ("hda" , &a->card);for (i =0 ; i < a->desc->nnodes; i++) {
@@ -526,7 +526,7 @@ static void hda_audio_exit(HDACodecDevice *hda)HDAAudioStream *st;int i; -dprint (a,1 ,"%s\n" , __FUNCTION__); +dprint (a,1 ,"%s\n" , __func__);for (i =0 ; i <ARRAY_SIZE (a->st); i++) { st = a->st + i;if (st->node ==NULL ) {
@@ -547,7 +547,7 @@ static int hda_audio_post_load(void *opaque, int version)HDAAudioStream *st;int i; -dprint (a,1 ,"%s\n" , __FUNCTION__); +dprint (a,1 ,"%s\n" , __func__);if (version ==1 ) {/* assume running_compat[] is for output streams */ for (i =0 ; i <ARRAY_SIZE (a->running_compat); i++)
hw/audio/intel-hda.c +14 -14
@@ -265,7 +265,7 @@ static void intel_hda_update_irq(IntelHDAState *d) }else { level =0 ; } -dprint (d,2 ,"%s: level %d [%s]\n" , __FUNCTION__, +dprint (d,2 ,"%s: level %d [%s]\n" , __func__, level, msi ?"msi" :"intx" );if (msi) {if (level) {
@@ -285,7 +285,7 @@ static int intel_hda_send_command(IntelHDAState *d, uint32_t verb) cad = (verb >>28 ) &0x0f ;if (verb & (1 <<27 )) {/* indirect node addressing, not specified in HDA 1.0 */ -dprint (d,1 ,"%s: indirect node addressing (guest bug?)\n" , __FUNCTION__); +dprint (d,1 ,"%s: indirect node addressing (guest bug?)\n" , __func__);return -1 ; } nid = (verb >>20 ) &0x7f ;
@@ -293,7 +293,7 @@ static int intel_hda_send_command(IntelHDAState *d, uint32_t verb) codec =hda_codec_find (&d->codecs, cad);if (codec ==NULL ) { -dprint (d,1 ,"%s: addressed non-existing codec\n" , __FUNCTION__); +dprint (d,1 ,"%s: addressed non-existing codec\n" , __func__);return -1 ; } cdc =HDA_CODEC_DEVICE_GET_CLASS (codec);
@@ -307,22 +307,22 @@ static void intel_hda_corb_run(IntelHDAState *d)uint32_t rp, verb;if (d->ics &ICH6_IRS_BUSY ) { -dprint (d,2 ,"%s: [icw] verb 0x%08x\n" , __FUNCTION__, d->icw); +dprint (d,2 ,"%s: [icw] verb 0x%08x\n" , __func__, d->icw);intel_hda_send_command (d, d->icw);return ; }for (;;) {if (!(d->corb_ctl &ICH6_CORBCTL_RUN )) { -dprint (d,2 ,"%s: !run\n" , __FUNCTION__); +dprint (d,2 ,"%s: !run\n" , __func__);return ; }if ((d->corb_rp &0xff ) == d->corb_wp) { -dprint (d,2 ,"%s: corb ring empty\n" , __FUNCTION__); +dprint (d,2 ,"%s: corb ring empty\n" , __func__);return ; }if (d->rirb_count == d->rirb_cnt) { -dprint (d,2 ,"%s: rirb count reached\n" , __FUNCTION__); +dprint (d,2 ,"%s: rirb count reached\n" , __func__);return ; }
@@ -331,7 +331,7 @@ static void intel_hda_corb_run(IntelHDAState *d) verb =ldl_le_pci_dma (&d->pci, addr +4 *rp); d->corb_rp = rp; -dprint (d,2 ,"%s: [rp 0x%x] verb 0x%08x\n" , __FUNCTION__, rp, verb); +dprint (d,2 ,"%s: [rp 0x%x] verb 0x%08x\n" , __func__, rp, verb);intel_hda_send_command (d, verb); } }
@@ -345,7 +345,7 @@ static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t resif (d->ics &ICH6_IRS_BUSY ) {dprint (d,2 ,"%s: [irr] response 0x%x, cad 0x%x\n" , - __FUNCTION__, response, dev->cad); + __func__, response, dev->cad); d->irr = response; d->ics &= ~(ICH6_IRS_BUSY |0xf0 ); d->ics |= (ICH6_IRS_VALID | (dev->cad <<4 ));
@@ -353,7 +353,7 @@ static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t res }if (!(d->rirb_ctl &ICH6_RBCTL_DMA_EN )) { -dprint (d,1 ,"%s: rirb dma disabled, drop codec response\n" , __FUNCTION__); +dprint (d,1 ,"%s: rirb dma disabled, drop codec response\n" , __func__);return ; }
@@ -365,17 +365,17 @@ static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t res d->rirb_wp = wp;dprint (d,2 ,"%s: [wp 0x%x] response 0x%x, extra 0x%x\n" , - __FUNCTION__, wp, response, ex); + __func__, wp, response, ex); d->rirb_count++;if (d->rirb_count == d->rirb_cnt) { -dprint (d,2 ,"%s: rirb count reached (%d)\n" , __FUNCTION__, d->rirb_count); +dprint (d,2 ,"%s: rirb count reached (%d)\n" , __func__, d->rirb_count);if (d->rirb_ctl &ICH6_RBCTL_IRQ_EN ) { d->rirb_sts |=ICH6_RBSTS_IRQ ;intel_hda_update_irq (d); } }else if ((d->corb_rp &0xff ) == d->corb_wp) { -dprint (d,2 ,"%s: corb ring empty (%d/%d)\n" , __FUNCTION__, +dprint (d,2 ,"%s: corb ring empty (%d/%d)\n" , __func__, d->rirb_count, d->rirb_cnt);if (d->rirb_ctl &ICH6_RBCTL_IRQ_EN ) { d->rirb_sts |=ICH6_RBSTS_IRQ ;
@@ -1144,7 +1144,7 @@ static int intel_hda_post_load(void *opaque, int version)IntelHDAState * d = opaque;int i; -dprint (d,1 ,"%s\n" , __FUNCTION__); +dprint (d,1 ,"%s\n" , __func__);for (i =0 ; i <ARRAY_SIZE (d->st); i++) {if (d->st[i].ctl &0x02 ) {intel_hda_parse_bdl (d, &d->st[i]);
hw/audio/wm8750.c +2 -2
@@ -315,7 +315,7 @@ static int wm8750_event(I2CSlave *i2c, enum i2c_event event)#ifdef VERBOSE if (s->i2c_len <2 )printf ("%s: message too short (%i bytes)\n" , - __FUNCTION__, s->i2c_len); + __func__, s->i2c_len);#endif break ;default :
@@ -555,7 +555,7 @@ static int wm8750_tx(I2CSlave *i2c, uint8_t data)#ifdef VERBOSE default : -printf ("%s: unknown register %02x\n" , __FUNCTION__, cmd); +printf ("%s: unknown register %02x\n" , __func__, cmd);#endif }
hw/block/nand.c +2 -2
@@ -321,7 +321,7 @@ static void nand_command(NANDFlashState *s)break ;default : -printf ("%s: Unknown NAND command 0x%02x\n" , __FUNCTION__, s->cmd); +printf ("%s: Unknown NAND command 0x%02x\n" , __func__, s->cmd); } }
@@ -640,7 +640,7 @@ DeviceState *nand_init(BlockBackend *blk, int manf_id, int chip_id)DeviceState *dev;if (nand_flash_ids[chip_id].size ==0 ) { -hw_error ("%s: Unsupported NAND chip ID.\n" , __FUNCTION__); +hw_error ("%s: Unsupported NAND chip ID.\n" , __func__); } dev =DEVICE (object_new (TYPE_NAND ));qdev_prop_set_uint8 (dev,"manufacturer_id" , manf_id);
hw/block/onenand.c +4 -4
@@ -659,12 +659,12 @@ static uint64_t onenand_read(void *opaque, hwaddr addr,case 0xff02 :/* ECC Result of spare area data */ case 0xff03 :/* ECC Result of main area data */ case 0xff04 :/* ECC Result of spare area data */ -hw_error ("%s: imeplement ECC\n" , __FUNCTION__); +hw_error ("%s: imeplement ECC\n" , __func__);return 0x0000 ; }fprintf (stderr,"%s: unknown OneNAND register %x\n" , - __FUNCTION__, offset); + __func__, offset);return 0 ; }
@@ -709,7 +709,7 @@ static void onenand_write(void *opaque, hwaddr addr,default :fprintf (stderr,"%s: unknown OneNAND boot command %" PRIx64"\n" , - __FUNCTION__, value); + __func__, value); }break ;
@@ -760,7 +760,7 @@ static void onenand_write(void *opaque, hwaddr addr,default :fprintf (stderr,"%s: unknown OneNAND register %x\n" , - __FUNCTION__, offset); + __func__, offset); } }
hw/bt/core.c +5 -5
@@ -32,23 +32,23 @@ static void bt_dummy_lmp_connection_complete(struct bt_link_s *link) {if (link->slave->reject_reason)fprintf (stderr,"%s: stray LMP_not_accepted received, fixme\n" , - __FUNCTION__); + __func__);else fprintf (stderr,"%s: stray LMP_accepted received, fixme\n" , - __FUNCTION__); + __func__);exit (-1 ); }static void bt_dummy_lmp_disconnect_master (struct bt_link_s *link) { -fprintf (stderr,"%s: stray LMP_detach received, fixme\n" , __FUNCTION__); +fprintf (stderr,"%s: stray LMP_detach received, fixme\n" , __func__);exit (-1 ); }static void bt_dummy_lmp_acl_resp (struct bt_link_s *link,const uint8_t *data,int start,int len) { -fprintf (stderr,"%s: stray ACL response PDU, fixme\n" , __FUNCTION__); +fprintf (stderr,"%s: stray ACL response PDU, fixme\n" , __func__);exit (-1 ); }
@@ -113,7 +113,7 @@ void bt_device_done(struct bt_device_s *dev)while (*p && *p != dev) p = &(*p)->next;if (*p != dev) { -fprintf (stderr,"%s: bad bt device \"%s\"\n" , __FUNCTION__, +fprintf (stderr,"%s: bad bt device \"%s\"\n" , __func__, dev->lmp_name ?:"(null)" );exit (-1 ); }
hw/bt/hci-csr.c +7 -7
@@ -111,14 +111,14 @@ static uint8_t *csrhci_out_packet(struct csrhci_s *s, int len)if (off <FIFO_LEN ) {if (off + len >FIFO_LEN && (s->out_size = off + len) >FIFO_LEN *2 ) { -fprintf (stderr,"%s: can't alloc %i bytes\n" , __FUNCTION__, len); +fprintf (stderr,"%s: can't alloc %i bytes\n" , __func__, len);exit (-1 ); }return s->outfifo + off; }if (s->out_len > s->out_size) { -fprintf (stderr,"%s: can't alloc %i bytes\n" , __FUNCTION__, len); +fprintf (stderr,"%s: can't alloc %i bytes\n" , __func__, len);exit (-1 ); }
@@ -169,7 +169,7 @@ static void csrhci_in_packet_vendor(struct csrhci_s *s, int ocf, s->hci->bdaddr_set (s->hci, s->bd_addr.b);fprintf (stderr,"%s: bd_address loaded from firmware: " -"%02x:%02x:%02x:%02x:%02x:%02x\n" , __FUNCTION__, +"%02x:%02x:%02x:%02x:%02x:%02x\n" , __func__, s->bd_addr.b[0 ], s->bd_addr.b[1 ], s->bd_addr.b[2 ], s->bd_addr.b[3 ], s->bd_addr.b[4 ], s->bd_addr.b[5 ]); }
@@ -181,7 +181,7 @@ static void csrhci_in_packet_vendor(struct csrhci_s *s, int ocf,break ;default : -fprintf (stderr,"%s: got a bad CMD packet\n" , __FUNCTION__); +fprintf (stderr,"%s: got a bad CMD packet\n" , __func__);return ; }
@@ -226,7 +226,7 @@ static void csrhci_in_packet(struct csrhci_s *s, uint8_t *pkt)case H4_NEG_PKT :if (s->in_hdr !=sizeof (csrhci_neg_packet) ||memcmp (pkt -1 , csrhci_neg_packet, s->in_hdr)) { -fprintf (stderr,"%s: got a bad NEG packet\n" , __FUNCTION__); +fprintf (stderr,"%s: got a bad NEG packet\n" , __func__);return ; } pkt +=2 ;
@@ -241,7 +241,7 @@ static void csrhci_in_packet(struct csrhci_s *s, uint8_t *pkt)case H4_ALIVE_PKT :if (s->in_hdr !=4 || pkt[1 ] !=0x55 || pkt[2 ] !=0x00 ) { -fprintf (stderr,"%s: got a bad ALIVE packet\n" , __FUNCTION__); +fprintf (stderr,"%s: got a bad ALIVE packet\n" , __func__);return ; }
@@ -254,7 +254,7 @@ static void csrhci_in_packet(struct csrhci_s *s, uint8_t *pkt)default : bad_pkt:/* TODO: error out */ -fprintf (stderr,"%s: got a bad packet\n" , __FUNCTION__); +fprintf (stderr,"%s: got a bad packet\n" , __func__);break ; }
hw/bt/hci.c +13 -13
@@ -458,7 +458,7 @@ static inline uint8_t *bt_hci_event_start(struct bt_hci_s *hci,if (len >255 ) {fprintf (stderr,"%s: HCI event params too long (%ib)\n" , - __FUNCTION__, len); + __func__, len);exit (-1 ); }
@@ -589,7 +589,7 @@ static void bt_hci_inquiry_result(struct bt_hci_s *hci,bt_hci_inquiry_result_with_rssi (hci, slave);return ;default : -fprintf (stderr,"%s: bad inquiry mode %02x\n" , __FUNCTION__, +fprintf (stderr,"%s: bad inquiry mode %02x\n" , __func__, hci->lm.inquiry_mode);exit (-1 ); }
@@ -1528,7 +1528,7 @@ static void bt_submit_hci(struct HCIInfo *info,"the Inquiry command has been issued, a Command " "Status event has been received for the Inquiry " "command, and before the Inquiry Complete event " - "occurs", __FUNCTION__); + "occurs", __func__);bt_hci_event_complete_status (hci,HCI_COMMAND_DISALLOWED );break ; }
@@ -1567,7 +1567,7 @@ static void bt_submit_hci(struct HCIInfo *info,"the Inquiry command has been issued, a Command " "Status event has been received for the Inquiry " "command, and before the Inquiry Complete event " - "occurs", __FUNCTION__); + "occurs", __func__);bt_hci_event_complete_status (hci,HCI_COMMAND_DISALLOWED );break ; }
@@ -1972,7 +1972,7 @@ static void bt_submit_hci(struct HCIInfo *info, short_hci:fprintf (stderr,"%s: HCI packet too short (%iB)\n" , - __FUNCTION__, length); + __func__, length);bt_hci_event_status (hci,HCI_INVALID_PARAMETERS );break ; }
@@ -1992,7 +1992,7 @@ static inline void bt_hci_lmp_acl_data(struct bt_hci_s *hci, uint16_t handle,if (len +HCI_ACL_HDR_SIZE >sizeof (hci->acl_buf)) {fprintf (stderr,"%s: can't take ACL packets %i bytes long\n" , - __FUNCTION__, len); + __func__, len);return ; }memcpy (hci->acl_buf +HCI_ACL_HDR_SIZE , data, len);
@@ -2030,7 +2030,7 @@ static void bt_submit_acl(struct HCIInfo *info,if (length <HCI_ACL_HDR_SIZE ) {fprintf (stderr,"%s: ACL packet too short (%iB)\n" , - __FUNCTION__, length); + __func__, length);return ; }
@@ -2042,7 +2042,7 @@ static void bt_submit_acl(struct HCIInfo *info,if (bt_hci_handle_bad (hci, handle)) {fprintf (stderr,"%s: invalid ACL handle %03x\n" , - __FUNCTION__, handle); + __func__, handle);/* TODO: signal an error */ return ; }
@@ -2050,7 +2050,7 @@ static void bt_submit_acl(struct HCIInfo *info,if (datalen > length) {fprintf (stderr,"%s: ACL packet too short (%iB < %iB)\n" , - __FUNCTION__, length, datalen); + __func__, length, datalen);return ; }
@@ -2061,7 +2061,7 @@ static void bt_submit_acl(struct HCIInfo *info, hci->asb_handle = handle; else if (handle != hci->asb_handle) {fprintf (stderr,"%s: Bad handle %03x in Active Slave Broadcast\n" , - __FUNCTION__, handle); + __func__, handle);/* TODO: signal an error */ return ; }
@@ -2074,7 +2074,7 @@ static void bt_submit_acl(struct HCIInfo *info, hci->psb_handle = handle; else if (handle != hci->psb_handle) {fprintf (stderr,"%s: Bad handle %03x in Parked Slave Broadcast\n" , - __FUNCTION__, handle); + __func__, handle);/* TODO: signal an error */ return ; }
@@ -2106,13 +2106,13 @@ static void bt_submit_sco(struct HCIInfo *info,if (bt_hci_handle_bad (hci, handle)) {fprintf (stderr,"%s: invalid SCO handle %03x\n" , - __FUNCTION__, handle); + __func__, handle);return ; }if (datalen > length) {fprintf (stderr,"%s: SCO packet too short (%iB < %iB)\n" , - __FUNCTION__, length, datalen); + __func__, length, datalen);return ; }
hw/bt/hid.c +1 -1
@@ -420,7 +420,7 @@ static void bt_hid_interrupt_sdu(void *opaque, const uint8_t *data, int len)return ; bad:fprintf (stderr,"%s: bad transaction on Interrupt channel.\n" , - __FUNCTION__); + __func__); }/* "Virtual cable" plug/unplug event. */
hw/bt/l2cap.c +11 -11
@@ -468,7 +468,7 @@ static void l2cap_channel_close(struct l2cap_instance_s *l2cap,if (likely (ch)) {if (ch->remote_cid != source_cid) {fprintf (stderr,"%s: Ignoring a Disconnection Request with the " -"invalid SCID %04x.\n" , __FUNCTION__, source_cid); +"invalid SCID %04x.\n" , __func__, source_cid);return ; }
@@ -791,7 +791,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id,/* TODO: do the IDs really have to be in sequence? */ if (!id || (id != l2cap->last_id && id != l2cap->next_id)) {fprintf (stderr,"%s: out of sequence command packet ignored.\n" , - __FUNCTION__); + __func__);return ; }#else
@@ -814,7 +814,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id,/* We never issue commands other than Command Reject currently. */ fprintf (stderr,"%s: stray Command Reject (%02x, %04x) " -"packet, ignoring.\n" , __FUNCTION__, id, +"packet, ignoring.\n" , __func__, id,le16_to_cpu (((l2cap_cmd_rej *) params)->reason));break ;
@@ -837,7 +837,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id,/* We never issue Connection Requests currently. TODO */ fprintf (stderr,"%s: unexpected Connection Response (%02x) " -"packet, ignoring.\n" , __FUNCTION__, id); +"packet, ignoring.\n" , __func__, id);break ;case L2CAP_CONF_REQ :
@@ -866,7 +866,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id, ((l2cap_conf_rsp *) params)->data, len - L2CAP_CONF_RSP_SIZE(0)))fprintf (stderr,"%s: unexpected Configure Response (%02x) " -"packet, ignoring.\n" , __FUNCTION__, id); +"packet, ignoring.\n" , __func__, id);break ;case L2CAP_DISCONN_REQ :
@@ -888,7 +888,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id,/* We never issue Disconnection Requests currently. TODO */ fprintf (stderr,"%s: unexpected Disconnection Response (%02x) " -"packet, ignoring.\n" , __FUNCTION__, id); +"packet, ignoring.\n" , __func__, id);break ;case L2CAP_ECHO_REQ :
@@ -898,7 +898,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id,case L2CAP_ECHO_RSP :/* We never issue Echo Requests currently. TODO */ fprintf (stderr,"%s: unexpected Echo Response (%02x) " -"packet, ignoring.\n" , __FUNCTION__, id); +"packet, ignoring.\n" , __func__, id);break ;case L2CAP_INFO_REQ :
@@ -918,7 +918,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id,/* We never issue Information Requests currently. TODO */ fprintf (stderr,"%s: unexpected Information Response (%02x) " -"packet, ignoring.\n" , __FUNCTION__, id); +"packet, ignoring.\n" , __func__, id);break ;default :
@@ -1067,7 +1067,7 @@ static void l2cap_frame_in(struct l2cap_instance_s *l2cap,if (unlikely (cid >=L2CAP_CID_MAX || !l2cap->cid[cid])) {fprintf (stderr,"%s: frame addressed to a non-existent L2CAP " -"channel %04x received.\n" , __FUNCTION__, cid); +"channel %04x received.\n" , __func__, cid);return ; }
@@ -1129,7 +1129,7 @@ static uint8_t *l2cap_bframe_out(struct bt_l2cap_conn_params_s *parm, int len)if (len > chan->params.remote_mtu) {fprintf (stderr,"%s: B-Frame for CID %04x longer than %i octets.\n" , - __FUNCTION__, + __func__, chan->remote_cid, chan->params.remote_mtu);exit (-1 ); }
@@ -1354,7 +1354,7 @@ void bt_l2cap_psm_register(struct bt_l2cap_device_s *dev, int psm, int min_mtu,if (new_psm) {fprintf (stderr,"%s: PSM %04x already registered for device `%s'.\n" , - __FUNCTION__, psm, dev->device.lmp_name); + __func__, psm, dev->device.lmp_name);exit (-1 ); }
hw/bt/sdp.c +3 -3
@@ -506,7 +506,7 @@ static void bt_l2cap_sdp_sdu_in(void *opaque, const uint8_t *data, int len)int rsp_len =0 ;if (len <5 ) { -fprintf (stderr,"%s: short SDP PDU (%iB).\n" , __FUNCTION__, len); +fprintf (stderr,"%s: short SDP PDU (%iB).\n" , __func__, len);return ; }
@@ -518,7 +518,7 @@ static void bt_l2cap_sdp_sdu_in(void *opaque, const uint8_t *data, int len)if (len != plen) {fprintf (stderr,"%s: wrong SDP PDU length (%iB != %iB).\n" , - __FUNCTION__, plen, len); + __func__, plen, len); err =SDP_INVALID_PDU_SIZE ; goto respond; }
@@ -545,7 +545,7 @@ static void bt_l2cap_sdp_sdu_in(void *opaque, const uint8_t *data, int len)case SDP_SVC_SEARCH_ATTR_RSP :default :fprintf (stderr,"%s: unexpected SDP PDU ID %02x.\n" , - __FUNCTION__, pdu_id); + __func__, pdu_id); err =SDP_INVALID_SYNTAX ;break ; }
hw/display/blizzard.c +9 -9
@@ -474,7 +474,7 @@ static uint16_t blizzard_reg_read(void *opaque, uint8_t reg)return s->gpio_pdown;default : -fprintf (stderr,"%s: unknown register %02x\n" , __FUNCTION__, reg); +fprintf (stderr,"%s: unknown register %02x\n" , __func__, reg);return 0 ; } }
@@ -502,7 +502,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->pll_mode = value &0x77 ;if ((value &3 ) ==0 || (value &3 ) ==3 )fprintf (stderr,"%s: wrong PLL Control bits (%i)\n" , - __FUNCTION__, value &3 ); + __func__, value &3 );break ;case 0x0e :/* Clock-Source Select */
@@ -541,7 +541,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value)case 0x28 :/* LCD Panel Configuration */ s->lcd_config = value &0xff ;if (value & (1 <<7 )) -fprintf (stderr,"%s: data swap not supported!\n" , __FUNCTION__); +fprintf (stderr,"%s: data swap not supported!\n" , __func__);break ;case 0x2a :/* LCD Horizontal Display Width */
@@ -586,7 +586,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->hssi_config[1 ] = value;if (((value >>4 ) &3 ) ==3 )fprintf (stderr,"%s: Illegal active-data-links value\n" , - __FUNCTION__); + __func__);break ;case 0x42 :/* High-speed Serial Interface Tx Mode */ s->hssi_config[2 ] = value &0xbd ;
@@ -641,7 +641,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->enable = value &1 ; s->blank = (value >>1 ) &1 ;if (value & (1 <<4 )) -fprintf (stderr,"%s: Macrovision enable attempt!\n" , __FUNCTION__); +fprintf (stderr,"%s: Macrovision enable attempt!\n" , __func__);break ;case 0x6a :/* Special Effects */
@@ -718,7 +718,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->bpp = blizzard_iformat_bpp[s->iformat];if (!s->bpp)fprintf (stderr,"%s: Illegal or unsupported input format %x\n" , - __FUNCTION__, s->iformat); + __func__, s->iformat);break ;case 0x8e :/* Data Source Select */ s->source = value &7 ;
@@ -730,7 +730,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) !((s->ix[1] - s->ix[0]) & (s->iy[1] - s->iy[0]) & (s->ox[1] - s->ox[0]) & (s->oy[1] - s->oy[0]) & 1))fprintf (stderr,"%s: Illegal input/output window positions\n" , - __FUNCTION__); + __func__);blizzard_transfer_setup (s);break ;
@@ -784,7 +784,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->pm = value &0x83 ;if (value & s->mode &1 )fprintf (stderr,"%s: The display must be disabled before entering " -"Standby Mode\n" , __FUNCTION__); +"Standby Mode\n" , __func__);break ;case 0xe8 :/* Non-display Period Control / Status */ s->status = value &0x1b ;
@@ -815,7 +815,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value)break ;default : -fprintf (stderr,"%s: unknown register %02x\n" , __FUNCTION__, reg); +fprintf (stderr,"%s: unknown register %02x\n" , __func__, reg);break ; } }
hw/display/omap_dss.c +3 -3
@@ -526,7 +526,7 @@ static void omap_disc_write(void *opaque, hwaddr addr, s->dispc.l[0 ].attr = value &0x7ff ;if (value & (3 <<9 ))fprintf (stderr,"%s: Big-endian pixel format not supported\n" , - __FUNCTION__); + __func__); s->dispc.l[0 ].enable = value &1 ; s->dispc.l[0 ].bpp = (value >>1 ) &0xf ; s->dispc.invalidate =1 ;
@@ -617,7 +617,7 @@ static void omap_rfbi_transfer_start(struct omap_dss_s *s)if (s->rfbi.control & (1 <<1 )) {/* BYPASS */ /* TODO: in non-Bypass mode we probably need to just assert the * DRQ and wait for DMA to write the pixels. */ -fprintf (stderr,"%s: Bypass mode unimplemented\n" , __FUNCTION__); +fprintf (stderr,"%s: Bypass mode unimplemented\n" , __func__);return ; }
@@ -1086,6 +1086,6 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta,void omap_rfbi_attach (struct omap_dss_s *s,int cs,struct rfbi_chip_s *chip) {if (cs <0 || cs >1 ) -hw_error ("%s: wrong CS %i\n" , __FUNCTION__, cs); +hw_error ("%s: wrong CS %i\n" , __func__, cs); s->rfbi.chip[cs] = chip; }
hw/display/pxa2xx_lcd.c +7 -7
@@ -405,7 +405,7 @@ static uint64_t pxa2xx_lcdc_read(void *opaque, hwaddr offset,default : fail: -hw_error ("%s: Bad offset " REG_FMT "\n" , __FUNCTION__, offset); +hw_error ("%s: Bad offset " REG_FMT "\n" , __func__, offset); }return 0 ;
@@ -424,7 +424,7 @@ static void pxa2xx_lcdc_write(void *opaque, hwaddr offset, s->status[0 ] |=LCSR0_QD ;if (!(s->control[0 ] &LCCR0_LCDT ) && (value &LCCR0_LCDT )) -printf ("%s: internal frame buffer unsupported\n" , __FUNCTION__); +printf ("%s: internal frame buffer unsupported\n" , __func__);if ((s->control[3 ] &LCCR3_API ) && (value &LCCR0_ENB ) && !(value &LCCR0_LCDT ))
@@ -460,7 +460,7 @@ static void pxa2xx_lcdc_write(void *opaque, hwaddr offset,case OVL1C1 :if (!(s->ovl1c[0 ] &OVLC1_EN ) && (value &OVLC1_EN )) -printf ("%s: Overlay 1 not supported\n" , __FUNCTION__); +printf ("%s: Overlay 1 not supported\n" , __func__); s->ovl1c[0 ] = value &0x80ffffff ; s->dma_ch[1 ].up = (value &OVLC1_EN ) || (s->control[0 ] &LCCR0_SDS );
@@ -472,7 +472,7 @@ static void pxa2xx_lcdc_write(void *opaque, hwaddr offset,case OVL2C1 :if (!(s->ovl2c[0 ] &OVLC1_EN ) && (value &OVLC1_EN )) -printf ("%s: Overlay 2 not supported\n" , __FUNCTION__); +printf ("%s: Overlay 2 not supported\n" , __func__); s->ovl2c[0 ] = value &0x80ffffff ; s->dma_ch[2 ].up = !!(value &OVLC1_EN );
@@ -486,7 +486,7 @@ static void pxa2xx_lcdc_write(void *opaque, hwaddr offset,case CCR :if (!(s->ccr &CCR_CEN ) && (value &CCR_CEN )) -printf ("%s: Hardware cursor unimplemented\n" , __FUNCTION__); +printf ("%s: Hardware cursor unimplemented\n" , __func__); s->ccr = value &0x81ffffe7 ; s->dma_ch[5 ].up = !!(value &CCR_CEN );
@@ -560,7 +560,7 @@ static void pxa2xx_lcdc_write(void *opaque, hwaddr offset,default : fail: -hw_error ("%s: Bad offset " REG_FMT "\n" , __FUNCTION__, offset); +hw_error ("%s: Bad offset " REG_FMT "\n" , __func__, offset); } }
@@ -1050,7 +1050,7 @@ PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem, s->dest_width =4 ;break ;default : -fprintf (stderr,"%s: Bad color depth\n" , __FUNCTION__); +fprintf (stderr,"%s: Bad color depth\n" , __func__);exit (1 ); }
hw/display/qxl-render.c +3 -3
@@ -78,7 +78,7 @@ void qxl_render_resize(PCIQXLDevice *qxl) qxl->guest_primary.bits_pp =32 ;break ;default : -fprintf (stderr,"%s: unhandled format: %x\n" , __FUNCTION__, +fprintf (stderr,"%s: unhandled format: %x\n" , __func__, qxl->guest_primary.surface.format); qxl->guest_primary.bytes_pp =4 ; qxl->guest_primary.bits_pp =32 ;
@@ -248,7 +248,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,break ;default :fprintf (stderr,"%s: not implemented: type %d\n" , - __FUNCTION__, cursor->header.type); + __func__, cursor->header.type); goto fail; }return c;
@@ -275,7 +275,7 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext) }if (qxl->debug >1 && cmd->type !=QXL_CURSOR_MOVE ) { -fprintf (stderr,"%s" , __FUNCTION__); +fprintf (stderr,"%s" , __func__);qxl_log_cmd_cursor (qxl, cmd, ext->group_id);fprintf (stderr,"\n" ); }
hw/display/qxl.h +1 -1
@@ -132,7 +132,7 @@ typedef struct PCIQXLDevice {#define PCI_QXL (obj) OBJECT_CHECK(PCIQXLDevice, (obj), TYPE_PCI_QXL)#define PANIC_ON (x) if ((x)) { \ - printf("%s: PANIC %s failed\n", __FUNCTION__, #x); \ + printf("%s: PANIC %s failed\n", __func__, #x); \ abort(); \ }
hw/display/tc6393xb.c +1 -1
@@ -148,7 +148,7 @@ static void tc6393xb_gpio_set(void *opaque, int line, int level)// TC6393xbState *s = opaque; if (line >TC6393XB_GPIOS ) { -printf ("%s: No GPIO pin %i\n" , __FUNCTION__, line); +printf ("%s: No GPIO pin %i\n" , __func__, line);return ; }
hw/display/xenfb.c +1 -1
@@ -662,7 +662,7 @@ static void xenfb_guest_copy(struct XenFB *xenfb, int x, int y, int w, int h) }if (oops)/* should not happen */ xen_pv_printf (&xenfb->c.xendev,0 ,"%s: oops: convert %d -> %d bpp?\n" , - __FUNCTION__, xenfb->depth, bpp); + __func__, xenfb->depth, bpp);dpy_gfx_update (xenfb->con, x, y, w, h); }
hw/dma/omap_dma.c +13 -13
@@ -161,7 +161,7 @@ static void omap_dma_channel_load(struct omap_dma_channel_s *ch) a->pck_element =0 ;if (unlikely (!ch->elements || !ch->frames)) { -printf ("%s: bad DMA request\n" , __FUNCTION__); +printf ("%s: bad DMA request\n" , __func__);return ; }
@@ -519,7 +519,7 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma)continue ;#endif printf ("%s: Bus time-out in DMA%i operation\n" , - __FUNCTION__, dma->num); + __func__, dma->num); } min_elems =INT_MAX ;
@@ -879,14 +879,14 @@ static int omap_dma_ch_reg_write(struct omap_dma_s *s, ch->pack[0 ] = (value &0x0040 ) >>6 ; ch->port[0 ] = (enum omap_dma_port ) ((value &0x003c ) >>2 );if (ch->port[0 ] >= __omap_dma_port_last) -printf ("%s: invalid DMA port %i\n" , __FUNCTION__, +printf ("%s: invalid DMA port %i\n" , __func__, ch->port[0 ]);if (ch->port[1 ] >= __omap_dma_port_last) -printf ("%s: invalid DMA port %i\n" , __FUNCTION__, +printf ("%s: invalid DMA port %i\n" , __func__, ch->port[1 ]); ch->data_type =1 << (value &3 );if ((value &3 ) ==3 ) { -printf ("%s: bad data_type for DMA channel\n" , __FUNCTION__); +printf ("%s: bad data_type for DMA channel\n" , __func__); ch->data_type >>=1 ; }break ;
@@ -1440,7 +1440,7 @@ static int omap_dma_sys_read(struct omap_dma_s *s, int offset,case 0x482 :/* DMA_PCh1_SR */ case 0x4c0 :/* DMA_PChD_SR_0 */ printf ("%s: Physical Channel Status Registers not implemented.\n" , - __FUNCTION__); + __func__); *ret =0xff ;break ;
@@ -1898,13 +1898,13 @@ static void omap_dma4_write(void *opaque, hwaddr addr,omap_dma_reset (s->dma); s->ocp = value &0x3321 ;if (((s->ocp >>12 ) &3 ) ==3 )/* MIDLEMODE */ -fprintf (stderr,"%s: invalid DMA power mode\n" , __FUNCTION__); +fprintf (stderr,"%s: invalid DMA power mode\n" , __func__);return ;case 0x78 :/* DMA4_GCR */ s->gcr = value &0x00ff00ff ;if ((value &0xff ) ==0x00 )/* MAX_CHANNEL_FIFO_DEPTH */ -fprintf (stderr,"%s: wrong FIFO depth in GCR\n" , __FUNCTION__); +fprintf (stderr,"%s: wrong FIFO depth in GCR\n" , __func__);return ; case 0x80 ... 0xfff:
@@ -1935,7 +1935,7 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->src_sync = (value >>24 ) &1 ;/* XXX For CamDMA must be 1 */ if (ch->buf_disable && !ch->src_sync)fprintf (stderr,"%s: Buffering disable is not allowed in " -"destination synchronised mode\n" , __FUNCTION__); +"destination synchronised mode\n" , __func__); ch->prefetch = (value >>23 ) &1 ; ch->bs = (value >>18 ) &1 ; ch->transparent_copy = (value >>17 ) &1 ;
@@ -1947,7 +1947,7 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->fs = (value &0x0020 ) >>5 ;if (ch->fs && ch->bs && ch->mode[0 ] && ch->mode[1 ])fprintf (stderr,"%s: For a packet transfer at least one port " -"must be constant-addressed\n" , __FUNCTION__); +"must be constant-addressed\n" , __func__); ch->sync = (value &0x001f ) | ((value >>14 ) &0x0060 );/* XXX must be 0x01 for CamDMA */
@@ -1978,7 +1978,7 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->endian_lock[1 ] =(value >>18 ) &1 ;if (ch->endian[0 ] != ch->endian[1 ])fprintf (stderr,"%s: DMA endianness conversion enable attempt\n" , - __FUNCTION__); + __func__); ch->write_mode = (value >>16 ) &3 ; ch->burst[1 ] = (value &0xc000 ) >>14 ; ch->pack[1 ] = (value &0x2000 ) >>13 ;
@@ -1988,10 +1988,10 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->translate[0 ] = (value &0x003c ) >>2 ;if (ch->translate[0 ] | ch->translate[1 ])fprintf (stderr,"%s: bad MReqAddressTranslate sideband signal\n" , - __FUNCTION__); + __func__); ch->data_type =1 << (value &3 );if ((value &3 ) ==3 ) { -printf ("%s: bad data_type for DMA channel\n" , __FUNCTION__); +printf ("%s: bad data_type for DMA channel\n" , __func__); ch->data_type >>=1 ; }break ;
hw/dma/pxa2xx_dma.c +7 -7
@@ -169,7 +169,7 @@ static inline void pxa2xx_dma_descriptor_fetch( s->chan[ch].dest &= ~3 ;if (s->chan[ch].cmd & (DCMD_CMPEN |DCMD_FLYBYS |DCMD_FLYBYT )) -printf ("%s: unsupported mode in channel %i\n" , __FUNCTION__, ch); +printf ("%s: unsupported mode in channel %i\n" , __func__, ch);if (s->chan[ch].cmd &DCMD_STARTIRQEN ) s->chan[ch].state |=DCSR_STARTINTR ;
@@ -264,7 +264,7 @@ static uint64_t pxa2xx_dma_read(void *opaque, hwaddr offset,unsigned int channel;if (size !=4 ) { -hw_error ("%s: Bad access width\n" , __FUNCTION__); +hw_error ("%s: Bad access width\n" , __func__);return 5 ; }
@@ -312,7 +312,7 @@ static uint64_t pxa2xx_dma_read(void *opaque, hwaddr offset, } } -hw_error ("%s: Bad offset 0x" TARGET_FMT_plx"\n" , __FUNCTION__, offset); +hw_error ("%s: Bad offset 0x" TARGET_FMT_plx"\n" , __func__, offset);return 7 ; }
@@ -323,7 +323,7 @@ static void pxa2xx_dma_write(void *opaque, hwaddr offset,unsigned int channel;if (size !=4 ) { -hw_error ("%s: Bad access width\n" , __FUNCTION__); +hw_error ("%s: Bad access width\n" , __func__);return ; }
@@ -337,7 +337,7 @@ static void pxa2xx_dma_write(void *opaque, hwaddr offset,if (value &DRCMR_MAPVLD )if ((value &DRCMR_CHLNUM ) > s->channels)hw_error ("%s: Bad DMA channel %i\n" , - __FUNCTION__, (unsigned )value &DRCMR_CHLNUM ); + __func__, (unsigned )value &DRCMR_CHLNUM ); s->req[channel] = value;break ;
@@ -416,7 +416,7 @@ static void pxa2xx_dma_write(void *opaque, hwaddr offset,break ; } fail: -hw_error ("%s: Bad offset " TARGET_FMT_plx"\n" , __FUNCTION__, offset); +hw_error ("%s: Bad offset " TARGET_FMT_plx"\n" , __func__, offset); } }
@@ -431,7 +431,7 @@ static void pxa2xx_dma_request(void *opaque, int req_num, int on)PXA2xxDMAState *s = opaque;int ch;if (req_num <0 || req_num >=PXA2XX_DMA_NUM_REQUESTS ) -hw_error ("%s: Bad DMA request %i\n" , __FUNCTION__, req_num); +hw_error ("%s: Bad DMA request %i\n" , __func__, req_num);if (!(s->req[req_num] &DRCMR_MAPVLD ))return ;
hw/gpio/max7310.c +4 -4
@@ -67,7 +67,7 @@ static int max7310_rx(I2CSlave *i2c)default :#ifdef VERBOSE -printf ("%s: unknown register %02x\n" , __FUNCTION__, s->command); +printf ("%s: unknown register %02x\n" , __func__, s->command);#endif break ; }
@@ -82,7 +82,7 @@ static int max7310_tx(I2CSlave *i2c, uint8_t data)if (s->len ++ >1 ) {#ifdef VERBOSE -printf ("%s: message too long (%i bytes)\n" , __FUNCTION__, s->len); +printf ("%s: message too long (%i bytes)\n" , __func__, s->len);#endif return 1 ; }
@@ -121,7 +121,7 @@ static int max7310_tx(I2CSlave *i2c, uint8_t data)break ;default :#ifdef VERBOSE -printf ("%s: unknown register %02x\n" , __FUNCTION__, s->command); +printf ("%s: unknown register %02x\n" , __func__, s->command);#endif return 1 ; }
@@ -141,7 +141,7 @@ static int max7310_event(I2CSlave *i2c, enum i2c_event event)case I2C_FINISH :#ifdef VERBOSE if (s->len ==1 ) -printf ("%s: message too short (%i bytes)\n" , __FUNCTION__, s->len); +printf ("%s: message too short (%i bytes)\n" , __func__, s->len);#endif break ;default :
hw/gpio/omap_gpio.c +1 -1
@@ -399,7 +399,7 @@ static void omap2_gpio_module_write(void *opaque, hwaddr addr,case 0x10 :/* GPIO_SYSCONFIG */ if (((value >>3 ) &3 ) ==3 ) -fprintf (stderr,"%s: bad IDLEMODE value\n" , __FUNCTION__); +fprintf (stderr,"%s: bad IDLEMODE value\n" , __func__);if (value &2 )omap2_gpio_module_reset (s); s->config[0 ] = value &0x1d ;
hw/i2c/omap_i2c.c +3 -3
@@ -341,12 +341,12 @@ static void omap_i2c_write(void *opaque, hwaddr addr, }if ((value & (1 <<15 )) && !(value & (1 <<10 ))) {/* MST */ fprintf (stderr,"%s: I^2C slave mode not supported\n" , - __FUNCTION__); + __func__);break ; }if ((value & (1 <<15 )) && value & (1 <<8 )) {/* XA */ fprintf (stderr,"%s: 10-bit addressing mode not supported\n" , - __FUNCTION__); + __func__);break ; }if ((value & (1 <<15 )) && value & (1 <<0 )) {/* STT */
@@ -393,7 +393,7 @@ static void omap_i2c_write(void *opaque, hwaddr addr,omap_i2c_interrupts_update (s); }if (value & (1 <<15 ))/* ST_EN */ -fprintf (stderr,"%s: System Test not supported\n" , __FUNCTION__); +fprintf (stderr,"%s: System Test not supported\n" , __func__);break ;default :
hw/ide/ahci.c +1 -1
@@ -1052,7 +1052,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis,g_assert (is_ncq (ncq_fis->command));if (ncq_tfs->used) {/* error - already in use */ -fprintf (stderr,"%s: tag %d already used\n" , __FUNCTION__, tag); +fprintf (stderr,"%s: tag %d already used\n" , __func__, tag);return ; }
hw/ide/microdrive.c +2 -2
@@ -155,7 +155,7 @@ static uint8_t md_attr_read(PCMCIACardState *card, uint32_t at)return 0x00 ;#ifdef VERBOSE default : -printf ("%s: Bad attribute space register %02x\n" , __FUNCTION__, at); +printf ("%s: Bad attribute space register %02x\n" , __func__, at);#endif }
@@ -192,7 +192,7 @@ static void md_attr_write(PCMCIACardState *card, uint32_t at, uint8_t value)case 0x06 :/* Socket and Copy Register */ break ;default : -printf ("%s: Bad attribute space register %02x\n" , __FUNCTION__, at); +printf ("%s: Bad attribute space register %02x\n" , __func__, at); } }
hw/input/lm832x.c +3 -3
@@ -239,7 +239,7 @@ static uint8_t lm_kbd_read(LM823KbdState *s, int reg, int byte)default :lm_kbd_error (s,ERR_CMDUNK ); -fprintf (stderr,"%s: unknown command %02x\n" , __FUNCTION__, reg); +fprintf (stderr,"%s: unknown command %02x\n" , __func__, reg);return 0x00 ; }
@@ -331,7 +331,7 @@ static void lm_kbd_write(LM823KbdState *s, int reg, int byte, uint8_t value)if ((value &3 ) && (value &3 ) !=3 ) {lm_kbd_error (s,ERR_BADPAR );fprintf (stderr,"%s: invalid clock setting in RCPWM\n" , - __FUNCTION__); + __func__); }/* TODO: Validate that the command is only issued once */ break ;
@@ -378,7 +378,7 @@ static void lm_kbd_write(LM823KbdState *s, int reg, int byte, uint8_t value)break ;default :lm_kbd_error (s,ERR_CMDUNK ); -fprintf (stderr,"%s: unknown command %02x\n" , __FUNCTION__, reg); +fprintf (stderr,"%s: unknown command %02x\n" , __func__, reg);break ; } }
hw/input/pxa2xx_keypad.c +3 -3
@@ -231,7 +231,7 @@ static uint64_t pxa2xx_keypad_read(void *opaque, hwaddr offset,return s->kpkdi;break ;default : -hw_error ("%s: Bad offset " REG_FMT "\n" , __FUNCTION__, offset); +hw_error ("%s: Bad offset " REG_FMT "\n" , __func__, offset); }return 0 ;
@@ -278,7 +278,7 @@ static void pxa2xx_keypad_write(void *opaque, hwaddr offset,break ;default : -hw_error ("%s: Bad offset " REG_FMT "\n" , __FUNCTION__, offset); +hw_error ("%s: Bad offset " REG_FMT "\n" , __func__, offset); } }
@@ -326,7 +326,7 @@ void pxa27x_register_keypad(PXA2xxKeyPadState *kp, const struct keymap *map, int size) {if (!map || size <0x80 ) { -fprintf (stderr,"%s - No PXA keypad map defined\n" , __FUNCTION__); +fprintf (stderr,"%s - No PXA keypad map defined\n" , __func__);exit (-1 ); }
hw/input/tsc2005.c +4 -4
@@ -201,7 +201,7 @@ static void tsc2005_write(TSC2005State *s, int reg, uint16_t data)if (s->enabled != !(data &0x4000 )) { s->enabled = !(data &0x4000 );fprintf (stderr,"%s: touchscreen sense %sabled\n" , - __FUNCTION__, s->enabled ?"en" :"dis" ); + __func__, s->enabled ?"en" :"dis" );if (s->busy && !s->enabled)timer_del (s->timer); s->busy = s->busy && s->enabled;
@@ -210,7 +210,7 @@ static void tsc2005_write(TSC2005State *s, int reg, uint16_t data) s->timing[0 ] = data &0x1fff ;if ((s->timing[0 ] >>11 ) ==3 )fprintf (stderr,"%s: illegal conversion clock setting\n" , - __FUNCTION__); + __func__);break ;case 0xd :/* CFR1 */ s->timing[1 ] = data &0xf07 ;
@@ -222,7 +222,7 @@ static void tsc2005_write(TSC2005State *s, int reg, uint16_t data)default :fprintf (stderr,"%s: write into read-only register %x\n" , - __FUNCTION__, reg); + __func__, reg); } }
@@ -338,7 +338,7 @@ static uint8_t tsc2005_txrx_word(void *opaque, uint8_t value)if (s->enabled != !(value &1 )) { s->enabled = !(value &1 );fprintf (stderr,"%s: touchscreen sense %sabled\n" , - __FUNCTION__, s->enabled ?"en" :"dis" ); + __func__, s->enabled ?"en" :"dis" );if (s->busy && !s->enabled)timer_del (s->timer); s->busy = s->busy && s->enabled;
hw/input/tsc210x.c +2 -2
@@ -287,7 +287,7 @@ static void tsc2102_audio_rate_update(TSC210xState *s) rate->fsref == ((s->audio_ctrl3 >> 13) & 1))/* REFFS */break ;if (!rate->rate) { -printf ("%s: unknown sampling rate configured\n" , __FUNCTION__); +printf ("%s: unknown sampling rate configured\n" , __func__);return ; }
@@ -913,7 +913,7 @@ uint32_t tsc210x_txrx(void *opaque, uint32_t value, int len)uint32_t ret =0 ;if (len !=16 ) -hw_error ("%s: FIXME: bad SPI word width %i\n" , __FUNCTION__, len); +hw_error ("%s: FIXME: bad SPI word width %i\n" , __func__, len);/* TODO: sequential reads etc - how do we make sure the host doesn't * unintentionally read out a conversion result from a register while
hw/intc/omap_intc.c +1 -1
@@ -540,7 +540,7 @@ static void omap2_inth_write(void *opaque, hwaddr addr,* for every register, see Chapter 3 and 4 for privileged mode. */ if (value &1 )fprintf (stderr,"%s: protection mode enable attempt\n" , - __FUNCTION__); + __func__);return ;case 0x50 :/* INTC_IDLE */
hw/isa/vt82c686.c +1 -1
@@ -29,7 +29,7 @@//#define DEBUG_VT82C686B #ifdef DEBUG_VT82C686B -#define DPRINTF (fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__) +#define DPRINTF (fmt, ...) fprintf(stderr, "%s: " fmt, __func__, ##__VA_ARGS__)#else #define DPRINTF (fmt, ...)#endif
hw/mips/gt64xxx_pci.c +1 -1
@@ -33,7 +33,7 @@//#define DEBUG #ifdef DEBUG -#define DPRINTF (fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__) +#define DPRINTF (fmt, ...) fprintf(stderr, "%s: " fmt, __func__, ##__VA_ARGS__)#else #define DPRINTF (fmt, ...)#endif
hw/misc/cbus.c +6 -6
@@ -62,7 +62,7 @@ static void cbus_io(CBusPriv *s) s->slave[s->addr]->io (s->slave[s->addr]->opaque, s->rw, s->reg, &s->val); else - hw_error("%s: bad slave address %i\n", __FUNCTION__, s->addr); + hw_error("%s: bad slave address %i\n", __func__, s->addr); }static void cbus_cycle (CBusPriv *s)
@@ -299,7 +299,7 @@ static inline uint16_t retu_read(CBusRetu *s, int reg)return 0x0000 ;default : -hw_error ("%s: bad register %02x\n" , __FUNCTION__, reg); +hw_error ("%s: bad register %02x\n" , __func__, reg); } }
@@ -372,7 +372,7 @@ static inline void retu_write(CBusRetu *s, int reg, uint16_t val)break ;default : -hw_error ("%s: bad register %02x\n" , __FUNCTION__, reg); +hw_error ("%s: bad register %02x\n" , __func__, reg); } }
@@ -538,7 +538,7 @@ static inline uint16_t tahvo_read(CBusTahvo *s, int reg)return 0x0000 ;default : -hw_error ("%s: bad register %02x\n" , __FUNCTION__, reg); +hw_error ("%s: bad register %02x\n" , __func__, reg); } }
@@ -567,7 +567,7 @@ static inline void tahvo_write(CBusTahvo *s, int reg, uint16_t val)if (s->backlight != (val &0x7f )) { s->backlight = val &0x7f ;printf ("%s: LCD backlight now at %i / 127\n" , - __FUNCTION__, s->backlight); + __func__, s->backlight); }break ;
@@ -588,7 +588,7 @@ static inline void tahvo_write(CBusTahvo *s, int reg, uint16_t val)break ;default : -hw_error ("%s: bad register %02x\n" , __FUNCTION__, reg); +hw_error ("%s: bad register %02x\n" , __func__, reg); } }
hw/misc/omap_clk.c +2 -2
@@ -1109,7 +1109,7 @@ struct clk *omap_findclk(struct omap_mpu_state_s *mpu, const char *name)for (i = mpu->clks; i->name; i ++)if (!strcmp (i->name, name) || (i->alias && !strcmp (i->alias, name)))return i; -hw_error ("%s: %s not found\n" , __FUNCTION__, name); +hw_error ("%s: %s not found\n" , __func__, name); }void omap_clk_get (struct clk *clk)
@@ -1120,7 +1120,7 @@ void omap_clk_get(struct clk *clk)void omap_clk_put (struct clk *clk) {if (!(clk->usecount --)) -hw_error ("%s: %s is not in use\n" , __FUNCTION__, clk->name); +hw_error ("%s: %s is not in use\n" , __func__, clk->name); }static void omap_clk_update (struct clk *clk)
hw/misc/omap_gpmc.c +3 -3
@@ -643,7 +643,7 @@ static void omap_gpmc_write(void *opaque, hwaddr addr,case 0x010 :/* GPMC_SYSCONFIG */ if ((value >>3 ) ==0x3 )fprintf (stderr,"%s: bad SDRAM idle mode %" PRIi64"\n" , - __FUNCTION__, value >>3 ); + __func__, value >>3 );if (value &2 )omap_gpmc_reset (s); s->sysconfig = value &0x19 ;
@@ -806,7 +806,7 @@ static void omap_gpmc_write(void *opaque, hwaddr addr,break ;case 0x230 :/* GPMC_TESTMODE_CTRL */ if (value &7 ) -fprintf (stderr,"%s: test mode enable attempt\n" , __FUNCTION__); +fprintf (stderr,"%s: test mode enable attempt\n" , __func__);break ;default :
@@ -864,7 +864,7 @@ void omap_gpmc_attach(struct omap_gpmc_s *s, int cs, MemoryRegion *iomem)assert (iomem);if (cs <0 || cs >=8 ) { -fprintf (stderr,"%s: bad chip-select %i\n" , __FUNCTION__, cs); +fprintf (stderr,"%s: bad chip-select %i\n" , __func__, cs);exit (-1 ); } f = &s->cs_file[cs];
hw/misc/omap_l4.c +2 -2
@@ -126,7 +126,7 @@ struct omap_target_agent_s *omap_l4ta_get(struct omap_l4_s *bus,break ; }if (!ta) { -fprintf (stderr,"%s: bad target agent (%i)\n" , __FUNCTION__, cs); +fprintf (stderr,"%s: bad target agent (%i)\n" , __func__, cs);exit (-1 ); }
@@ -151,7 +151,7 @@ hwaddr omap_l4_attach(struct omap_target_agent_s *ta,hwaddr base;if (region <0 || region >= ta->regions) { -fprintf (stderr,"%s: bad io region (%i)\n" , __FUNCTION__, region); +fprintf (stderr,"%s: bad io region (%i)\n" , __func__, region);exit (-1 ); }
hw/misc/omap_sdrc.c +1 -1
@@ -109,7 +109,7 @@ static void omap_sdrc_write(void *opaque, hwaddr addr,case 0x10 :/* SDRC_SYSCONFIG */ if ((value >>3 ) !=0x2 )fprintf (stderr,"%s: bad SDRAM idle mode %i\n" , - __FUNCTION__, (unsigned )value >>3 ); + __func__, (unsigned )value >>3 );if (value &2 )omap_sdrc_reset (s); s->config = value &0x18 ;
hw/misc/omap_tap.c +3 -3
@@ -44,7 +44,7 @@ static uint64_t omap_tap_read(void *opaque, hwaddr addr,case omap3430:return 0x1b7ae02f ;/* ES 2 */ default : -hw_error ("%s: Bad mpu model\n" , __FUNCTION__); +hw_error ("%s: Bad mpu model\n" , __func__); }case 0x208 :/* PRODUCTION_ID_reg for OMAP2 */
@@ -61,7 +61,7 @@ static uint64_t omap_tap_read(void *opaque, hwaddr addr,case omap3430:return 0x000000f0 ;default : -hw_error ("%s: Bad mpu model\n" , __FUNCTION__); +hw_error ("%s: Bad mpu model\n" , __func__); }case 0x20c :
@@ -75,7 +75,7 @@ static uint64_t omap_tap_read(void *opaque, hwaddr addr,case omap3430:return 0xcafeb7ae ;/* ES 2 */ default : -hw_error ("%s: Bad mpu model\n" , __FUNCTION__); +hw_error ("%s: Bad mpu model\n" , __func__); }case 0x218 :/* DIE_ID_reg */
hw/misc/tmp105.c +1 -1
@@ -131,7 +131,7 @@ static void tmp105_write(TMP105State *s)case TMP105_REG_CONFIG :if (s->buf[0 ] & ~s->config & (1 <<0 ))/* SD */ -printf ("%s: TMP105 shutdown\n" , __FUNCTION__); +printf ("%s: TMP105 shutdown\n" , __func__); s->config = s->buf[0 ]; s->faults = tmp105_faultq[(s->config >>3 ) &3 ];/* F */ tmp105_alarm_update (s);
hw/pci-host/bonito.c +1 -1
@@ -50,7 +50,7 @@//#define DEBUG_BONITO #ifdef DEBUG_BONITO -#define DPRINTF (fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__) +#define DPRINTF (fmt, ...) fprintf(stderr, "%s: " fmt, __func__, ##__VA_ARGS__)#else #define DPRINTF (fmt, ...)#endif
hw/sd/pxa2xx_mmci.c +3 -3
@@ -330,7 +330,7 @@ static uint64_t pxa2xx_mmci_read(void *opaque, hwaddr offset, unsigned size)case MMC_BLKS_REM :return s->numblk;default : -hw_error ("%s: Bad offset " REG_FMT "\n" , __FUNCTION__, offset); +hw_error ("%s: Bad offset " REG_FMT "\n" , __func__, offset); }return 0 ;
@@ -369,7 +369,7 @@ static void pxa2xx_mmci_write(void *opaque,case MMC_SPI : s->spi = value &0xf ;if (value &SPI_SPI_MODE ) -printf ("%s: attempted to use card in SPI mode\n" , __FUNCTION__); +printf ("%s: attempted to use card in SPI mode\n" , __func__);break ;case MMC_CMDAT :
@@ -442,7 +442,7 @@ static void pxa2xx_mmci_write(void *opaque,break ;default : -hw_error ("%s: Bad offset " REG_FMT "\n" , __FUNCTION__, offset); +hw_error ("%s: Bad offset " REG_FMT "\n" , __func__, offset); } }
hw/ssi/omap_spi.c +3 -3
@@ -295,10 +295,10 @@ static void omap_mcspi_write(void *opaque, hwaddr addr,if ((value ^ s->ch[ch].config) & (3 <<14 ))/* DMAR | DMAW */ omap_mcspi_dmarequest_update (s->ch + ch);if (((value >>12 ) &3 ) ==3 )/* TRM */ -fprintf (stderr,"%s: invalid TRM value (3)\n" , __FUNCTION__); +fprintf (stderr,"%s: invalid TRM value (3)\n" , __func__);if (((value >>7 ) &0x1f ) <3 )/* WL */ fprintf (stderr,"%s: invalid WL value (%" PRIx64")\n" , - __FUNCTION__, (value >>7 ) &0x1f ); + __func__, (value >>7 ) &0x1f ); s->ch[ch].config = value &0x7fffff ;break ;
@@ -367,7 +367,7 @@ void omap_mcspi_attach(struct omap_mcspi_s *s, int chipselect) {if (chipselect <0 || chipselect >= s->chnum) -hw_error ("%s: Bad chipselect %i\n" , __FUNCTION__, chipselect); +hw_error ("%s: Bad chipselect %i\n" , __func__, chipselect); s->ch[chipselect].txrx = txrx; s->ch[chipselect].opaque = opaque;
hw/timer/omap_gptimer.c +3 -3
@@ -357,7 +357,7 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr, s->config = value &0x33d ;if (((value >>3 ) &3 ) ==3 )/* IDLEMODE */ fprintf (stderr,"%s: illegal IDLEMODE value in TIOCP_CFG\n" , - __FUNCTION__); + __func__);if (value &2 )/* SOFTRESET */ omap_gp_timer_reset (s);break ;
@@ -395,10 +395,10 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr, s->st = (value >>0 ) &1 ;if (s->inout && s->trigger != gpt_trigger_none)fprintf (stderr,"%s: GP timer pin must be an output " -"for this trigger mode\n" , __FUNCTION__); +"for this trigger mode\n" , __func__);if (!s->inout && s->capture != gpt_capture_none)fprintf (stderr,"%s: GP timer pin must be an input " -"for this capture mode\n" , __FUNCTION__); +"for this capture mode\n" , __func__);if (s->trigger == gpt_trigger_none)omap_gp_timer_out (s, s->scpwm);/* TODO: make sure this doesn't overflow 32-bits */
hw/timer/twl92230.c +3 -3
@@ -403,7 +403,7 @@ static uint8_t menelaus_read(void *opaque, uint8_t addr)default :#ifdef VERBOSE -printf ("%s: unknown register %02x\n" , __FUNCTION__, addr); +printf ("%s: unknown register %02x\n" , __func__, addr);#endif break ; }
@@ -615,7 +615,7 @@ static void menelaus_write(void *opaque, uint8_t addr, uint8_t value) rtc_badness:default :fprintf (stderr,"%s: bad RTC_UPDATE value %02x\n" , - __FUNCTION__, value); + __func__, value); s->status |=1 <<10 ;/* RTCERR */ menelaus_update (s); }
@@ -708,7 +708,7 @@ static void menelaus_write(void *opaque, uint8_t addr, uint8_t value)default :#ifdef VERBOSE -printf ("%s: unknown register %02x\n" , __FUNCTION__, addr); +printf ("%s: unknown register %02x\n" , __func__, addr);#endif } }
hw/usb/desc.c +1 -1
@@ -688,7 +688,7 @@ int usb_desc_get_descriptor(USBDevice *dev, USBPacket *p,break ;default : -fprintf (stderr,"%s: %d unknown type %d (len %zd)\n" , __FUNCTION__, +fprintf (stderr,"%s: %d unknown type %d (len %zd)\n" , __func__, dev->addr, type, len);break ; }
hw/usb/dev-bluetooth.c +2 -2
@@ -274,13 +274,13 @@ static void usb_bt_fifo_enqueue(struct usb_hci_in_fifo_s *fifo,if (off <=DFIFO_LEN_MASK ) {if (off + len >DFIFO_LEN_MASK +1 && (fifo->dsize = off + len) > (DFIFO_LEN_MASK +1 ) *2 ) { -fprintf (stderr,"%s: can't alloc %i bytes\n" , __FUNCTION__, len); +fprintf (stderr,"%s: can't alloc %i bytes\n" , __func__, len);exit (-1 ); } buf = fifo->data + off; }else {if (fifo->dlen > fifo->dsize) { -fprintf (stderr,"%s: can't alloc %i bytes\n" , __FUNCTION__, len); +fprintf (stderr,"%s: can't alloc %i bytes\n" , __func__, len);exit (-1 ); } buf = fifo->data + off - fifo->dsize;
hw/usb/hcd-musb.c +2 -2
@@ -253,8 +253,8 @@/* #define MUSB_DEBUG */ #ifdef MUSB_DEBUG -#define TRACE (fmt,...) fprintf(stderr, "%s@%d: " fmt "\n", __FUNCTION__, \ - __LINE__, ##__VA_ARGS__) +#define TRACE (fmt, ...) fprintf(stderr, "%s@%d: " fmt "\n", __func__, \ + __LINE__, ##__VA_ARGS__)#else #define TRACE (...)#endif
hw/usb/tusb6010.c +7 -7
@@ -296,7 +296,7 @@ static uint32_t tusb_async_readb(void *opaque, hwaddr addr) }printf ("%s: unknown register at %03x\n" , - __FUNCTION__, (int ) (addr &0xfff )); + __func__, (int ) (addr &0xfff ));return 0 ; }
@@ -313,7 +313,7 @@ static uint32_t tusb_async_readh(void *opaque, hwaddr addr) }printf ("%s: unknown register at %03x\n" , - __FUNCTION__, (int ) (addr &0xfff )); + __func__, (int ) (addr &0xfff ));return 0 ; }
@@ -436,7 +436,7 @@ static uint32_t tusb_async_readw(void *opaque, hwaddr addr)return 0x54059adf ; } -printf ("%s: unknown register at %03x\n" , __FUNCTION__, offset); +printf ("%s: unknown register at %03x\n" , __func__, offset);return 0 ; }
@@ -456,7 +456,7 @@ static void tusb_async_writeb(void *opaque, hwaddr addr,default :printf ("%s: unknown register at %03x\n" , - __FUNCTION__, (int ) (addr &0xfff )); + __func__, (int ) (addr &0xfff ));return ; } }
@@ -477,7 +477,7 @@ static void tusb_async_writeh(void *opaque, hwaddr addr,default :printf ("%s: unknown register at %03x\n" , - __FUNCTION__, (int ) (addr &0xfff )); + __func__, (int ) (addr &0xfff ));return ; } }
@@ -505,7 +505,7 @@ static void tusb_async_writew(void *opaque, hwaddr addr, s->dev_config = value; s->host_mode = (value &TUSB_DEV_CONF_USB_HOST_MODE );if (value &TUSB_DEV_CONF_PROD_TEST_MODE ) -hw_error ("%s: Product Test mode not allowed\n" , __FUNCTION__); +hw_error ("%s: Product Test mode not allowed\n" , __func__);break ;case TUSB_PHY_OTG_CTRL_ENABLE :
@@ -636,7 +636,7 @@ static void tusb_async_writew(void *opaque, hwaddr addr,break ;default : -printf ("%s: unknown register at %03x\n" , __FUNCTION__, offset); +printf ("%s: unknown register at %03x\n" , __func__, offset);return ; } }
hw/xenpv/xen_domainbuild.c +8 -8
@@ -25,22 +25,22 @@ static int xenstore_domain_mkdir(char *path)int i;if (!xs_mkdir (xenstore,0 , path)) { -fprintf (stderr,"%s: xs_mkdir %s: failed\n" , __FUNCTION__, path); +fprintf (stderr,"%s: xs_mkdir %s: failed\n" , __func__, path);return -1 ; }if (!xs_set_permissions (xenstore,0 , path, perms_ro,2 )) { -fprintf (stderr,"%s: xs_set_permissions failed\n" , __FUNCTION__); +fprintf (stderr,"%s: xs_set_permissions failed\n" , __func__);return -1 ; }for (i =0 ; writable[i]; i++) {snprintf (subpath,sizeof (subpath),"%s/%s" , path, writable[i]);if (!xs_mkdir (xenstore,0 , subpath)) { -fprintf (stderr,"%s: xs_mkdir %s: failed\n" , __FUNCTION__, subpath); +fprintf (stderr,"%s: xs_mkdir %s: failed\n" , __func__, subpath);return -1 ; }if (!xs_set_permissions (xenstore,0 , subpath, perms_rw,2 )) { -fprintf (stderr,"%s: xs_set_permissions failed\n" , __FUNCTION__); +fprintf (stderr,"%s: xs_set_permissions failed\n" , __func__);return -1 ; } }
@@ -158,7 +158,7 @@ static int xen_domain_watcher(void)char byte;if (pipe (fd) !=0 ) { -qemu_log ("%s: Huh? pipe error: %s\n" , __FUNCTION__,strerror (errno)); +qemu_log ("%s: Huh? pipe error: %s\n" , __func__,strerror (errno));return -1 ; }if (fork () !=0 )
@@ -190,7 +190,7 @@ static int xen_domain_watcher(void)case -1 :if (errno ==EINTR )continue ; -qemu_log ("%s: Huh? read error: %s\n" , __FUNCTION__,strerror (errno)); +qemu_log ("%s: Huh? read error: %s\n" , __func__,strerror (errno)); qemu_running =0 ;break ;case 0 :
@@ -198,13 +198,13 @@ static int xen_domain_watcher(void) qemu_running =0 ;break ;default : -qemu_log ("%s: Huh? data on the watch pipe?\n" , __FUNCTION__); +qemu_log ("%s: Huh? data on the watch pipe?\n" , __func__);break ; } }/* cleanup */ -qemu_log ("%s: destroy domain %d\n" , __FUNCTION__, xen_domid); +qemu_log ("%s: destroy domain %d\n" , __func__, xen_domid);xc_domain_destroy (xen_xc, xen_domid);_exit (0 ); }
hw/xenpv/xen_machine_pv.c +1 -1
@@ -36,7 +36,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" , __FUNCTION__); +fprintf (stderr,"%s: xen backend core setup failed\n" , __func__);exit (1 ); }
include/hw/arm/omap.h +5 -5
@@ -960,10 +960,10 @@ void omap_mpu_wakeup(void *opaque, int irq, int req);# define OMAP_BAD_REG (paddr) \ fprintf(stderr, "%s: Bad register " OMAP_FMT_plx "\n", \ - __FUNCTION__, paddr) + __func__, paddr)# define OMAP_RO_REG (paddr) \ fprintf(stderr, "%s: Read-only register " OMAP_FMT_plx "\n", \ - __FUNCTION__, paddr) + __func__, paddr)/* OMAP-specific Linux bootloader tags for the ATAG_BOARD area (Board-specifc tags are not here) */
@@ -998,13 +998,13 @@ enum {# ifdef TCMI_VERBOSE # define OMAP_8B_REG (paddr) \ fprintf(stderr, "%s: 8-bit register " OMAP_FMT_plx "\n", \ - __FUNCTION__, paddr) + __func__, paddr)# define OMAP_16B_REG (paddr) \ fprintf(stderr, "%s: 16-bit register " OMAP_FMT_plx "\n", \ - __FUNCTION__, paddr) + __func__, paddr)# define OMAP_32B_REG (paddr) \ fprintf(stderr, "%s: 32-bit register " OMAP_FMT_plx "\n", \ - __FUNCTION__, paddr) + __func__, paddr)# else # define OMAP_8B_REG (paddr)# define OMAP_16B_REG (paddr)
include/hw/arm/sharpsl.h +1 -1
@@ -7,7 +7,7 @@#define QEMU_SHARPSL_H #define zaurus_printf (format, ...) \ - fprintf(stderr, "%s: " format, __FUNCTION__, ##__VA_ARGS__) + fprintf(stderr, "%s: " format, __func__, ##__VA_ARGS__)/* zaurus.c */
memory_mapping.c +1 -1
@@ -256,7 +256,7 @@ static void guest_phys_blocks_region_add(MemoryListener *listener,#ifdef DEBUG_GUEST_PHYS_REGION_ADD fprintf (stderr,"%s: target_start=" TARGET_FMT_plx" target_end=" - TARGET_FMT_plx": %s (count: %u)\n" , __FUNCTION__, target_start, + TARGET_FMT_plx": %s (count: %u)\n" , __func__, target_start, target_end, predecessor ?"joined" :"added" , g->list->num);#endif }
migration/block.c +2 -2
@@ -631,7 +631,7 @@ static int flush_blks(QEMUFile *f)int ret =0 ;DPRINTF ("%s Enter submitted %d read_done %d transferred %d\n" , - __FUNCTION__, block_mig_state.submitted, block_mig_state.read_done, + __func__, block_mig_state.submitted, block_mig_state.read_done, block_mig_state.transferred);blk_mig_lock ();
@@ -658,7 +658,7 @@ static int flush_blks(QEMUFile *f) }blk_mig_unlock (); -DPRINTF ("%s Exit submitted %d read_done %d transferred %d\n" , __FUNCTION__, +DPRINTF ("%s Exit submitted %d read_done %d transferred %d\n" , __func__, block_mig_state.submitted, block_mig_state.read_done, block_mig_state.transferred);return ret;
ui/cursor.c +3 -3
@@ -19,11 +19,11 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[])if (sscanf (xpm[line],"%u %u %u %u" , &width, &height, &colors, &chars) !=4 ) {fprintf (stderr,"%s: header parse error: \"%s\"\n" , - __FUNCTION__, xpm[line]); + __func__, xpm[line]);return NULL ; }if (chars !=1 ) { -fprintf (stderr,"%s: chars != 1 not supported\n" , __FUNCTION__); +fprintf (stderr,"%s: chars != 1 not supported\n" , __func__);return NULL ; } line++;
@@ -41,7 +41,7 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[]) } }fprintf (stderr,"%s: color parse error: \"%s\"\n" , - __FUNCTION__, xpm[line]); + __func__, xpm[line]);return NULL ; }
ui/spice-display.c +2 -2
@@ -630,13 +630,13 @@ static int interface_req_cursor_notification(QXLInstance *sin)static void interface_notify_update (QXLInstance *sin,uint32_t update_id) { -fprintf (stderr,"%s: abort()\n" , __FUNCTION__); +fprintf (stderr,"%s: abort()\n" , __func__);abort (); }static int interface_flush_resources (QXLInstance *sin) { -fprintf (stderr,"%s: abort()\n" , __FUNCTION__); +fprintf (stderr,"%s: abort()\n" , __func__);abort ();return 0 ; }
Signature · 7 lines
2.14.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v6 3/29 Fixes after renaming __FUNCTION__ to __func__
In reply to Alistair FrancisSigned-off-by Alistair Francis <[email protected]>
Cc Eric Blake <[email protected]>
Reviewed-by Eric Blake <[email protected]>
---
V3:
- Squash onto single lines
- Don't fix indentation of case in omap_prcm_apll_update()
hw/arm/omap1.c | 8 +++----- hw/block/onenand.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-)
hw/arm/omap1.c +3 -5
@@ -1717,7 +1717,7 @@ static void omap_clkm_write(void *opaque, hwaddr addr,if ((s->clkm.clocking_scheme ^ (value >>11 )) &7 ) { s->clkm.clocking_scheme = (value >>11 ) &7 ;printf ("%s: clocking scheme set to %s\n" , __func__, - clkschemename[s->clkm.clocking_scheme]); + clkschemename[s->clkm.clocking_scheme]); } s->clkm.cold_start &= value &0x3f ;return ;
@@ -3329,14 +3329,12 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,case 0x18 :/* MCR2 */ s->mcr[1 ] = value &0x03e3 ;if (value &3 )/* XMCM */ -printf ("%s: Tx channel selection mode enable attempt\n" , - __func__); +printf ("%s: Tx channel selection mode enable attempt\n" , __func__);return ;case 0x1a :/* MCR1 */ s->mcr[0 ] = value &0x03e1 ;if (value &1 )/* RMCM */ -printf ("%s: Rx channel selection mode enable attempt\n" , - __func__); +printf ("%s: Rx channel selection mode enable attempt\n" , __func__);return ;case 0x1c :/* RCERA */ s->rcer[0 ] = value &0xffff ;
hw/block/onenand.c +1 -1
@@ -659,7 +659,7 @@ static uint64_t onenand_read(void *opaque, hwaddr addr,case 0xff02 :/* ECC Result of spare area data */ case 0xff03 :/* ECC Result of main area data */ case 0xff04 :/* ECC Result of spare area data */ -hw_error ("%s: imeplement ECC\n" , __func__); +hw_error ("%s: implement ECC\n" , __func__);return 0x0000 ; }
Signature · 1 line
2.14.1
PATCH v6 4/29 hw/arm: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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.
Signed-off-by Alistair Francis <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V6:
- Fix indendation
V3:
- Remoave 'qemu: ' prefix
V2:
- Split hw patch into individual directories
hw/arm/armv7m.c | 2 +- hw/arm/boot.c | 37 ++++++++++++++++++------------------- hw/arm/gumstix.c | 13 +++++++------ hw/arm/mainstone.c | 7 ++++--- hw/arm/musicpal.c | 2 +- hw/arm/omap1.c | 5 +++-- hw/arm/omap2.c | 23 ++++++++++++----------- hw/arm/omap_sx1.c | 8 +++----- hw/arm/palm.c | 10 +++++----- hw/arm/pxa2xx.c | 7 ++++--- hw/arm/stellaris.c | 3 ++- hw/arm/tosa.c | 18 +++++++++--------- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 8 ++++---- hw/arm/z2.c | 6 +++--- 15 files changed, 77 insertions(+), 74 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 +18 -19
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include <libfdt.h> #include "hw/hw.h"
@@ -418,13 +419,13 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo,char *filename; filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , binfo->dtb_filename);if (!filename) { -fprintf (stderr,"Couldn't open dtb file %s\n" , binfo->dtb_filename); +error_report ("Couldn't open dtb file %s" , binfo->dtb_filename); goto fail; } fdt =load_device_tree (filename, &size);if (!fdt) { -fprintf (stderr,"Couldn't open dtb file %s\n" , filename); +error_report ("Couldn't open dtb file %s" , filename);g_free (filename); goto fail; }
@@ -432,7 +433,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, }else { fdt = binfo->get_dtb (binfo, &size);if (!fdt) { -fprintf (stderr,"Board was unable to create a dtb blob\n" ); +error_report ("Board was unable to create a dtb blob" ); goto fail; } }
@@ -451,7 +452,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, scells =qemu_fdt_getprop_cell (fdt,"/" ,"#size-cells" ,NULL , &error_fatal);if (acells ==0 || scells ==0 ) { -fprintf (stderr,"dtb file invalid (#address-cells or #size-cells 0)\n" ); +error_report ("dtb file invalid (#address-cells or #size-cells 0)" ); goto fail; }
@@ -459,8 +460,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo,/* This is user error so deserves a friendlier error message * than the failure of setprop_sized_cells would provide */ -fprintf (stderr,"qemu: dtb file not compatible with " -"RAM size > 4GB\n" ); +error_report ("dtb file not compatible with RAM size > 4GB" ); goto fail; }
@@ -480,7 +480,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, acells, mem_base, scells, mem_len);if (rc <0 ) { -fprintf (stderr,"couldn't set %s/reg for node %d\n" , nodename, +error_report ("couldn't set %s/reg for node %d" , nodename, i); goto fail; }
@@ -505,7 +505,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, acells, binfo->loader_start, scells, binfo->ram_size);if (rc <0 ) { -fprintf (stderr,"couldn't set /memory/reg\n" ); +error_report ("couldn't set /memory/reg" ); goto fail; } }
@@ -519,7 +519,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, rc =qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , binfo->kernel_cmdline);if (rc <0 ) { -fprintf (stderr,"couldn't set /chosen/bootargs\n" ); +error_report ("couldn't set /chosen/bootargs" ); goto fail; } }
@@ -528,14 +528,14 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, rc =qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-start" , binfo->initrd_start);if (rc <0 ) { -fprintf (stderr,"couldn't set /chosen/linux,initrd-start\n" ); +error_report ("couldn't set /chosen/linux,initrd-start" ); goto fail; } rc =qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , binfo->initrd_start + binfo->initrd_size);if (rc <0 ) { -fprintf (stderr,"couldn't set /chosen/linux,initrd-end\n" ); +error_report ("couldn't set /chosen/linux,initrd-end" ); goto fail; } }
@@ -690,7 +690,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 +956,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 +975,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 +1020,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 +12 -11
@@ -19,6 +19,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
@@ -1311,8 +1312,8 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s)/* TODO: update clocks */ if (mode[0 ] ==1 || mode[0 ] ==2 || mode[1 ] ==1 || mode[1 ] ==2 ) -fprintf (stderr,"%s: bad EN_54M_PLL or bad EN_96M_PLL\n" , - __func__); +error_report ("%s: bad EN_54M_PLL or bad EN_96M_PLL" , + __func__); }static void omap_prcm_dpll_update (struct omap_prcm_s *s)
@@ -1331,7 +1332,7 @@ static void omap_prcm_dpll_update(struct omap_prcm_s *s) s->dpll_lock =0 ;switch (mode) {case 0 : -fprintf (stderr,"%s: bad EN_DPLL\n" , __func__); +error_report ("%s: bad EN_DPLL" , __func__);break ;case 1 :/* Low-power bypass mode (Default) */ case 2 :/* Fast-relock bypass mode */
@@ -1358,7 +1359,7 @@ static void omap_prcm_dpll_update(struct omap_prcm_s *s)omap_clk_reparent (core, dpll_x2);break ;case 3 : -fprintf (stderr,"%s: bad CORE_CLK_SRC\n" , __func__); +error_report ("%s: bad CORE_CLK_SRC" , __func__);break ; } }
@@ -1627,8 +1628,8 @@ static void omap_prcm_write(void *opaque, hwaddr addr,case 0x500 :/* CM_CLKEN_PLL */ if (value &0xffffff30 ) -fprintf (stderr,"%s: write 0s in CM_CLKEN_PLL for " -"future compatibility\n" , __func__); +error_report ("%s: write 0s in CM_CLKEN_PLL for " +"future compatibility" , __func__);if ((s->clken[9 ] ^ value) &0xcc ) { s->clken[9 ] &= ~0xcc ; s->clken[9 ] |= value &0xcc ;
@@ -1646,8 +1647,8 @@ static void omap_prcm_write(void *opaque, hwaddr addr,break ;case 0x540 :/* CM_CLKSEL1_PLL */ if (value &0xfc4000d7 ) -fprintf (stderr,"%s: write 0s in CM_CLKSEL1_PLL for " -"future compatibility\n" , __func__); +error_report ("%s: write 0s in CM_CLKSEL1_PLL for " +"future compatibility" , __func__);if ((s->clksel[5 ] ^ value) &0x003fff00 ) { s->clksel[5 ] = value &0x03bfff28 ;omap_prcm_dpll_update (s);
@@ -1658,8 +1659,8 @@ static void omap_prcm_write(void *opaque, hwaddr addr,break ;case 0x544 :/* CM_CLKSEL2_PLL */ if (value & ~3 ) -fprintf (stderr,"%s: write 0s in CM_CLKSEL2_PLL[31:2] for " -"future compatibility\n" , __func__); +error_report ("%s: write 0s in CM_CLKSEL2_PLL[31:2] for " +"future compatibility" , __func__);if (s->clksel[6 ] != (value &3 )) { s->clksel[6 ] = value &3 ;omap_prcm_dpll_update (s);
@@ -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 +3 -5
@@ -158,8 +158,7 @@ static void sx1_init(MachineState *machine, const int version) blk_by_legacy_dinfo(dinfo), sector_size, flash_size / sector_size, 4, 0, 0, 0, 0, be)) { -fprintf (stderr,"qemu: Error registering flash memory %d.\n" , - fl_idx); +error_report ("Error registering flash memory %d." , fl_idx); } fl_idx++; }
@@ -182,8 +181,7 @@ static void sx1_init(MachineState *machine, const int version) blk_by_legacy_dinfo(dinfo), sector_size, flash1_size / sector_size, 4, 0, 0, 0, 0, be)) { -fprintf (stderr,"qemu: Error registering flash memory %d.\n" , - fl_idx); +error_report ("Error registering flash memory %d." , fl_idx); } fl_idx++; }else {
@@ -194,7 +192,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/palm.c +5 -5
@@ -233,8 +233,8 @@ static void palmte_init(MachineState *machine)if (nb_option_roms) { rom_size =get_image_size (option_rom[0 ].name);if (rom_size > flash_size) { -fprintf (stderr,"%s: ROM image too big (%x > %x)\n" , - __func__, rom_size, flash_size); +error_report ("%s: ROM image too big (%x > %x)" , + __func__, rom_size, flash_size); rom_size =0 ; }if (rom_size >0 ) {
@@ -243,13 +243,13 @@ static void palmte_init(MachineState *machine) rom_loaded =1 ; }if (rom_size <0 ) { -fprintf (stderr,"%s: error loading '%s'\n" , - __func__, option_rom[0 ].name); +error_report ("%s: error loading '%s'" , + __func__, option_rom[0 ].name); } }if (!rom_loaded && !kernel_filename && !qtest_enabled ()) { -fprintf (stderr,"Kernel or ROM image must be specified\n" ); +fprintf (stderr,"Kernel or ROM 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/stellaris.c +2 -1
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/ssi/ssi.h"
@@ -559,7 +560,7 @@ static void ssys_write(void *opaque, hwaddr offset,case 0x040 :/* SRCR0 */ case 0x044 :/* SRCR1 */ case 0x048 :/* SRCR2 */ -fprintf (stderr,"Peripheral reset not implemented\n" ); +error_report ("Peripheral reset not implemented" );break ;case 0x054 :/* IMC */ s->int_mask = value &0x7f ;
hw/arm/tosa.c +9 -9
@@ -12,6 +12,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/arm/pxa.h"
@@ -70,19 +71,19 @@ static void tosa_out_switch(void *opaque, int line, int level) {switch (line) {case 0 : -fprintf (stderr,"blue LED %s.\n" , level ?"on" :"off" ); +error_report ("blue LED %s." , level ?"on" :"off" );break ;case 1 : -fprintf (stderr,"green LED %s.\n" , level ?"on" :"off" ); +error_report ("green LED %s." , level ?"on" :"off" );break ;case 2 : -fprintf (stderr,"amber LED %s.\n" , level ?"on" :"off" ); +error_report ("amber LED %s." , level ?"on" :"off" );break ;case 3 : -fprintf (stderr,"wlan LED %s.\n" , level ?"on" :"off" ); +fprintf (stderr,"wlan LED %s." , level ?"on" :"off" );break ;default : -fprintf (stderr,"Uhandled out event: %d = %d\n" , line, level); +fprintf (stderr,"Uhandled out event: %d = %d" , line, level);break ; } }
@@ -133,7 +134,7 @@ static void tosa_gpio_setup(PXA2xxState *cpu,static uint32_t tosa_ssp_tansfer (SSISlave *dev,uint32_t value) { -fprintf (stderr,"TG: %d %02x\n" , value >>5 , value &0x1f ); +error_report ("TG: %d %02x" , value >>5 , value &0x1f );return 0 ; }
@@ -159,14 +160,13 @@ static int tosa_dac_send(I2CSlave *i2c, uint8_t data) s->buf[s->len] = data;if (s->len ++ >2 ) {#ifdef VERBOSE -fprintf (stderr,"%s: message too long (%i bytes)\n" , __func__, s->len); +error_report ("%s: message too long (%i bytes)" , __func__, s->len);#endif return 1 ; }if (s->len ==2 ) { -fprintf (stderr,"dac: channel %d value 0x%02x\n" , - s->buf[0 ], s->buf[1 ]); +error_report ("dac: channel %d value 0x%02x" , s->buf[0 ], s->buf[1 ]); }return 0 ;
hw/arm/versatilepb.c +1 -1
@@ -364,7 +364,7 @@ static void versatile_init(MachineState *machine, int board_id) VERSATILE_FLASH_SECT_SIZE, VERSATILE_FLASH_SIZE / VERSATILE_FLASH_SECT_SIZE, 4, 0x0089, 0x0018, 0x0000, 0x0, 0)) { -fprintf (stderr,"qemu: Error registering flash memory.\n" ); +error_report ("Error registering flash memory." ); } versatile_binfo.ram_size = machine->ram_size;
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.14.1
Re: [Qemu-arm] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Quoted 38 lines · Alistair Francis
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 3 lines
Some lines where then manually tweaked to pass checkpatch.
The 'qemu: ' prefix was manually removed from the
hw/arm/boot.cfile.
Elsewhere, too. Suggest "The 'qemu: ' prefix was manually removed from several error messages." Perhaps this could be done on commit.
Quoted 4 lines
Signed-off-by Alistair Francis <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
With the commit message touched up:
Reviewed-by Markus Armbruster <[email protected]>
Re: [Qemu-arm] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisSecond thoughts...
Quoted 75 lines · Alistair Francis
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.cfile.Signed-off-by Alistair Francis <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>---
V6:
- Fix indendation
V3:
- Remoave 'qemu: ' prefix
V2:
- Split hw patch into individual directorieshw/arm/armv7m.c | 2 +- hw/arm/boot.c | 37 ++++++++++++++++++------------------- hw/arm/gumstix.c | 13 +++++++------ hw/arm/mainstone.c | 7 ++++--- hw/arm/musicpal.c | 2 +- hw/arm/omap1.c | 5 +++-- hw/arm/omap2.c | 23 ++++++++++++----------- hw/arm/omap_sx1.c | 8 +++----- hw/arm/palm.c | 10 +++++----- hw/arm/pxa2xx.c | 7 ++++--- hw/arm/stellaris.c | 3 ++- hw/arm/tosa.c | 18 +++++++++--------- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 8 ++++---- hw/arm/z2.c | 6 +++--- 15 files changed, 77 insertions(+), 74 deletions(-)hw/arm/armv7m.c +0
-0
hw/arm/armv7m.c void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size) · line 284
Quoted 8 lines
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 ); }
This is obviously a genuine (fatal) error.
Quoted 13 lines
hw/arm/boot.c +1
-0@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include <libfdt.h> #include "hw/hw.h"
hw/arm/boot.c static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, · line 424
Quoted 7 lines
hw/arm/boot.c +1
-1@@ -418,13 +419,13 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo,char *filename; filename =qemu_find_file (QEMU_FILE_TYPE_BIOS , binfo->dtb_filename);if (!filename) { -fprintf (stderr,"Couldn't open dtb file %s\n" , binfo->dtb_filename); +error_report ("Couldn't open dtb file %s" , binfo->dtb_filename); goto fail; }
These is obviously a genuine (recoverable) error..
[More of the same...]
Quoted 13 lines
hw/arm/omap2.c +1
-0@@ -19,6 +19,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
hw/arm/omap2.c static void omap_prcm_apll_update(struct omap_prcm_s *s) · line 1317
Quoted 8 lines
hw/arm/omap2.c +2
-2@@ -1311,8 +1312,8 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s)/* TODO: update clocks */ if (mode[0 ] ==1 || mode[0 ] ==2 || mode[1 ] ==1 || mode[1 ] ==2 ) -fprintf (stderr,"%s: bad EN_54M_PLL or bad EN_96M_PLL\n" , - __func__); +error_report ("%s: bad EN_54M_PLL or bad EN_96M_PLL" , + __func__); }
This one's different: we neither exit() nor return a "failed" status to the caller.
We get here when the guest writes something funny to a certain memory-mapped I/O register. In other words, it's guest misbehavior, not a user error. I doubt it should be reported with error_report(). Peter, do we have a canonical way to report or log guest misbehavior?
[...]
Re: [Qemu-arm] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Quoted 3 lines · Markus Armbruster
Second thoughts...
Alistair Francis <[email protected]> writes:
[...]
Quoted 18 lines
Quoted 6 lines
#include "
qemu/osdep.h"hw/arm/omap1.c +1
-0+#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" hw/arm/omap1.c static void omap_prcm_apll_update(struct omap_prcm_s *s) · line 1317
Quoted 8 lines
hw/arm/omap1.c +2
-2@@ -1311,8 +1312,8 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s)/* TODO: update clocks */ if (mode[0 ] ==1 || mode[0 ] ==2 || mode[1 ] ==1 || mode[1 ] ==2 ) -fprintf (stderr,"%s: bad EN_54M_PLL or bad EN_96M_PLL\n" , - __func__); +error_report ("%s: bad EN_54M_PLL or bad EN_96M_PLL" , + __func__); }This one's different: we neither
exit()nor return a "failed" status to the caller.
Quoted 4 lines
We get here when the guest writes something funny to a certain memory-mapped I/O register. In other words, it's guest misbehavior, not a user error. I doubt it should be reported with
error_report(). Peter, do we have a canonical way to report or log guest misbehavior?
qemu_log_mask(LOG_GUEST_ERROR, ...) ?
Thomas
Re: [Qemu-arm] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Quoted 23 lines · Thomas Huth
Quoted 3 lines · Markus Armbruster
Second thoughts...
Alistair Francis <[email protected]> writes:
[...]
Quoted 18 lines
Quoted 6 lines
#include "
qemu/osdep.h"hw/arm/omap1.c +1
-0+#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" hw/arm/omap1.c static void omap_prcm_apll_update(struct omap_prcm_s *s) · line 1317
Quoted 8 lines
hw/arm/omap1.c +2
-2@@ -1311,8 +1312,8 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s)/* TODO: update clocks */ if (mode[0 ] ==1 || mode[0 ] ==2 || mode[1 ] ==1 || mode[1 ] ==2 ) -fprintf (stderr,"%s: bad EN_54M_PLL or bad EN_96M_PLL\n" , - __func__); +error_report ("%s: bad EN_54M_PLL or bad EN_96M_PLL" , + __func__); }This one's different: we neither
exit()nor return a "failed" status to the caller.
Quoted 6 lines
Quoted 4 lines
We get here when the guest writes something funny to a certain memory-mapped I/O register. In other words, it's guest misbehavior, not a user error. I doubt it should be reported with
error_report(). Peter, do we have a canonical way to report or log guest misbehavior?
qemu_log_mask(LOG_GUEST_ERROR, ...)?
That seems like the best option to me.
Alistair
Quoted 4 lines
Thomas
Re: [Qemu-arm] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Quoted 24 lines · Alistair Francis
Quoted 23 lines · Thomas Huth
Quoted 3 lines · Markus Armbruster
Second thoughts...
Alistair Francis <[email protected]> writes:
[...]
Quoted 18 lines
Quoted 6 lines
#include "
qemu/osdep.h"hw/arm/omap1.c +1
-0+#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" hw/arm/omap1.c static void omap_prcm_apll_update(struct omap_prcm_s *s) · line 1317
Quoted 8 lines
hw/arm/omap1.c +2
-2@@ -1311,8 +1312,8 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s)/* TODO: update clocks */ if (mode[0 ] ==1 || mode[0 ] ==2 || mode[1 ] ==1 || mode[1 ] ==2 ) -fprintf (stderr,"%s: bad EN_54M_PLL or bad EN_96M_PLL\n" , - __func__); +error_report ("%s: bad EN_54M_PLL or bad EN_96M_PLL" , + __func__); }This one's different: we neither
exit()nor return a "failed" status to the caller.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
We get here when the guest writes something funny to a certain memory-mapped I/O register. In other words, it's guest misbehavior, not a user error. I doubt it should be reported with
error_report(). Peter, do we have a canonical way to report or log guest misbehavior?
qemu_log_mask(LOG_GUEST_ERROR, ...)?That seems like the best option to me.
Suggest:
1. Keep converting fatal errors (the ones that exit())
2. Keep converting recoverable errors (the ones that return failure)
3. You can leave the prints that are neither alone. You can also convert to logging or tracing, as appropriate, but that requires understanding the code.
Makes sense?
Re: [Qemu-arm] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Quoted 39 lines · Markus Armbruster
Quoted 24 lines · Alistair Francis
Quoted 23 lines · Thomas Huth
Quoted 3 lines · Markus Armbruster
Second thoughts...
Alistair Francis <[email protected]> writes:
[...]
Quoted 18 lines
Quoted 6 lines
#include "
qemu/osdep.h"hw/arm/omap1.c +1
-0+#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" hw/arm/omap1.c static void omap_prcm_apll_update(struct omap_prcm_s *s) · line 1317
Quoted 8 lines
hw/arm/omap1.c +2
-2@@ -1311,8 +1312,8 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s)/* TODO: update clocks */ if (mode[0 ] ==1 || mode[0 ] ==2 || mode[1 ] ==1 || mode[1 ] ==2 ) -fprintf (stderr,"%s: bad EN_54M_PLL or bad EN_96M_PLL\n" , - __func__); +error_report ("%s: bad EN_54M_PLL or bad EN_96M_PLL" , + __func__); }This one's different: we neither
exit()nor return a "failed" status to the caller.Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
We get here when the guest writes something funny to a certain memory-mapped I/O register. In other words, it's guest misbehavior, not a user error. I doubt it should be reported with
error_report(). Peter, do we have a canonical way to report or log guest misbehavior?
qemu_log_mask(LOG_GUEST_ERROR, ...)?That seems like the best option to me.
Suggest:
1. Keep converting fatal errors (the ones that
exit())
Quoted 7 lines
2. Keep converting recoverable errors (the ones that return failure)
3. You can leave the prints that are neither alone. You can also convert to logging or tracing, as appropriate, but that requires understanding the code.
Makes sense?
Does this apply to new patches after this series or to this series as well? The series is mostly just mechanical find/replace. I really don't want to have to dig through every patch to figure out what to change/not change.
Alistair
Quoted 1 line
Re: [Qemu-arm] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Quoted 46 lines · Alistair Francis
Quoted 45 lines · Markus Armbruster
Quoted 24 lines · Alistair Francis
Quoted 23 lines · Thomas Huth
Quoted 3 lines · Markus Armbruster
Second thoughts...
Alistair Francis <[email protected]> writes:
[...]
Quoted 18 lines
Quoted 6 lines
#include "
qemu/osdep.h"hw/arm/omap1.c +1
-0+#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" hw/arm/omap1.c static void omap_prcm_apll_update(struct omap_prcm_s *s) · line 1317
Quoted 8 lines
hw/arm/omap1.c +2
-2@@ -1311,8 +1312,8 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s)/* TODO: update clocks */ if (mode[0 ] ==1 || mode[0 ] ==2 || mode[1 ] ==1 || mode[1 ] ==2 ) -fprintf (stderr,"%s: bad EN_54M_PLL or bad EN_96M_PLL\n" , - __func__); +error_report ("%s: bad EN_54M_PLL or bad EN_96M_PLL" , + __func__); }This one's different: we neither
exit()nor return a "failed" status to the caller.Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
We get here when the guest writes something funny to a certain memory-mapped I/O register. In other words, it's guest misbehavior, not a user error. I doubt it should be reported with
error_report(). Peter, do we have a canonical way to report or log guest misbehavior?
qemu_log_mask(LOG_GUEST_ERROR, ...)?That seems like the best option to me.
Suggest:
1. Keep converting fatal errors (the ones that
exit())2. Keep converting recoverable errors (the ones that return failure)
3. You can leave the prints that are neither alone. You can also convert to logging or tracing, as appropriate, but that requires understanding the code.
Quoted 6 lines
Quoted 1 line
Makes sense?
Does this apply to new patches after this series or to this series as well? The series is mostly just mechanical find/replace. I really don't want to have to dig through every patch to figure out what to change/not change.
I understand your reluctance to sort patch hunks into buckets 1., 2. and
3. manually: there's an awful lot of hunks to sort.
We know we have many fprintf() that should be error_report(), error_setg(), logging or tracing.
We know we have error_report() that should be error_setg().
Converting fprintf() to error_report() where we should really use something else makes the situation worse, I'm afraid.
Since we need to sort, and sorting manually isn't practical, we need to automate.
The patterns to recognize are 1. fprintf() followed by exit() and
2. fprintf() followed by return failure.
Recognizing the patterns when there's stuff between fprintf() and exit() / return may exceed sed's power. Feels like a Coccinelle job to me. Let's focus on the common case where exit() / return follows fprintf() immediately.
Let's start with the easiest case: exit(). I figure that's still in reach of your find + sed tooling.
Recognizing "return failure" is slightly harder, because error values aren't always obvious. Common ones are return NULL, return -1, return -EFOO.
I hope that peeling off truly simple cases like this will reduce the remaining hunks sufficiently to permit manual review. If it doesn't, we should still get a major part of your work without making the situation worse.
Re: [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Quoted 80 lines · Markus Armbruster
Quoted 46 lines · Alistair Francis
Quoted 45 lines · Markus Armbruster
Quoted 24 lines · Alistair Francis
Quoted 23 lines · Thomas Huth
Quoted 3 lines · Markus Armbruster
Second thoughts...
Alistair Francis <[email protected]> writes:
[...]
Quoted 18 lines
Quoted 6 lines
#include "
qemu/osdep.h"(quoted diff) +1
-0+#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"Review static void omap_prcm_apll_update(struct omap_prcm_s *s) · line 1317
Quoted 8 lines
(quoted diff) +2
-2@@ -1311,8 +1312,8 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s) /* TODO: update clocks */ if (mode[0] == 1 || mode[0] == 2 || mode[1] == 1 || mode[1] == 2) - fprintf(stderr, "%s: bad EN_54M_PLL or bad EN_96M_PLL\n", - __func__); + error_report("%s: bad EN_54M_PLL or bad EN_96M_PLL", + __func__); }This one's different: we neither
exit()nor return a "failed" status to the caller.Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
We get here when the guest writes something funny to a certain memory-mapped I/O register. In other words, it's guest misbehavior, not a user error. I doubt it should be reported with
error_report(). Peter, do we have a canonical way to report or log guest misbehavior?
qemu_log_mask(LOG_GUEST_ERROR, ...)?That seems like the best option to me.
Suggest:
1. Keep converting fatal errors (the ones that
exit())2. Keep converting recoverable errors (the ones that return failure)
3. You can leave the prints that are neither alone. You can also convert to logging or tracing, as appropriate, but that requires understanding the code.
Quoted 6 lines
Quoted 1 line
Makes sense?
Does this apply to new patches after this series or to this series as well? The series is mostly just mechanical find/replace. I really don't want to have to dig through every patch to figure out what to change/not change.
I understand your reluctance to sort patch hunks into buckets 1., 2. and
3. manually: there's an awful lot of hunks to sort.We know we have many
fprintf()that should beerror_report(),error_setg(), logging or tracing.We know we have
error_report()that should beerror_setg().Converting
fprintf()toerror_report()where we should really use something else makes the situation worse, I'm afraid.Since we need to sort, and sorting manually isn't practical, we need to automate.
The patterns to recognize are 1.
fprintf()followed byexit()and
2.fprintf()followed by return failure.Recognizing the patterns when there's stuff between
fprintf()andexit()/ return may exceed sed's power. Feels like a Coccinelle job to me. Let's focus on the common case whereexit()/ return followsfprintf()immediately.Let's start with the easiest case:
exit(). I figure that's still in reach of your find + sed tooling.
Quoted 8 lines
Recognizing "return failure" is slightly harder, because error values aren't always obvious. Common ones are return NULL, return -1, return
-EFOO.I hope that peeling off truly simple cases like this will reduce the remaining hunks sufficiently to permit manual review. If it doesn't, we should still get a major part of your work without making the situation worse.
Ok. So it is becoming apparent that this series is not going to be accepted. I might just drop it and try and re-group with Coccinelle at some point in the future.
If there is a subset of this series that is fine to go in I'm happy to rebase and keep going, but at the moment it looks like starting again is gong to be the least painful effort.
Alistair
Quoted 1 line
Re: [Qemu-arm] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Quoted 90 lines · Alistair Francis
Quoted 80 lines · Markus Armbruster
Quoted 46 lines · Alistair Francis
Quoted 45 lines · Markus Armbruster
Quoted 24 lines · Alistair Francis
Quoted 23 lines · Thomas Huth
Quoted 3 lines · Markus Armbruster
Second thoughts...
Alistair Francis <[email protected]> writes:
[...]
Quoted 18 lines
Quoted 6 lines
#include "
qemu/osdep.h"(quoted diff) +1
-0+#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"Review static void omap_prcm_apll_update(struct omap_prcm_s *s) · line 1317
Quoted 8 lines
(quoted diff) +2
-2@@ -1311,8 +1312,8 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s) /* TODO: update clocks */ if (mode[0] == 1 || mode[0] == 2 || mode[1] == 1 || mode[1] == 2) - fprintf(stderr, "%s: bad EN_54M_PLL or bad EN_96M_PLL\n", - __func__); + error_report("%s: bad EN_54M_PLL or bad EN_96M_PLL", + __func__); }This one's different: we neither
exit()nor return a "failed" status to the caller.Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
We get here when the guest writes something funny to a certain memory-mapped I/O register. In other words, it's guest misbehavior, not a user error. I doubt it should be reported with
error_report(). Peter, do we have a canonical way to report or log guest misbehavior?
qemu_log_mask(LOG_GUEST_ERROR, ...)?That seems like the best option to me.
Suggest:
1. Keep converting fatal errors (the ones that
exit())2. Keep converting recoverable errors (the ones that return failure)
3. You can leave the prints that are neither alone. You can also convert to logging or tracing, as appropriate, but that requires understanding the code.
Quoted 6 lines
Quoted 1 line
Makes sense?
Does this apply to new patches after this series or to this series as well? The series is mostly just mechanical find/replace. I really don't want to have to dig through every patch to figure out what to change/not change.
I understand your reluctance to sort patch hunks into buckets 1., 2. and
3. manually: there's an awful lot of hunks to sort.We know we have many
fprintf()that should beerror_report(),error_setg(), logging or tracing.We know we have
error_report()that should beerror_setg().Converting
fprintf()toerror_report()where we should really use something else makes the situation worse, I'm afraid.Since we need to sort, and sorting manually isn't practical, we need to automate.
The patterns to recognize are 1.
fprintf()followed byexit()and
2.fprintf()followed by return failure.Recognizing the patterns when there's stuff between
fprintf()andexit()/ return may exceed sed's power. Feels like a Coccinelle job to me. Let's focus on the common case whereexit()/ return followsfprintf()immediately.Let's start with the easiest case:
exit(). I figure that's still in reach of your find + sed tooling.Quoted 8 lines
Recognizing "return failure" is slightly harder, because error values aren't always obvious. Common ones are return NULL, return -1, return
-EFOO.I hope that peeling off truly simple cases like this will reduce the remaining hunks sufficiently to permit manual review. If it doesn't, we should still get a major part of your work without making the situation worse.
Quoted 7 lines
Ok. So it is becoming apparent that this series is not going to be accepted. I might just drop it and try and re-group with Coccinelle at some point in the future.
If there is a subset of this series that is fine to go in I'm happy to rebase and keep going, but at the moment it looks like starting again is gong to be the least painful effort.
Sorry to hear that. But I somewhat agree with Markus - lots of the patches were not trivial and need close review to see whether the fprintf should be replaced with error_report, warn_report, qemu_log_mask or a tracepoint, so primary blindly converting everything to error_report is really just the wrong way.
If I may suggest something: Don't send the patches as a huge series, but send single patches (that you've reviewed on your own first), with the individual subsystem maintainers in CC. That should help to get better review, and the single patches then have a higher chance to get picked up through the maintainers' trees.
Thomas
PATCH v6 5/29 hw/dma: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V3:
- Remove ""s
V2:
- Split hw patch into individual directories
hw/dma/omap_dma.c | 26 ++++++++++++++------------ hw/dma/soc_dma.c | 36 ++++++++++++++++++------------------ 2 files changed, 32 insertions(+), 30 deletions(-)
hw/dma/omap_dma.c +14 -12
@@ -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/omap.h"
@@ -1898,13 +1899,13 @@ static void omap_dma4_write(void *opaque, hwaddr addr,omap_dma_reset (s->dma); s->ocp = value &0x3321 ;if (((s->ocp >>12 ) &3 ) ==3 )/* MIDLEMODE */ -fprintf (stderr,"%s: invalid DMA power mode\n" , __func__); +error_report ("%s: invalid DMA power mode" , __func__);return ;case 0x78 :/* DMA4_GCR */ s->gcr = value &0x00ff00ff ;if ((value &0xff ) ==0x00 )/* MAX_CHANNEL_FIFO_DEPTH */ -fprintf (stderr,"%s: wrong FIFO depth in GCR\n" , __func__); +error_report ("%s: wrong FIFO depth in GCR" , __func__);return ; case 0x80 ... 0xfff:
@@ -1934,8 +1935,8 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->buf_disable = (value >>25 ) &1 ; ch->src_sync = (value >>24 ) &1 ;/* XXX For CamDMA must be 1 */ if (ch->buf_disable && !ch->src_sync) -fprintf (stderr,"%s: Buffering disable is not allowed in " -"destination synchronised mode\n" , __func__); +error_report ("%s: Buffering disable is not allowed in " +"destination synchronised mode" , __func__); ch->prefetch = (value >>23 ) &1 ; ch->bs = (value >>18 ) &1 ; ch->transparent_copy = (value >>17 ) &1 ;
@@ -1946,8 +1947,8 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->priority = (value &0x0040 ) >>6 ; ch->fs = (value &0x0020 ) >>5 ;if (ch->fs && ch->bs && ch->mode[0 ] && ch->mode[1 ]) -fprintf (stderr,"%s: For a packet transfer at least one port " -"must be constant-addressed\n" , __func__); +error_report ("%s: For a packet transfer at least one port " +"must be constant-addressed" , __func__); ch->sync = (value &0x001f ) | ((value >>14 ) &0x0060 );/* XXX must be 0x01 for CamDMA */
@@ -1977,8 +1978,8 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->endian[1 ] =(value >>19 ) &1 ; ch->endian_lock[1 ] =(value >>18 ) &1 ;if (ch->endian[0 ] != ch->endian[1 ]) -fprintf (stderr,"%s: DMA endianness conversion enable attempt\n" , - __func__); +error_report ("%s: DMA endianness conversion enable attempt" , + __func__); ch->write_mode = (value >>16 ) &3 ; ch->burst[1 ] = (value &0xc000 ) >>14 ; ch->pack[1 ] = (value &0x2000 ) >>13 ;
@@ -1986,12 +1987,13 @@ static void omap_dma4_write(void *opaque, hwaddr addr, ch->burst[0 ] = (value &0x0180 ) >>7 ; ch->pack[0 ] = (value &0x0040 ) >>6 ; ch->translate[0 ] = (value &0x003c ) >>2 ; -if (ch->translate[0 ] | ch->translate[1 ]) -fprintf (stderr,"%s: bad MReqAddressTranslate sideband signal\n" , - __func__); +if (ch->translate[0 ] | ch->translate[1 ]) { +error_report ("%s: bad MReqAddressTranslate sideband signal" , + __func__); + } ch->data_type =1 << (value &3 );if ((value &3 ) ==3 ) { -printf ("%s: bad data_type for DMA channel\n" , __func__); +error_report ("%s: bad data_type for DMA channel" , __func__); ch->data_type >>=1 ; }break ;
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.14.1
Re: [Qemu-devel] [PATCH v6 05/29] hw/dma: Replace fprintf(stderr, "*\n" with error_report()
Quoted 38 lines · Alistair Francis
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 4 lines
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by Alistair Francis <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Reviewed-by Markus Armbruster <[email protected]>
PATCH v6 6/29 hw/gpio: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/gpio/omap_gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/gpio/omap_gpio.c +1 -1
@@ -399,7 +399,7 @@ static void omap2_gpio_module_write(void *opaque, hwaddr addr,case 0x10 :/* GPIO_SYSCONFIG */ if (((value >>3 ) &3 ) ==3 ) -fprintf (stderr,"%s: bad IDLEMODE value\n" , __func__); +error_report ("%s: bad IDLEMODE value" , __func__);if (value &2 )omap2_gpio_module_reset (s); s->config[0 ] = value &0x1d ;
Signature · 1 line
2.14.1
PATCH v6 7/29 hw/i2c: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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 "I^2C" was manually replaced with "i2c" in hw/i2c/omap_i2c.c.
Signed-off-by Alistair Francis <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V3:
- Replace "I&2C"
V2:
- Split hw patch into individual directories
hw/i2c/omap_i2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
hw/i2c/omap_i2c.c +5 -5
@@ -340,13 +340,13 @@ static void omap_i2c_write(void *opaque, hwaddr addr,break ; }if ((value & (1 <<15 )) && !(value & (1 <<10 ))) {/* MST */ -fprintf (stderr,"%s: I^2C slave mode not supported\n" , - __func__); +error_report ("%s: i2c slave mode not supported" , + __func__);break ; }if ((value & (1 <<15 )) && value & (1 <<8 )) {/* XA */ -fprintf (stderr,"%s: 10-bit addressing mode not supported\n" , - __func__); +error_report ("%s: 10-bit addressing mode not supported" , + __func__);break ; }if ((value & (1 <<15 )) && value & (1 <<0 )) {/* STT */
@@ -393,7 +393,7 @@ static void omap_i2c_write(void *opaque, hwaddr addr,omap_i2c_interrupts_update (s); }if (value & (1 <<15 ))/* ST_EN */ -fprintf (stderr,"%s: System Test not supported\n" , __func__); +error_report ("%s: System Test not supported" , __func__);break ;default :
Signature · 1 line
2.14.1
PATCH v6 9/29 hw/ide: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Reviewed-by Philippe Mathieu-Daud <[email protected]>
Acked-by John Snow <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/ide/ahci.c | 6 +++--- hw/ide/core.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-)
hw/ide/ahci.c +3 -3
@@ -409,8 +409,8 @@ static void ahci_mem_write(void *opaque, hwaddr addr,/* Only aligned reads are allowed on AHCI */ if (addr &3 ) { -fprintf (stderr,"ahci: Mis-aligned write to addr 0x" - TARGET_FMT_plx"\n" , addr); +error_report ("ahci: Mis-aligned write to addr 0x" TARGET_FMT_plx, + addr);return ; }
@@ -1052,7 +1052,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis,g_assert (is_ncq (ncq_fis->command));if (ncq_tfs->used) {/* error - already in use */ -fprintf (stderr,"%s: tag %d already used\n" , __func__, tag); +error_report ("%s: tag %d already used" , __func__, tag);return ; }
hw/ide/core.c +1 -2
@@ -2764,8 +2764,7 @@ static int ide_drive_pio_pre_save(void *opaque) idx =transfer_end_table_idx (s->end_transfer_func);if (idx ==-1 ) { -fprintf (stderr,"%s: invalid end_transfer_func for DRQ_STAT\n" , - __func__); +error_report ("%s: invalid end_transfer_func for DRQ_STAT" , __func__); s->end_transfer_fn_idx =2 ; }else { s->end_transfer_fn_idx = idx;
Signature · 1 line
2.14.1
PATCH v6 10/29 hw/intc: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Cc Peter Maydell <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Cornelia Huck <[email protected]>
Cc Alexander Graf <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/intc/arm_gic_kvm.c | 12 ++++++------ hw/intc/omap_intc.c | 4 ++-- hw/intc/openpic.c | 1 + hw/intc/openpic_kvm.c | 8 ++++---- hw/intc/s390_flic_kvm.c | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-)
hw/intc/arm_gic_kvm.c +6 -6
@@ -316,12 +316,12 @@ static void kvm_arm_gic_put(GICState *s) num_cpu = ((reg &0xe0 ) >>5 ) +1 ;if (num_irq < s->num_irq) { -fprintf (stderr,"Restoring %u IRQs, but kernel supports max %d\n" , - s->num_irq, num_irq); +error_report ("Restoring %u IRQs, but kernel supports max %d" , + s->num_irq, num_irq);abort (); }else if (num_cpu != s->num_cpu) { -fprintf (stderr,"Restoring %u CPU interfaces, kernel only has %d\n" , - s->num_cpu, num_cpu); +error_report ("Restoring %u CPU interfaces, kernel only has %d" , + s->num_cpu, num_cpu);/* Did we not create the VCPUs in the kernel yet? */ abort (); }
@@ -411,8 +411,8 @@ static void kvm_arm_gic_get(GICState *s) s->num_cpu = ((reg &0xe0 ) >>5 ) +1 ;if (s->num_irq >GIC_MAXIRQ ) { -fprintf (stderr,"Too many IRQs reported from the kernel: %d\n" , - s->num_irq); +error_report ("Too many IRQs reported from the kernel: %d" , + s->num_irq);abort (); }
hw/intc/omap_intc.c +2 -2
@@ -539,8 +539,8 @@ static void omap2_inth_write(void *opaque, hwaddr addr,/* TODO: Make a bitmap (or sizeof(char)map) of access privileges * for every register, see Chapter 3 and 4 for privileged mode. */ if (value &1 ) -fprintf (stderr,"%s: protection mode enable attempt\n" , - __func__); +error_report ("%s: protection mode enable attempt" , + __func__);return ;case 0x50 :/* INTC_IDLE */
hw/intc/openpic.c +1 -0
@@ -34,6 +34,7 @@* */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h"
hw/intc/openpic_kvm.c +4 -4
@@ -150,8 +150,8 @@ static void kvm_openpic_region_add(MemoryListener *listener, ret =ioctl (opp->fd,KVM_SET_DEVICE_ATTR , &attr);if (ret <0 ) { -fprintf (stderr,"%s: %s %" PRIx64"\n" , __func__, -strerror (errno), reg_base); +error_report ("%s: %s %" PRIx64"" , __func__, +strerror (errno), reg_base); } }
@@ -184,8 +184,8 @@ static void kvm_openpic_region_del(MemoryListener *listener, ret =ioctl (opp->fd,KVM_SET_DEVICE_ATTR , &attr);if (ret <0 ) { -fprintf (stderr,"%s: %s %" PRIx64"\n" , __func__, -strerror (errno), reg_base); +error_report ("%s: %s %" PRIx64"" , __func__, +strerror (errno), reg_base); } }
hw/intc/s390_flic_kvm.c +2 -2
@@ -83,7 +83,7 @@ static void flic_enable_pfault(KVMS390FLICState *flic) rc =ioctl (flic->fd,KVM_SET_DEVICE_ATTR , &attr);if (rc) { -fprintf (stderr,"flic: couldn't enable pfault\n" ); +error_report ("flic: couldn't enable pfault" ); } }
@@ -97,7 +97,7 @@ static void flic_disable_wait_pfault(KVMS390FLICState *flic) rc =ioctl (flic->fd,KVM_SET_DEVICE_ATTR , &attr);if (rc) { -fprintf (stderr,"flic: couldn't disable pfault\n" ); +error_report ("flic: couldn't disable pfault" ); } }
Signature · 1 line
2.14.1
PATCH v6 11/29 hw/ipmi: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V3:
- Remove left over include
V2:
- Split hw patch into individual directories
hw/ipmi/ipmi_bmc_extern.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
hw/ipmi/ipmi_bmc_extern.c +3 -2
@@ -28,6 +28,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu/timer.h" #include "chardev/char-fe.h"
@@ -194,8 +195,8 @@ static void ipmi_bmc_extern_handle_command(IPMIBmc *b,if (ibe->outlen) {/* We already have a command queued. Shouldn't ever happen. */ -fprintf (stderr,"IPMI KCS: Got command when not finished with the" -" previous command\n" ); +error_report ("IPMI KCS: Got command when not finished with the" +" previous command" );abort (); }
Signature · 1 line
2.14.1
PATCH v6 12/29 hw/isa: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/isa/isa-bus.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
hw/isa/isa-bus.c +4 -3
@@ -17,6 +17,7 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "monitor/monitor.h"
@@ -186,15 +187,15 @@ ISADevice *isa_vga_init(ISABus *bus)case VGA_CIRRUS :return isa_create_simple (bus,"isa-cirrus-vga" );case VGA_QXL : -fprintf (stderr,"%s: qxl: no PCI bus\n" , __func__); +error_report ("%s: qxl: no PCI bus" , __func__);return NULL ;case VGA_STD :return isa_create_simple (bus,"isa-vga" );case VGA_VMWARE : -fprintf (stderr,"%s: vmware_vga: no PCI bus\n" , __func__); +error_report ("%s: vmware_vga: no PCI bus" , __func__);return NULL ;case VGA_VIRTIO : -fprintf (stderr,"%s: virtio-vga: no PCI bus\n" , __func__); +error_report ("%s: virtio-vga: no PCI bus" , __func__);return NULL ;case VGA_NONE :default :
Signature · 1 line
2.14.1
PATCH v6 13/29 hw/lm32: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Cc Michael Walle <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Acked-by Michael Walle <[email protected]>
---
V2:
- Split hw patch into individual directories
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.14.1
PATCH v6 14/29 hw/mips: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Cc Paul Burton <[email protected]>
Cc Aurelien Jarno <[email protected]>
Cc Yongbok Kim <[email protected]>
Cc "Hervé Poussineau" <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Reviewed-by Hervé Poussineau <[email protected]
---
V2:
- Split hw patch into individual directories
hw/mips/boston.c | 4 ++-- 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 | 18 ++++++++---------- 6 files changed, 30 insertions(+), 36 deletions(-)
hw/mips/boston.c +2 -2
@@ -353,7 +353,7 @@ static const void *boston_fdt_filter(void *opaque, const void *fdt_orig, err =fdt_open_into (fdt_orig, fdt, fdt_sz);if (err) { -fprintf (stderr,"unable to open FDT\n" ); +error_report ("unable to open FDT" );return NULL ; }
@@ -361,7 +361,7 @@ static const void *boston_fdt_filter(void *opaque, const void *fdt_orig, ? machine->kernel_cmdline :" " ; err =qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline);if (err <0 ) { -fprintf (stderr,"couldn't set /chosen/bootargs\n" ); +error_report ("couldn't set /chosen/bootargs" );return NULL ; }
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 +8 -10
@@ -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);
@@ -239,7 +237,7 @@ void mips_r4k_init(MachineState *machine) blk_by_legacy_dinfo(dinfo), sector_len, mips_rom / sector_len, 4, 0, 0, 0, 0, be)) { -fprintf (stderr,"qemu: Error registering flash memory.\n" ); +error_report ("Error registering flash memory." ); } }else if (!qtest_enabled ()) {/* not fatal */
Signature · 1 line
2.14.1
PATCH v6 15/29 hw/moxie: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Cc Anthony Green <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Reviewed-by Thomas Huth <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/moxie/moxiesim.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
hw/moxie/moxiesim.c +7 -7
@@ -25,6 +25,7 @@* THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
@@ -60,8 +61,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 ); }
@@ -74,9 +75,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,
@@ -84,8 +84,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.14.1
PATCH v6 16/29 hw/nios2: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Cc Chris Wulff <[email protected]>
Cc Marek Vasut <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/nios2/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/nios2/boot.c +1 -1
@@ -95,7 +95,7 @@ static int nios2_load_dtb(struct nios2_boot_info bi, const uint32_t ramsize, r =qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , kernel_cmdline);if (r <0 ) { -fprintf (stderr,"couldn't set /chosen/bootargs\n" ); +error_report ("couldn't set /chosen/bootargs" ); } }
Signature · 1 line
2.14.1
PATCH v6 17/29 hw/nvram: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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 message in put_unused() was removed and replaced with g_assert_not_reached() and some of the messages were updated.
Signed-off-by Alistair Francis <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V3:
- Add g_assert_not_reached() in unused function
V2:
- Split hw patch into individual directories
hw/nvram/eeprom93xx.c | 7 ++++--- hw/nvram/fw_cfg.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)
hw/nvram/eeprom93xx.c +4 -3
@@ -36,6 +36,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/nvram/eeprom93xx.h"
@@ -105,9 +106,9 @@ static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size,static int put_unused (QEMUFile *f,void *pv,size_t size,VMStateField *field,QJSON *vmdesc) { -fprintf (stderr,"uint16_from_uint8 is used only for backwards compatibility.\n" ); -fprintf (stderr,"Never should be used to write a new state.\n" ); -exit (0 ); +error_report ("uint16_from_uint8 is used only for backwards compatibility." ); +error_report ("It should never be used to write a new state." ); +g_assert_not_reached ();return 0 ; }
hw/nvram/fw_cfg.c +2 -2
@@ -518,8 +518,8 @@ static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size,static int put_unused (QEMUFile *f,void *pv,size_t size,VMStateField *field,QJSON *vmdesc) { -fprintf (stderr,"uint32_as_uint16 is only used for backward compatibility.\n" ); -fprintf (stderr,"This functions shouldn't be called.\n" ); +error_report ("uint32_as_uint16 is only used for backward compatibility." ); +g_assert_not_reached ();return 0 ; }
Signature · 1 line
2.14.1
PATCH v6 18/29 hw/openrisc: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Cc Jia Liu <[email protected]>
Cc Stafford Horne <[email protected]>
Acked-by Stafford Horne <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V2:
- Split hw patch into individual directories
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.14.1
PATCH v6 19/29 hw/pci*: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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
Signed-off-by Alistair Francis <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
Cc Marcel Apfelbaum <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Reviewed-by Marcel Apfelbaum <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/pci-host/bonito.c | 6 +++--- hw/pci/pci.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 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 +6 -6
@@ -525,8 +525,8 @@ static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size,for (i =0 ; i <PCI_NUM_PINS ; ++i) { irq_state[i] =qemu_get_be32 (f);if (irq_state[i] !=0x1 && irq_state[i] !=0 ) { -fprintf (stderr,"irq state %d: must be 0 or 1.\n" , - irq_state[i]); +error_report ("irq state %d: must be 0 or 1" , + irq_state[i]);return -EINVAL ; } }
@@ -688,7 +688,7 @@ static PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root,unsigned slot;if (!root) { -fprintf (stderr,"No primary PCI bus\n" ); +error_report ("No primary PCI bus" );return NULL ; }
@@ -704,7 +704,7 @@ static PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, }if (dom !=0 ) { -fprintf (stderr,"No support for non-zero PCI domains\n" ); +error_report ("No support for non-zero PCI domains" );return NULL ; }
@@ -1128,8 +1128,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.14.1
PATCH v6 20/29 hw/ppc: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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.
Signed-off-by Alistair Francis <[email protected]>
Acked-by David Gibson <[email protected]>
---
V6:
- Fix indentation
- Add curly braces
V2:
- Split hw patch into individual directories
hw/ppc/e500.c | 28 ++++++++++++++-------------- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/mpc8544_guts.c | 7 ++++--- hw/ppc/ppc405_boards.c | 15 ++++++--------- hw/ppc/ppc440_bamboo.c | 27 ++++++++++++++------------- hw/ppc/ppc4xx_pci.c | 3 ++- hw/ppc/prep.c | 4 ++-- hw/ppc/virtex_ml507.c | 9 +++++---- 9 files changed, 49 insertions(+), 48 deletions(-)
hw/ppc/e500.c +14 -14
@@ -333,13 +333,13 @@ static int ppce500_load_device_tree(MachineState *machine, ret =qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-start" , initrd_base);if (ret <0 ) { -fprintf (stderr,"couldn't set /chosen/linux,initrd-start\n" ); +error_report ("couldn't set /chosen/linux,initrd-start" ); } ret =qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , (initrd_base + initrd_size));if (ret <0 ) { -fprintf (stderr,"couldn't set /chosen/linux,initrd-end\n" ); +error_report ("couldn't set /chosen/linux,initrd-end" ); } }
@@ -352,8 +352,9 @@ static int ppce500_load_device_tree(MachineState *machine, ret =qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , machine->kernel_cmdline); -if (ret <0 ) -fprintf (stderr,"couldn't set /chosen/bootargs\n" ); +if (ret <0 ) { +error_report ("couldn't set /chosen/bootargs" ); + }if (kvm_enabled ()) {/* Read out host's frequencies */
@@ -722,8 +723,7 @@ static DeviceState *ppce500_init_mpic_kvm(PPCE500Params *params,CPU_FOREACH (cs) {if (kvm_openpic_connect_vcpu (dev, cs)) { -fprintf (stderr,"%s: failed to connect vcpu to irqchip\n" , - __func__); +error_report ("%s: failed to connect vcpu to irqchip" , __func__);abort (); } }
@@ -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/mpc8544_guts.c +4 -3
@@ -18,6 +18,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h"
@@ -83,7 +84,7 @@ static uint64_t mpc8544_guts_read(void *opaque, hwaddr addr, value = env->spr[SPR_E500_SVR ];break ;default : -fprintf (stderr,"guts: Unknown register read: %x\n" , (int )addr); +error_report ("guts: Unknown register read: %x" , (int )addr);break ; }
@@ -102,8 +103,8 @@ static void mpc8544_guts_write(void *opaque, hwaddr addr, }break ;default : -fprintf (stderr,"guts: Unknown register write: %x = %x\n" , - (int )addr, (unsigned )value); +error_report ("guts: Unknown register write: %x = %x" , + (int )addr, (unsigned )value);break ; } }
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 +14 -13
@@ -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"
@@ -80,22 +81,23 @@ static int bamboo_load_device_tree(hwaddr addr, ret =qemu_fdt_setprop (fdt,"/memory" ,"reg" , mem_reg_property,sizeof (mem_reg_property));if (ret <0 ) -fprintf (stderr,"couldn't set /memory/reg\n" ); +error_report ("couldn't set /memory/reg" ); ret =qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-start" , initrd_base);if (ret <0 ) -fprintf (stderr,"couldn't set /chosen/linux,initrd-start\n" ); +error_report ("couldn't set /chosen/linux,initrd-start" ); ret =qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , (initrd_base + initrd_size));if (ret <0 ) -fprintf (stderr,"couldn't set /chosen/linux,initrd-end\n" ); +error_report ("couldn't set /chosen/linux,initrd-end" ); ret =qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , kernel_cmdline); -if (ret <0 ) -fprintf (stderr,"couldn't set /chosen/bootargs\n" ); +if (ret <0 ) { +error_report ("couldn't set /chosen/bootargs" ); + }/* Copy data from the host device tree into the guest. Since the guest can * directly access the timebase without host involvement, we must expose
@@ -186,8 +188,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 +222,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 +263,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 +274,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 +284,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/ppc4xx_pci.c +2 -1
@@ -20,6 +20,7 @@* 4xx SoCs, such as the 440EP. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h"
@@ -254,7 +255,7 @@ static void ppc4xx_pci_set_irq(void *opaque, int irq_num, int level)trace_ppc4xx_pci_set_irq (irq_num);if (irq_num <0 ) { -fprintf (stderr,"%s: PCI irq %d\n" , __func__, irq_num); +error_report ("%s: PCI irq %d" , __func__, irq_num);return ; }qemu_set_irq (pci_irqs[irq_num], level);
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 +5 -4
@@ -186,8 +186,9 @@ static int xilinx_load_device_tree(hwaddr addr, } r =qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , kernel_cmdline); -if (r <0 ) -fprintf (stderr,"couldn't set /chosen/bootargs\n" ); +if (r <0 ) { +error_report ("couldn't set /chosen/bootargs" ); + }cpu_physical_memory_write (addr, fdt, fdt_size);return fdt_size; }
@@ -215,8 +216,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.14.1
PATCH v6 21/29 hw/s390x: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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.
One fprintf(stderr, was manually converted to a
qemu_log_mask(LOG_GUEST_ERROR,
Signed-off-by Alistair Francis <[email protected]>
Reviewed-by Thomas Huth <[email protected]>
---
V3:
- Use a qemu_log_mask(LOG_GUEST_ERROR,
V2:
- Split hw patch into individual directories
hw/s390x/virtio-ccw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
hw/s390x/virtio-ccw.c +3 -2
@@ -426,8 +426,9 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)* passes us zeroes for those we don't support. */ if (features.features) { -fprintf (stderr,"Guest bug: features[%i]=%x (expected 0)\n" , - features.index, features.features); +qemu_log_mask (LOG_GUEST_ERROR , +"Guest bug: features[%i]=%x (expected 0)" , + features.index, features.features);/* XXX: do a unit check here? */ } }
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v6 21/29] hw/s390x: Replace fprintf(stderr, "*\n" with error_report()
Quoted 60 lines · On Wed, 20 Dec 2017 09:24:41 -0800 Alistair Francis…
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.
One fprintf(stderr, was manually converted to a
qemu_log_mask(LOG_GUEST_ERROR,Signed-off-by Alistair Francis <[email protected]>Reviewed-by Thomas Huth <[email protected]>---
V3:
- Use a qemu_log_mask(LOG_GUEST_ERROR,
V2:
- Split hw patch into individual directorieshw/s390x/virtio-ccw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/s390x/virtio-ccw.c +0
-0@@ -426,8 +426,9 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)* passes us zeroes for those we don't support.
hw/s390x/virtio-ccw.c static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) · line 434
Quoted 10 lines
hw/s390x/virtio-ccw.c +3
-2*/ if (features.features) { -fprintf (stderr,"Guest bug: features[%i]=%x (expected 0)\n" , - features.index, features.features); +qemu_log_mask (LOG_GUEST_ERROR , +"Guest bug: features[%i]=%x (expected 0)" , + features.index, features.features);/* XXX: do a unit check here? */ } }
I'll queue this to s390-next so this doesn't get lost.
I'll also tweak the commit message, as nothing is converted to error_report().
Re: [Qemu-devel] [PATCH v6 21/29] hw/s390x: Replace fprintf(stderr, "*\n" with error_report()
Quoted 76 lines · Cornelia Huck
Quoted 60 lines · On Wed, 20 Dec 2017 09:24:41 -0800 Alistair Francis…
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.
One fprintf(stderr, was manually converted to a
qemu_log_mask(LOG_GUEST_ERROR,Signed-off-by Alistair Francis <[email protected]>Reviewed-by Thomas Huth <[email protected]>---
V3:
- Use a qemu_log_mask(LOG_GUEST_ERROR,
V2:
- Split hw patch into individual directorieshw/s390x/virtio-ccw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/s390x/virtio-ccw.c +0
-0@@ -426,8 +426,9 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)* passes us zeroes for those we don't support. hw/s390x/virtio-ccw.c static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) · line 434
Quoted 10 lines
hw/s390x/virtio-ccw.c +3
-2*/ if (features.features) { -fprintf (stderr,"Guest bug: features[%i]=%x (expected 0)\n" , - features.index, features.features); +qemu_log_mask (LOG_GUEST_ERROR , +"Guest bug: features[%i]=%x (expected 0)" , + features.index, features.features);/* XXX: do a unit check here? */ } }I'll queue this to s390-next so this doesn't get lost.
Quoted 2 lines
I'll also tweak the commit message, as nothing is converted to
error_report().
Thanks!
Alistair
PATCH v6 23/29 hw/sd: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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.
Signed-off-by Alistair Francis <[email protected]>
Reviewed-by Philippe Mathieu-Daud <[email protected]>
---
V3:
- Fixup some DPRINTF() prints being wrong
V2:
- Split hw patch into individual directories
hw/sd/pl181.c | 5 +++-- hw/sd/sd.c | 15 ++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-)
hw/sd/pl181.c +3 -2
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/sysbus.h"
@@ -146,7 +147,7 @@ static void pl181_fifo_push(PL181State *s, uint32_t value)int n;if (s->fifo_len ==PL181_FIFO_LEN ) { -fprintf (stderr,"pl181: FIFO overflow\n" ); +error_report ("pl181: FIFO overflow" );return ; } n = (s->fifo_pos + s->fifo_len) & (PL181_FIFO_LEN -1 );
@@ -160,7 +161,7 @@ static uint32_t pl181_fifo_pop(PL181State *s)uint32_t value;if (s->fifo_len ==0 ) { -fprintf (stderr,"pl181: FIFO underflow\n" ); +error_report ("pl181: FIFO underflow" );return 0 ; } value = s->fifo[s->fifo_pos];
hw/sd/sd.c +8 -7
@@ -700,7 +700,7 @@ static void sd_lock_command(SDState *sd) sd->card_status &= ~CARD_IS_LOCKED ; sd->pwd_len =0 ;/* Erasing the entire card here! */ -fprintf (stderr,"SD: Card force-erased by CMD42\n" ); +error_report ("SD: Card force-erased by CMD42" );return ; }
@@ -1282,7 +1282,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,return sd_r1;case 56 :/* CMD56: GEN_CMD */ -fprintf (stderr,"SD: GEN_CMD 0x%08x\n" , req.arg); +error_report ("SD: GEN_CMD 0x%08x" , req.arg);switch (sd->state) {case sd_transfer_state:
@@ -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); }
@@ -1580,14 +1581,14 @@ static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)DPRINTF ("sd_blk_read: addr = 0x%08llx, len = %d\n" , (unsigned long long ) addr, len);if (!sd->blk ||blk_pread (sd->blk, addr, sd->data, len) <0 ) { -fprintf (stderr,"sd_blk_read: read error on host side\n" ); +error_report ("sd_blk_read: read error on host side" ); } }static void sd_blk_write (SDState *sd,uint64_t addr,uint32_t len) {if (!sd->blk ||blk_pwrite (sd->blk, addr, sd->data, len,0 ) <0 ) { -fprintf (stderr,"sd_blk_write: write error on host side\n" ); +error_report ("sd_blk_write: write error on host side" ); } }
Signature · 1 line
2.14.1
PATCH v6 24/29 hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Cc Fabien Chouteau <[email protected]>
Cc Mark Cave-Ayland <[email protected]>
Cc Artyom Tarasenko <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Acked-by Mark Cave-Ayland <[email protected]>
---
V2:
- Split hw patch into individual directories
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"
@@ -166,8 +167,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 */
@@ -179,8 +179,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 ); } }
@@ -327,7 +327,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.14.1
PATCH v6 25/29 hw/ssi: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/ssi/omap_spi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
hw/ssi/omap_spi.c +3 -2
@@ -20,6 +20,7 @@* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/arm/omap.h"
@@ -295,9 +296,9 @@ static void omap_mcspi_write(void *opaque, hwaddr addr,if ((value ^ s->ch[ch].config) & (3 <<14 ))/* DMAR | DMAW */ omap_mcspi_dmarequest_update (s->ch + ch);if (((value >>12 ) &3 ) ==3 )/* TRM */ -fprintf (stderr,"%s: invalid TRM value (3)\n" , __func__); +error_report ("%s: invalid TRM value (3)" , __func__);if (((value >>7 ) &0x1f ) <3 )/* WL */ -fprintf (stderr,"%s: invalid WL value (%" PRIx64")\n" , +error_report ("%s: invalid WL value (%" PRIx64")" , __func__, (value >>7 ) &0x1f ); s->ch[ch].config = value &0x7fffff ;break ;
Signature · 1 line
2.14.1
PATCH v6 26/29 hw/timer: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V6:
- Fix indentation
V2:
- Split hw patch into individual directories
hw/timer/omap_gptimer.c | 12 ++++++------ hw/timer/twl92230.c | 3 +-- hw/timer/xilinx_timer.c | 10 +++++----- 3 files changed, 12 insertions(+), 13 deletions(-)
hw/timer/omap_gptimer.c +6 -6
@@ -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 "hw/hw.h" #include "qemu/timer.h" #include "hw/arm/omap.h"
@@ -356,8 +357,7 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr,case 0x10 :/* TIOCP_CFG */ s->config = value &0x33d ;if (((value >>3 ) &3 ) ==3 )/* IDLEMODE */ -fprintf (stderr,"%s: illegal IDLEMODE value in TIOCP_CFG\n" , - __func__); +error_report ("%s: illegal IDLEMODE value in TIOCP_CFG" , __func__);if (value &2 )/* SOFTRESET */ omap_gp_timer_reset (s);break ;
@@ -394,11 +394,11 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr, s->ar = (value >>1 ) &1 ; s->st = (value >>0 ) &1 ;if (s->inout && s->trigger != gpt_trigger_none) -fprintf (stderr,"%s: GP timer pin must be an output " -"for this trigger mode\n" , __func__); +error_report ("%s: GP timer pin must be an output " +"for this trigger mode" , __func__);if (!s->inout && s->capture != gpt_capture_none) -fprintf (stderr,"%s: GP timer pin must be an input " -"for this capture mode\n" , __func__); +error_report ("%s: GP timer pin must be an input " +"for this capture mode" , __func__);if (s->trigger == gpt_trigger_none)omap_gp_timer_out (s, s->scpwm);/* TODO: make sure this doesn't overflow 32-bits */
hw/timer/twl92230.c +1 -2
@@ -614,8 +614,7 @@ static void menelaus_write(void *opaque, uint8_t addr, uint8_t value)break ; rtc_badness:default : -fprintf (stderr,"%s: bad RTC_UPDATE value %02x\n" , - __func__, value); +error_report ("%s: bad RTC_UPDATE value %02x" , __func__, value); s->status |=1 <<10 ;/* RTCERR */ menelaus_update (s); }
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.14.1
PATCH v6 27/29 hw/xen*: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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,
Signed-off-by Alistair Francis <[email protected]>
Cc Stefano Stabellini <[email protected]>
Cc Anthony Perard <[email protected]>
Acked-by Anthony PERARD <[email protected]>
Reviewed-by Thomas Huth <[email protected]>
---
V3:
- Don't change xen_pt_log()
V2:
- Split hw patch into individual directories
hw/xen/xen-common.c | 11 ++++++----- hw/xenpv/xen_domainbuild.c | 24 ++++++++++++------------ hw/xenpv/xen_machine_pv.c | 9 +++++---- 3 files changed, 23 insertions(+), 21 deletions(-)
hw/xen/xen-common.c +6 -5
@@ -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"
@@ -47,19 +48,19 @@ static int store_dev_info(int domid, Chardev *cs, const char *string)/* We now have everything we need to set the xenstore entry. */ xs =xs_open (0 );if (xs ==NULL ) { -fprintf (stderr,"Could not contact XenStore\n" ); +error_report ("Could not contact XenStore" ); goto out; } path =xs_get_domain_path (xs, domid);if (path ==NULL ) { -fprintf (stderr,"xs_get_domain_path() error\n" ); +error_report ("xs_get_domain_path() error" ); goto out; } newpath =realloc (path, (strlen (path) +strlen (string) +strlen ("/tty" ) +1 ));if (newpath ==NULL ) { -fprintf (stderr,"realloc error\n" ); +error_report ("realloc error" ); goto out; } path = newpath;
@@ -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_domainbuild.c +12 -12
@@ -25,22 +25,22 @@ static int xenstore_domain_mkdir(char *path)int i;if (!xs_mkdir (xenstore,0 , path)) { -fprintf (stderr,"%s: xs_mkdir %s: failed\n" , __func__, path); -return -1 ; +error_report ("%s: xs_mkdir %s: failed" , __func__, path); +return -1 ; }if (!xs_set_permissions (xenstore,0 , path, perms_ro,2 )) { -fprintf (stderr,"%s: xs_set_permissions failed\n" , __func__); -return -1 ; +error_report ("%s: xs_set_permissions failed" , __func__); +return -1 ; }for (i =0 ; writable[i]; i++) {snprintf (subpath,sizeof (subpath),"%s/%s" , path, writable[i]);if (!xs_mkdir (xenstore,0 , subpath)) { -fprintf (stderr,"%s: xs_mkdir %s: failed\n" , __func__, subpath); +error_report ("%s: xs_mkdir %s: failed" , __func__, subpath);return -1 ; }if (!xs_set_permissions (xenstore,0 , subpath, perms_rw,2 )) { -fprintf (stderr,"%s: xs_set_permissions failed\n" , __func__); +error_report ("%s: xs_set_permissions failed" , __func__);return -1 ; } }
@@ -235,7 +235,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk,memcpy (uuid, &qemu_uuid,sizeof (uuid)); rc =xen_domain_create (xen_xc, ssidref, uuid, flags, &xen_domid);if (rc <0 ) { -fprintf (stderr,"xen: xc_domain_create() failed\n" ); +error_report ("xen: xc_domain_create() failed" ); goto err; }qemu_log ("xen: created domain %d\n" , xen_domid);
@@ -248,21 +248,21 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, rc =xc_domain_max_vcpus (xen_xc, xen_domid, smp_cpus);if (rc <0 ) { -fprintf (stderr,"xen: xc_domain_max_vcpus() failed\n" ); +error_report ("xen: xc_domain_max_vcpus() failed" ); goto err; }#if 0 rc =xc_domain_setcpuweight (xen_xc, xen_domid,256 );if (rc <0 ) { -fprintf (stderr,"xen: xc_domain_setcpuweight() failed\n" ); +error_report ("xen: xc_domain_setcpuweight() failed" ); goto err; }#endif rc =xc_domain_setmaxmem (xen_xc, xen_domid, ram_size >>10 );if (rc <0 ) { -fprintf (stderr,"xen: xc_domain_setmaxmem() failed\n" ); +error_report ("xen: xc_domain_setmaxmem() failed" ); goto err; }
@@ -275,7 +275,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, xenstore_port, &xenstore_mfn, console_port, &console_mfn);if (rc <0 ) { -fprintf (stderr,"xen: xc_linux_build() failed\n" ); +error_report ("xen: xc_linux_build() failed" ); goto err; }
@@ -285,7 +285,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk,qemu_log ("xen: unpausing domain %d\n" , xen_domid); rc =xc_domain_unpause (xen_xc, xen_domid);if (rc <0 ) { -fprintf (stderr,"xen: xc_domain_unpause() failed\n" ); +error_report ("xen: xc_domain_unpause() failed" ); goto err; }
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.14.1
PATCH v6 28/29 tcg: Replace fprintf(stderr, "*\n" with error_report()
In reply to Alistair FrancisReplace 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}' \
{} +Signed-off-by Alistair Francis <[email protected]>
Cc Paolo Bonzini <[email protected]>
Cc Peter Crosthwaite <[email protected]>
Cc Richard Henderson <[email protected]>
Cc Stefan Weil <[email protected]>
---
cpus.c | 10 +++++----- exec.c | 20 ++++++++++---------- tcg/optimize.c | 8 ++++---- tcg/tcg.c | 2 +- tcg/tcg.h | 3 ++- tcg/tci.c | 3 +-- tcg/tci/tcg-target.inc.c | 7 +++---- vl.c | 2 +- 8 files changed, 27 insertions(+), 28 deletions(-)
cpus.c +5 -5
@@ -258,7 +258,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 */
@@ -1113,7 +1113,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 ); }
@@ -1143,7 +1143,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;
@@ -1527,8 +1527,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 +10 -10
@@ -1068,7 +1068,7 @@ static RAMBlock *qemu_get_ram_block(ram_addr_t addr) } } -fprintf (stderr,"Bad ram offset %" PRIx64"\n" , (uint64_t )addr); +error_report ("Bad ram offset %" PRIx64"" , (uint64_t )addr);abort (); found:
@@ -1681,8 +1681,8 @@ static ram_addr_t find_ram_offset(ram_addr_t size) }if (offset ==RAM_ADDR_MAX ) { -fprintf (stderr,"Failed to find gap of requested size: %" PRIu64"\n" , - (uint64_t )size); +error_report ("Failed to find gap of requested size: %" PRIu64"" , + (uint64_t )size);abort (); }
@@ -1711,8 +1711,8 @@ static void qemu_ram_setup_dump(void *addr, ram_addr_t size) ret =qemu_madvise (addr, size,QEMU_MADV_DONTDUMP );if (ret) {perror ("qemu_madvise" ); -fprintf (stderr,"madvise doesn't support MADV_DONTDUMP, " -"but dump_guest_core=off specified\n" ); +error_report ("madvise doesn't support MADV_DONTDUMP, " +"but dump_guest_core=off specified" ); } } }
@@ -1748,8 +1748,8 @@ void qemu_ram_set_idstr(RAMBlock *new_block, const char *name, DeviceState *dev)RAMBLOCK_FOREACH (block) {if (block != new_block && !strcmp (block->idstr, new_block->idstr)) { -fprintf (stderr,"RAMBlock \"%s\" already registered, abort!\n" , - new_block->idstr); +error_report ("RAMBlock \"%s\" already registered, abort!" , + new_block->idstr);abort (); } }
@@ -2176,9 +2176,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);
tcg/optimize.c +4 -4
@@ -122,8 +122,8 @@ static TCGOpcode op_to_mov(TCGOpcode op)case 64 :return INDEX_op_mov_i64;default : -fprintf (stderr,"op_to_mov: unexpected return value of " -"function op_bits.\n" ); +error_report ("op_to_mov: unexpected return value of " +"function op_bits." );tcg_abort (); } }
@@ -136,8 +136,8 @@ static TCGOpcode op_to_movi(TCGOpcode op)case 64 :return INDEX_op_movi_i64;default : -fprintf (stderr,"op_to_movi: unexpected return value of " -"function op_bits.\n" ); +error_report ("op_to_movi: unexpected return value of " +"function op_bits." );tcg_abort (); } }
tcg/tcg.c +1 -1
@@ -1035,7 +1035,7 @@ static void tcg_temp_free_internal(TCGTemp *ts)#if defined(CONFIG_DEBUG_TCG ) s->temps_in_use--;if (s->temps_in_use <0 ) { -fprintf (stderr,"More temporaries freed than allocated!\n" ); +error_report ("More temporaries freed than allocated!" ); }#endif
tcg/tcg.h +2 -1
@@ -29,6 +29,7 @@#include "cpu.h" #include "exec/tb-context.h" #include "qemu/bitops.h" +#include "qemu/error-report.h" #include "tcg-mo.h" #include "tcg-target.h"
@@ -948,7 +949,7 @@ typedef struct TCGTargetOpDef {#define tcg_abort () \ do {\ - fprintf(stderr, "%s:%d: tcg fatal error\n", __FILE__, __LINE__);\ + error_report("%s:%d: tcg fatal error", __FILE__, __LINE__);\ abort();\ } while (0)
tcg/tci.c +1 -2
@@ -35,8 +35,7 @@/* Marker for missing code. */ #define TODO () \ do { \ - fprintf(stderr, "TODO %s:%u: %s()\n", \ - __FILE__, __LINE__, __func__); \ + error_report("TODO %s:%u: %s()", __FILE__, __LINE__, __func__); \ tcg_abort(); \ } while (0)
tcg/tci/tcg-target.inc.c +3 -4
@@ -29,8 +29,7 @@/* Marker for missing code. */ #define TODO () \ do { \ - fprintf(stderr, "TODO %s:%u: %s()\n", \ - __FILE__, __LINE__, __func__); \ + error_report("TODO %s:%u: %s()", __FILE__, __LINE__, __func__); \ tcg_abort(); \ } while (0)
@@ -403,8 +402,8 @@ static const char *target_parse_constraint(TCGArgConstraint *ct,void tci_disas (uint8_t opc) {const TCGOpDef *def = &tcg_op_defs[opc]; -fprintf (stderr,"TCG %s %u, %u, %u\n" , - def->name, def->nb_oargs, def->nb_iargs, def->nb_cargs); +error_report ("TCG %s %u, %u, %u" , + def->name, def->nb_oargs, def->nb_iargs, def->nb_cargs); }#endif
vl.c +1 -1
@@ -2187,7 +2187,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.14.1
PATCH v6 29/29 target: Use qemu_log() instead of fprintf(stderr, ...)
In reply to Alistair FrancisConvert 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.
Signed-off-by Alistair Francis <[email protected]>
---
target/cris/translate.c | 2 +- target/ppc/translate.c | 36 ++++++++++-------------------------- target/sh4/translate.c | 7 ++----- target/unicore32/translate.c | 2 +- 4 files changed, 14 insertions(+), 33 deletions(-)
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
@@ -3938,12 +3938,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 ); }
@@ -3955,12 +3951,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
@@ -4101,12 +4093,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 {
@@ -4118,12 +4106,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,
@@ -7365,8 +7349,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
@@ -1787,11 +1787,8 @@ static void _decode_opc(DisasContext * ctx) }break ; } -#if 0 -fprintf (stderr,"unknown instruction 0x%04x at pc 0x%08x\n" , - ctx->opcode, ctx->pc); -fflush (stderr); -#endif +qemu_log_mask (LOG_UNIMP ,"unknown instruction 0x%04x at pc 0x%08x\n" , + ctx->opcode, ctx->pc); 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.14.1
A message that is not in the archive (sent off-list or not yet received): 97bff6488fbc4c6b2c10879798aa149a43426fd9.1513790495.git.alistair.francis@xilinx.com
Eduardo Habkost
Acked-byRe: [Qemu-devel] [PATCH v6 08/29] hw/i386: Replace fprintf(stderr, "*\n" with error_report()
Quoted 40 lines · Alistair Francis
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.
Quoted 8 lines
Signed-off-by Alistair Francis <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Richard Henderson <[email protected]>Cc Eduardo Habkost <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Stefano Stabellini <[email protected]>Cc Anthony Perard <[email protected]>
Acked-by Eduardo Habkost <[email protected]>
Signature · 1 line
Eduardo