Remove some of the fprintf(stderr, "*
Subsystems (2)
v4 cover Remove some of the fprintf(stderr, "*
Continue on improving QEMUs logging/error messages by removing more fprintf()'s.
Unfortunatley my Coccinelle skills aren't that great so it's all done in some nasty regex and a little bit of manual work.
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 (45):
audio: Replace AUDIO_FUNC with __func__
Replace all occurances of __FUNCTION__ with __func__ Fixes after renaming __FUNCTION__ to __func__
tests: Replace fprintf(stderr, "*\n" with error_report() hw/arm: Replace fprintf(stderr, "*\n" with error_report() hw/block: Replace fprintf(stderr, "*\n" with error_report() hw/bt: Replace fprintf(stderr, "*\n" with error_report() hw/char: Replace fprintf(stderr, "*\n" with error_report() hw/core: Replace fprintf(stderr, "*\n" with error_report() hw/cris: Replace fprintf(stderr, "*\n" with error_report() hw/display: 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/input: 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/microblaze: Replace fprintf(stderr, "*\n" with error_report() hw/mips: Replace fprintf(stderr, "*\n" with error_report() hw/misc: Replace fprintf(stderr, "*\n" with error_report() hw/moxie: Replace fprintf(stderr, "*\n" with error_report() hw/net: 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/sh4: 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/usb: Replace fprintf(stderr, "*\n" with error_report() hw/watchdog: Replace fprintf(stderr, "*\n" with error_report() hw/xen*: Replace fprintf(stderr, "*\n" with error_report()
util: Replace fprintf(stderr, "*\n" with error_report()
ui: 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 | 8 ++-- exec.c | 14 +++---- 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 | 6 +-- 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 | 25 +++++------ 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/dataplane/virtio-blk.c | 6 +-- hw/block/nand.c | 4 +- hw/block/onenand.c | 16 +++---- hw/block/tc58128.c | 44 +++++++++----------- hw/bt/core.c | 15 ++++--- hw/bt/hci-csr.c | 21 +++++----- hw/bt/hci.c | 46 ++++++++++---------- hw/bt/hid.c | 4 +- hw/bt/l2cap.c | 49 +++++++++++----------- hw/bt/sdp.c | 11 ++--- hw/char/mcf_uart.c | 5 ++- hw/char/sh_serial.c | 11 +++-- hw/core/loader.c | 43 +++++++++---------- hw/core/ptimer.c | 7 ++-- hw/cris/axis_dev88.c | 3 +- hw/cris/boot.c | 6 +-- hw/display/blizzard.c | 28 ++++++------- hw/display/omap_dss.c | 16 +++---- hw/display/pl110.c | 2 +- hw/display/pxa2xx_lcd.c | 14 +++---- hw/display/qxl-render.c | 9 ++-- hw/display/qxl.c | 10 ++--- hw/display/qxl.h | 2 +- hw/display/tc6393xb.c | 38 +++++++++-------- hw/display/virtio-gpu-3d.c | 4 +- hw/display/vmware_vga.c | 22 +++++----- 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 | 9 ++-- hw/i386/kvm/clock.c | 7 ++-- hw/i386/kvm/i8254.c | 7 ++-- 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 | 30 +++++++------- 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 | 8 ++-- hw/input/pckbd.c | 3 +- hw/input/pxa2xx_keypad.c | 6 +-- hw/input/tsc2005.c | 17 ++++---- hw/input/tsc210x.c | 76 +++++++++++++++++----------------- hw/input/virtio-input-hid.c | 14 +++---- hw/input/virtio-input.c | 5 ++- hw/intc/arm_gic_kvm.c | 12 +++--- hw/intc/omap_intc.c | 4 +- hw/intc/openpic.c | 7 ++-- 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/microblaze/boot.c | 2 +- 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/a9scu.c | 3 +- hw/misc/cbus.c | 12 +++--- hw/misc/omap_clk.c | 4 +- hw/misc/omap_gpmc.c | 13 +++--- hw/misc/omap_l4.c | 5 ++- hw/misc/omap_sdrc.c | 5 ++- hw/misc/omap_tap.c | 6 +-- hw/misc/tmp105.c | 2 +- hw/misc/vmport.c | 2 +- hw/moxie/moxiesim.c | 14 +++---- hw/net/fsl_etsec/etsec.c | 2 +- hw/net/pcnet.c | 2 +- hw/net/smc91c111.c | 5 ++- hw/net/vhost_net.c | 16 +++---- hw/nios2/boot.c | 2 +- hw/nvram/eeprom93xx.c | 5 ++- hw/nvram/fw_cfg.c | 5 ++- hw/openrisc/openrisc_sim.c | 4 +- hw/pci-host/bonito.c | 8 ++-- hw/pci/pci.c | 12 +++--- hw/ppc/e500.c | 22 +++++----- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/mpc8544_guts.c | 5 ++- hw/ppc/ppc405_boards.c | 15 +++---- hw/ppc/ppc440_bamboo.c | 22 +++++----- hw/ppc/ppc4xx_pci.c | 3 +- hw/ppc/prep.c | 4 +- hw/ppc/virtex_ml507.c | 4 +- hw/s390x/virtio-ccw.c | 5 ++- hw/scsi/lsi53c895a.c | 4 +- hw/scsi/spapr_vscsi.c | 49 +++++++++++----------- hw/scsi/virtio-scsi-dataplane.c | 6 +-- hw/sd/pl181.c | 5 ++- hw/sd/pxa2xx_mmci.c | 6 +-- hw/sd/sd.c | 15 +++---- hw/sh4/r2d.c | 9 ++-- hw/sh4/sh7750.c | 64 ++++++++++++++-------------- 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 | 13 +++--- hw/timer/twl92230.c | 8 ++-- hw/timer/xilinx_timer.c | 8 ++-- hw/usb/core.c | 15 +++---- hw/usb/desc.c | 6 +-- hw/usb/dev-audio.c | 39 ++++++++--------- hw/usb/dev-bluetooth.c | 4 +- hw/usb/dev-mtp.c | 9 ++-- hw/usb/dev-network.c | 14 +++---- hw/usb/hcd-ehci.c | 32 +++++++------- hw/usb/hcd-musb.c | 4 +- hw/usb/hcd-xhci.c | 3 +- hw/usb/host-legacy.c | 3 +- hw/usb/tusb6010.c | 14 +++---- hw/watchdog/watchdog.c | 11 +++-- hw/watchdog/wdt_i6300esb.c | 10 +++-- 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 | 22 +++++----- target/sh4/translate.c | 4 +- target/unicore32/translate.c | 2 +- tcg/optimize.c | 8 ++-- tcg/tcg.c | 2 +- tcg/tcg.h | 3 +- tcg/tci.c | 2 +- tcg/tci/tcg-target.inc.c | 4 +- tests/Makefile.include | 4 +- tests/ahci-test.c | 3 +- tests/bios-tables-test.c | 5 ++- tests/i440fx-test.c | 8 ++-- tests/libqos/ahci.c | 10 ++--- tests/libqos/libqos.c | 7 ++-- tests/libqos/malloc.c | 13 +++--- tests/libqtest.c | 13 +++--- tests/migration-test.c | 8 ++-- tests/migration/stress.c | 36 ++++++++-------- tests/qemu-iotests/socket_scm_helper.c | 11 ++--- tests/rcutorture.c | 5 ++- tests/tcg/linux-test.c | 2 +- tests/tcg/runcom.c | 6 +-- tests/tcg/test-i386-fprem.c | 2 +- tests/tcg/test_path.c | 4 +- tests/test-hmp.c | 5 ++- tests/test-rcu-list.c | 5 ++- tests/usb-hcd-ehci-test.c | 2 +- tests/vhost-user-bridge.c | 28 ++++++------- ui/cocoa.m | 6 +-- ui/console.c | 2 +- ui/curses.c | 2 +- ui/cursor.c | 12 +++--- ui/gtk.c | 10 ++--- ui/input-linux.c | 3 +- ui/keymaps.c | 4 +- ui/sdl.c | 14 +++---- ui/sdl2.c | 8 ++-- ui/sdl_zoom.c | 3 +- ui/shader.c | 9 ++-- ui/spice-display.c | 10 ++--- ui/vnc-enc-tight.c | 4 +- ui/vnc-enc-zlib.c | 4 +- ui/vnc-enc-zrle.c | 4 +- ui/vnc.c | 2 +- util/aio-posix.c | 1 + util/coroutine-sigaltstack.c | 2 +- util/error.c | 4 +- util/main-loop.c | 2 +- util/mmap-alloc.c | 3 +- util/module.c | 6 +-- util/osdep.c | 4 +- util/oslib-posix.c | 3 +- util/oslib-win32.c | 3 +- util/qemu-coroutine.c | 5 ++- util/qemu-progress.c | 3 +- util/qemu-thread-posix.c | 5 ++- util/qemu-thread-win32.c | 5 ++- util/qemu-timer-common.c | 3 +- util/qht.c | 2 +- vl.c | 2 +- 234 files changed, 1284 insertions(+), 1239 deletions(-)
Signature · 1 line
2.14.1
PATCH v4 1/45 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]>
---
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 v4 2/45 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]>
---
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
@@ -133,7 +133,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
@@ -644,7 +644,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
@@ -1053,7 +1053,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
@@ -156,7 +156,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 }
@@ -193,7 +193,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
@@ -30,7 +30,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
@@ -630,7 +630,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 ();
@@ -657,7 +657,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.xen.org/xen-devel
PATCH v4 3/45 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 v4 4/45 tests: 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 of the error_report()'s were manually kept as fprintf(stderr, ) to maintain standalone test cases.
Signed-off-by Alistair Francis <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
Cc Igor Mammedov <[email protected]>
Cc "Dr. David Alan Gilbert" <[email protected]>
Cc Gerd Hoffmann <[email protected]>
---
V2:
- Keep some of the fprintf() calls
- Remove a file I accidently checked in
tests/Makefile.include | 4 ++-- tests/ahci-test.c | 3 ++- tests/bios-tables-test.c | 5 +++-- tests/i440fx-test.c | 8 ++++---- tests/libqos/ahci.c | 10 +++++----- tests/libqos/libqos.c | 7 ++++--- tests/libqos/malloc.c | 13 ++++++------ tests/libqtest.c | 13 ++++++------ tests/migration-test.c | 8 ++++---- tests/migration/stress.c | 36 +++++++++++++++++----------------- tests/qemu-iotests/socket_scm_helper.c | 11 ++++++----- tests/rcutorture.c | 5 +++-- tests/tcg/linux-test.c | 2 +- tests/tcg/runcom.c | 6 +++--- tests/tcg/test-i386-fprem.c | 2 +- tests/tcg/test_path.c | 4 ++-- tests/test-hmp.c | 5 +++-- tests/test-rcu-list.c | 5 +++-- tests/usb-hcd-ehci-test.c | 2 +- tests/vhost-user-bridge.c | 28 +++++++++++++------------- 20 files changed, 93 insertions(+), 84 deletions(-)
tests/Makefile.include +2 -2
@@ -621,7 +621,7 @@ tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ $(test-io-obj-y) tests/test-timed-average$(EXESUF): tests/test-timed-average.o $(test-util-obj-y) tests/test-base64$(EXESUF): tests/test-base64.o $(test-util-obj-y) -tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o hw/core/ptimer.o +tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o hw/core/ptimer.o $(test-util-obj-y) tests/test-logging$(EXESUF): tests/test-logging.o $(test-util-obj-y)
@@ -788,7 +788,7 @@ tests/migration-test$(EXESUF): tests/migration-test.o tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o $(test-util-obj-y) \ $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y) \ $(chardev-obj-y) -tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o +tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o $(test-util-obj-y) tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-qapi-obj-y) tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)
tests/ahci-test.c +2 -1
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include <getopt.h> #include "libqtest.h"
@@ -1859,7 +1860,7 @@ int main(int argc, char **argv) ahci_pedantic =1 ;break ;default : -fprintf (stderr,"Unrecognized ahci_test option.\n" ); +error_report ("Unrecognized ahci_test option." );g_assert_not_reached (); } }
tests/bios-tables-test.c +3 -2
@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include <glib/gstdio.h> #include "qemu-common.h" #include "hw/smbios/smbios.h"
@@ -396,7 +397,7 @@ try_again: aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, (gchar *)&signature, ext);if (getenv ("V" )) { -fprintf (stderr,"\nLooking for expected file '%s'\n" , aml_file); +error_report ("Looking for expected file '%s'" , aml_file); }if (g_file_test (aml_file,G_FILE_TEST_EXISTS )) { exp_sdt.aml_file = aml_file;
@@ -408,7 +409,7 @@ try_again: }g_assert (exp_sdt.aml_file);if (getenv ("V" )) { -fprintf (stderr,"\nUsing expected file '%s'\n" , aml_file); +error_report ("Using expected file '%s'" , aml_file); } ret =g_file_get_contents (aml_file, &exp_sdt.aml, &exp_sdt.aml_len, &error);
tests/i440fx-test.c +4 -4
@@ -13,7 +13,7 @@*/ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "libqtest.h" #include "libqos/pci.h" #include "libqos/pci-pc.h"
@@ -295,18 +295,18 @@ static char *create_blob_file(void) ret =-1 ; fd =g_file_open_tmp ("blob_XXXXXX" , &pathname, &error);if (fd ==-1 ) { -fprintf (stderr,"unable to create blob file: %s\n" , error->message); +error_report ("unable to create blob file: %s" , error->message);g_error_free (error); }else {if (ftruncate (fd,BLOB_SIZE ) ==-1 ) { -fprintf (stderr,"ftruncate(\"%s\", %zu): %s\n" , pathname, +error_report ("ftruncate(\"%s\", %zu): %s" , pathname,BLOB_SIZE ,strerror (errno)); }else {void *buf; buf =mmap (NULL ,BLOB_SIZE ,PROT_WRITE ,MAP_SHARED , fd,0 );if (buf ==MAP_FAILED ) { -fprintf (stderr,"mmap(\"%s\", %zu): %s\n" , pathname,BLOB_SIZE , +error_report ("mmap(\"%s\", %zu): %s" , pathname,BLOB_SIZE ,strerror (errno)); }else {size_t i;
tests/libqos/ahci.c +5 -5
@@ -23,7 +23,7 @@*/ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "libqtest.h" #include "libqos/ahci.h" #include "libqos/pci-pc.h"
@@ -985,9 +985,9 @@ static void ahci_atapi_command_set_offset(AHCICommand *cmd, uint64_t lba)default :/* SCSI doesn't have uniform packet formats, * so you have to add support for it manually. Sorry! */ -fprintf (stderr,"The Libqos AHCI driver does not support the " +error_report ("The Libqos AHCI driver does not support the " "set_offset operation for ATAPI command 0x%02x, " -"please add support.\n" , +"please add support." , cbd[0 ]);g_assert_not_reached (); }
@@ -1060,8 +1060,8 @@ static void ahci_atapi_set_size(AHCICommand *cmd, uint64_t xbytes)default :/* SCSI doesn't have uniform packet formats, * so you have to add support for it manually. Sorry! */ -fprintf (stderr,"The Libqos AHCI driver does not support the set_size " -"operation for ATAPI command 0x%02x, please add support.\n" , +error_report ("The Libqos AHCI driver does not support the set_size " +"operation for ATAPI command 0x%02x, please add support." , cbd[0 ]);g_assert_not_reached (); }
tests/libqos/libqos.c +4 -3
@@ -1,4 +1,5 @@#include "qemu/osdep.h" +#include "qemu/error-report.h" #include <sys/wait.h> #include "libqtest.h"
@@ -155,7 +156,7 @@ void migrate(QOSState *from, QOSState *to, const char *uri)continue ; } -fprintf (stderr,"Migration did not complete, status: %s\n" , st); +error_report ("Migration did not complete, status: %s" , st);g_assert_not_reached (); }
@@ -199,7 +200,7 @@ void mkimg(const char *file, const char *fmt, unsigned size_mb) fmt, file, size_mb); ret =g_spawn_command_line_sync (cli, &out, &out2, &rc, &err);if (err) { -fprintf (stderr,"%s\n" , err->message); +error_report ("%s" , err->message);g_error_free (err); }g_assert (ret && !err);
@@ -210,7 +211,7 @@ void mkimg(const char *file, const char *fmt, unsigned size_mb)* 0 is only possible if the program exited normally, so that should be * sufficient for our purposes on all platforms, here. */ if (rc) { -fprintf (stderr,"qemu-img returned status code %d\n" , rc); +error_report ("qemu-img returned status code %d" , rc); }g_assert (!rc);
tests/libqos/malloc.c +7 -6
@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "libqos/malloc.h" #include "qemu-common.h" #include "qemu/host-utils.h"
@@ -193,7 +194,7 @@ static uint64_t mlist_alloc(QGuestAllocator *s, uint64_t size) node =mlist_find_space (s->free, size);if (!node) { -fprintf (stderr,"Out of guest memory.\n" ); +error_report ("Out of guest memory." );g_assert_not_reached (); }return mlist_fulfill (s, node, size);
@@ -209,8 +210,8 @@ static void mlist_free(QGuestAllocator *s, uint64_t addr) node =mlist_find_key (s->used, addr);if (!node) { -fprintf (stderr,"Error: no record found for an allocation at " -"0x%016" PRIx64".\n" , +error_report ("Error: no record found for an allocation at " +"0x%016" PRIx64"." , addr);g_assert_not_reached (); }
@@ -234,8 +235,8 @@ void alloc_uninit(QGuestAllocator *allocator)/* Check for guest leaks, and destroy the list. */ QTAILQ_FOREACH_SAFE(node, allocator->used, MLIST_ENTNAME, tmp) {if (allocator->opts & (ALLOC_LEAK_WARN |ALLOC_LEAK_ASSERT )) { -fprintf (stderr,"guest malloc leak @ 0x%016" PRIx64"; " -"size 0x%016" PRIx64".\n" , +error_report ("guest malloc leak @ 0x%016" PRIx64"; " +"size 0x%016" PRIx64"." , node->addr, node->size); }if (allocator->opts & (ALLOC_LEAK_ASSERT )) {
@@ -251,7 +252,7 @@ void alloc_uninit(QGuestAllocator *allocator)if ((allocator->opts & mask) == mask) {if ((node->addr != allocator->start) || (node->size != allocator->end - allocator->start)) { -fprintf (stderr,"Free list is corrupted.\n" ); +error_report ("Free list is corrupted." );g_assert_not_reached (); } }
tests/libqtest.c +7 -6
@@ -15,6 +15,7 @@* */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "libqtest.h" #include <sys/socket.h>
@@ -89,7 +90,7 @@ static int socket_accept(int sock) ret =accept (sock, (struct sockaddr *)&addr, &addrlen); }while (ret ==-1 && errno ==EINTR );if (ret ==-1 ) { -fprintf (stderr,"%s failed: %s\n" , __func__,strerror (errno)); +error_report ("%s failed: %s" , __func__,strerror (errno)); }close (sock);
@@ -155,7 +156,7 @@ static const char *qtest_qemu_binary(void) qemu_bin =getenv ("QTEST_QEMU_BINARY" );if (!qemu_bin) { -fprintf (stderr,"Environment variable QTEST_QEMU_BINARY required\n" ); +error_report ("Environment variable QTEST_QEMU_BINARY required" );exit (1 ); }
@@ -334,7 +335,7 @@ static GString *qtest_recv_line(QTestState *s) }if (len ==-1 || len ==0 ) { -fprintf (stderr,"Broken pipe\n" ); +error_report ("Broken pipe" );exit (1 ); }
@@ -419,7 +420,7 @@ static void qmp_response(JSONMessageParser *parser, GQueue *tokens) obj =json_parser_parse (tokens,NULL );if (!obj) { -fprintf (stderr,"QMP JSON response parsing failed\n" ); +error_report ("QMP JSON response parsing failed" );exit (1 ); }
@@ -445,7 +446,7 @@ QDict *qmp_fd_receive(int fd) }if (len ==-1 || len ==0 ) { -fprintf (stderr,"Broken pipe\n" ); +error_report ("Broken pipe" );exit (1 ); }
@@ -902,7 +903,7 @@ void qtest_bufread(QTestState *s, uint64_t addr, void *data, size_t size)g_base64_decode_inplace (args[1 ], &len);if (size != len) { -fprintf (stderr,"bufread: asked for %zu bytes but decoded %zu\n" , +error_report ("bufread: asked for %zu bytes but decoded %zu" , size, len); len =MIN (len, size); }
tests/migration-test.c +4 -4
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "libqtest.h" #include "qemu/option.h" #include "qemu/range.h"
@@ -214,7 +214,7 @@ static void wait_for_serial(const char *side)break ;default : -fprintf (stderr,"Unexpected %d on %s serial\n" , readvalue, side); +error_report ("Unexpected %d on %s serial" , readvalue, side);g_assert_not_reached (); } }while (true);
@@ -334,9 +334,9 @@ static void check_guests_ram(QTestState *who)*/ hit_edge = true; }else { -fprintf (stderr,"Memory content inconsistency at %x" +error_report ("Memory content inconsistency at %x" " first_byte = %x last_byte = %x current = %x" -" hit_edge = %x\n" , +" hit_edge = %x" , address, first_byte, last_byte, b, hit_edge); bad = true; }
tests/migration/stress.c +18 -18
@@ -47,7 +47,7 @@ static __attribute__((noreturn)) void exit_failure(void)if (getpid () ==1 ) {sync ();reboot (RB_POWER_OFF ); -fprintf (stderr,"%s (%05d): ERROR: cannot reboot: %s\n" , +error_report ("%s (%05d): cannot reboot: %s" , argv0,gettid (),strerror (errno));abort (); }else {
@@ -60,7 +60,7 @@ static __attribute__((noreturn)) void exit_success(void)if (getpid () ==1 ) {sync ();reboot (RB_POWER_OFF ); -fprintf (stderr,"%s (%05d): ERROR: cannot reboot: %s\n" , +error_report ("%s (%05d): cannot reboot: %s" , argv0,gettid (),strerror (errno));abort (); }else {
@@ -76,13 +76,13 @@ static int get_command_arg_str(const char *name,char *start, *end;if (fp ==NULL ) { -fprintf (stderr,"%s (%05d): ERROR: cannot open /proc/cmdline: %s\n" , +error_report ("%s (%05d): cannot open /proc/cmdline: %s" , argv0,gettid (),strerror (errno));return -1 ; }if (!fgets (line,sizeof line, fp)) { -fprintf (stderr,"%s (%05d): ERROR: cannot read /proc/cmdline: %s\n" , +error_report ("%s (%05d): cannot read /proc/cmdline: %s" , argv0,gettid (),strerror (errno));fclose (fp);return -1 ;
@@ -96,8 +96,8 @@ static int get_command_arg_str(const char *name, start +=strlen (name);if (*start !='=' ) { -fprintf (stderr,"%s (%05d): ERROR: no value provided for '%s' in /proc/cmdline\n" , - argv0,gettid (), name); +error_report ("%s (%05d): no value provided for '%s' in /proc/cmdline" , + argv0,gettid (), name); } start++;
@@ -106,8 +106,8 @@ static int get_command_arg_str(const char *name, end =strstr (start,"\n" );if (end == start) { -fprintf (stderr,"%s (%05d): ERROR: no value provided for '%s' in /proc/cmdline\n" , - argv0,gettid (), name); +error_report ("%s (%05d): no value provided for '%s' in /proc/cmdline" , + argv0,gettid (), name);return -1 ; }
@@ -132,7 +132,7 @@ static int get_command_arg_ull(const char *name, errno =0 ; *val =strtoll (valstr, &end,10 );if (errno || *end) { -fprintf (stderr,"%s (%05d): ERROR: cannot parse %s value %s\n" , +error_report ("%s (%05d): cannot parse %s value %s" , argv0,gettid (), name, valstr);free (valstr);return -1 ;
@@ -148,13 +148,13 @@ static int random_bytes(char *buf, size_t len) fd =open ("/dev/urandom" ,O_RDONLY );if (fd <0 ) { -fprintf (stderr,"%s (%05d): ERROR: cannot open /dev/urandom: %s\n" , +error_report ("%s (%05d): cannot open /dev/urandom: %s" , argv0,gettid (),strerror (errno));return -1 ; }if (read (fd, buf, len) != len) { -fprintf (stderr,"%s (%05d): ERROR: cannot read /dev/urandom: %s\n" , +error_report ("%s (%05d): cannot read /dev/urandom: %s" , argv0,gettid (),strerror (errno));close (fd);return -1 ;
@@ -187,12 +187,12 @@ static int stressone(unsigned long long ramsizeMB)unsigned long long before, after;if (!ram) { -fprintf (stderr,"%s (%05d): ERROR: cannot allocate %llu MB of RAM: %s\n" , +error_report ("%s (%05d): cannot allocate %llu MB of RAM: %s" , argv0,gettid (), ramsizeMB,strerror (errno));return -1 ; }if (!data) { -fprintf (stderr,"%s (%d): ERROR: cannot allocate %d bytes of RAM: %s\n" , +error_report ("%s (%d): cannot allocate %d bytes of RAM: %s" , argv0,gettid (),PAGE_SIZE ,strerror (errno));free (ram);return -1 ;
@@ -271,13 +271,13 @@ static int stress(unsigned long long ramsizeGB, int ncpus)static int mount_misc (const char *fstype,const char *dir) {if (mkdir (dir,0755 ) <0 && errno !=EEXIST ) { -fprintf (stderr,"%s (%05d): ERROR: cannot create %s: %s\n" , +error_report ("%s (%05d): cannot create %s: %s" , argv0,gettid (), dir,strerror (errno));return -1 ; }if (mount ("none" , dir, fstype,0 ,NULL ) <0 ) { -fprintf (stderr,"%s (%05d): ERROR: cannot mount %s: %s\n" , +error_report ("%s (%05d): cannot mount %s: %s" , argv0,gettid (), dir,strerror (errno));return -1 ; }
@@ -322,7 +322,7 @@ int main(int argc, char **argv) errno =0 ; ramsizeGB =strtoll (optarg, &end,10 );if (errno !=0 || *end) { -fprintf (stderr,"%s (%05d): ERROR: Cannot parse RAM size %s\n" , +error_report ("%s (%05d): Cannot parse RAM size %s" , argv0,gettid (), optarg);exit_failure (); }
@@ -332,7 +332,7 @@ int main(int argc, char **argv) errno =0 ; ncpus =strtoll (optarg, &end,10 );if (errno !=0 || *end) { -fprintf (stderr,"%s (%05d): ERROR: Cannot parse CPU count %s\n" , +error_report ("%s (%05d): Cannot parse CPU count %s" , argv0,gettid (), optarg);exit_failure (); }
@@ -340,7 +340,7 @@ int main(int argc, char **argv)case '?' :case 'h' : -fprintf (stderr,"%s: [--help][--ramsize GB][--cpus N]\n" , argv0); +error_report ("%s: [--help][--ramsize GB][--cpus N]" , argv0);exit_failure (); } }
tests/qemu-iotests/socket_scm_helper.c +6 -5
@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include <sys/socket.h> #include <sys/un.h>
@@ -53,7 +54,7 @@ static int send_fd(int fd, int fd_to_send) }while (ret <0 && errno ==EINTR );if (ret <0 ) { -fprintf (stderr,"Failed to send msg, reason: %s\n" ,strerror (errno)); +error_report ("Failed to send msg, reason: %s" ,strerror (errno)); }return ret;
@@ -69,14 +70,14 @@ static int get_fd_num(const char *fd_str, bool silent) sock =strtol (fd_str, &err,10 );if (errno) {if (!silent) { -fprintf (stderr,"Failed in strtol for socket fd, reason: %s\n" , +error_report ("Failed in strtol for socket fd, reason: %s" ,strerror (errno)); }return -1 ; }if (!*fd_str || *err || sock <0 ) {if (!silent) { -fprintf (stderr,"bad numerical value for socket fd '%s'\n" , fd_str); +error_report ("bad numerical value for socket fd '%s'" , fd_str); }return -1 ; }
@@ -96,7 +97,7 @@ int main(int argc, char **argv, char **envp)#ifdef SOCKET_SCM_DEBUG int i;for (i =0 ; i < argc; i++) { -fprintf (stderr,"Parameter %d: %s\n" , i, argv[i]); +error_report ("Parameter %d: %s" , i, argv[i]); }#endif
@@ -120,7 +121,7 @@ int main(int argc, char **argv, char **envp)is supposed to fork and exec this program. */ fd =open (argv[2 ],O_RDONLY );if (fd <0 ) { -fprintf (stderr,"Failed to open file '%s'\n" , argv[2 ]); +error_report ("Failed to open file '%s'" , argv[2 ]);return EXIT_FAILURE ; } }
tests/rcutorture.c +3 -2
@@ -61,6 +61,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/atomic.h" #include "qemu/rcu.h" #include "qemu/thread.h"
@@ -86,7 +87,7 @@ static int n_threads;static void create_thread (void *(*func)(void *)) {if (n_threads >=NR_THREADS ) { -fprintf (stderr,"Thread limit of %d exceeded!\n" ,NR_THREADS ); +error_report ("Thread limit of %d exceeded!" ,NR_THREADS );exit (-1 ); } qemu_thread_create(&threads[n_threads], "test", func, &data[n_threads],
@@ -417,7 +418,7 @@ static void gtest_stress_10_5(void)static void usage (int argc,char *argv[]) { -fprintf (stderr,"Usage: %s [nreaders [ perf | stress ] ]\n" , argv[0 ]); +error_report ("Usage: %s [nreaders [ perf | stress ] ]" , argv[0 ]);exit (-1 ); }
tests/tcg/linux-test.c +1 -1
@@ -51,7 +51,7 @@ void error1(const char *filename, int line, const char *fmt, ...)va_start (ap, fmt);fprintf (stderr,"%s:%d: " , filename, line);vfprintf (stderr, fmt, ap); -fprintf (stderr,"\n" ); +error_report ("" );va_end (ap);exit (1 ); }
tests/tcg/runcom.c +3 -3
@@ -61,7 +61,7 @@ void dump_regs(struct vm86_regs *r)#ifdef SIGTEST void alarm_handler (int sig) { -fprintf (stderr,"alarm signal=%d\n" , sig); +error_report ("alarm signal=%d" , sig);alarm (1 ); }#endif
@@ -172,7 +172,7 @@ int main(int argc, char **argv)break ;default : unknown_int: -fprintf (stderr,"unsupported int 0x%02x\n" , int_num); +error_report ("unsupported int 0x%02x" , int_num);dump_regs (&ctx.regs);// exit(1); }
@@ -184,7 +184,7 @@ int main(int argc, char **argv)case VM86_STI :break ;default : -fprintf (stderr,"unhandled vm86 return code (0x%x)\n" , ret); +error_report ("unhandled vm86 return code (0x%x)" , ret);dump_regs (&ctx.regs);exit (1 ); }
tests/tcg/test-i386-fprem.c +1 -1
@@ -340,7 +340,7 @@ static void test_fprem_pairs(void) } } -fprintf (stderr,"test-i386-fprem: tested %llu cases\n" , count); +error_report ("test-i386-fprem: tested %llu cases" , count); }int main (int argc,char **argv)
tests/tcg/test_path.c +2 -2
@@ -150,8 +150,8 @@ int main(int argc, char *argv[]) ret =do_test ();cleanup ();if (ret) { -fprintf (stderr,"test_path: failed on line %i\n" , ret); -return 1 ; +error_report ("test_path: failed on line %i" , ret); +return 1 ; }return 0 ; }
tests/test-hmp.c +3 -2
@@ -15,6 +15,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "libqtest.h" static int verbose;
@@ -79,7 +80,7 @@ static void test_commands(void)for (i =0 ; hmp_cmds[i] !=NULL ; i++) {if (verbose) { -fprintf (stderr,"\t%s\n" , hmp_cmds[i]); +error_report ("\t%s" , hmp_cmds[i]); } response =hmp ("%s" , hmp_cmds[i]);g_free (response);
@@ -102,7 +103,7 @@ static void test_info_commands(void) *endp ='\0' ;/* Now run the info command */ if (verbose) { -fprintf (stderr,"\t%s\n" , info); +error_report ("\t%s" , info); } resp =hmp ("%s" , info);g_free (resp);
tests/test-rcu-list.c +3 -2
@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/atomic.h" #include "qemu/rcu.h" #include "qemu/thread.h"
@@ -64,7 +65,7 @@ static int select_random_el(int max)static void create_thread (void *(*func)(void *)) {if (n_threads >=NR_THREADS ) { -fprintf (stderr,"Thread limit of %d exceeded!\n" ,NR_THREADS ); +error_report ("Thread limit of %d exceeded!" ,NR_THREADS );exit (-1 ); } qemu_thread_create(&threads[n_threads], "test", func, &data[n_threads],
@@ -255,7 +256,7 @@ static void rcu_qtest(const char *test, int duration, int nreaders)static void usage (int argc,char *argv[]) { -fprintf (stderr,"Usage: %s duration nreaders\n" , argv[0 ]); +error_report ("Usage: %s duration nreaders" , argv[0 ]);exit (-1 ); }
tests/usb-hcd-ehci-test.c +1 -1
@@ -42,7 +42,7 @@ static void ehci_port_test(struct qhc *hc, int port, uint32_t expect)uint16_t mask = ~(PORTSC_CSC |PORTSC_PEDC |PORTSC_OCC );#if 0 -fprintf (stderr,"%s: %d, have 0x%08x, want 0x%08x\n" , +error_report ("%s: %d, have 0x%08x, want 0x%08x" , __func__, port, value & mask, expect & mask);#endif g_assert ((value & mask) == (expect & mask));
tests/vhost-user-bridge.c +14 -14
@@ -181,7 +181,7 @@ vubr_handle_tx(VuDev *dev, int qidx) out_num = elem->out_num; out_sg = elem->out_sg;if (out_num <1 ) { -fprintf (stderr,"virtio-net header not in first element\n" ); +error_report ("virtio-net header not in first element" );break ; }if (VHOST_USER_BRIDGE_DEBUG ) {
@@ -294,7 +294,7 @@ vubr_backend_recv_cb(int sock, void *ctx) }if (elem->in_num <1 ) { -fprintf (stderr,"virtio-net contains no in buffers\n" ); +error_report ("virtio-net contains no in buffers" );break ; }
@@ -364,7 +364,7 @@ vubr_receive_cb(int sock, void *ctx)VubrDev *vubr = (VubrDev *)ctx;if (!vu_dispatch (&vubr->vudev)) { -fprintf (stderr,"Error while dispatching\n" ); +error_report ("Error while dispatching" ); } }
@@ -461,7 +461,7 @@ vubr_panic(VuDev *dev, const char *msg) {VubrDev *vubr =container_of (dev, VubrDev, vudev); -fprintf (stderr,"PANIC: %s\n" , msg); +error_report ("PANIC: %s" , msg);dispatcher_remove (&vubr->dispatcher, dev->sock); vubr->quit =1 ;
@@ -562,14 +562,14 @@ vubr_set_host(struct sockaddr_in *saddr, const char *host) {if (isdigit (host[0 ])) {if (!inet_aton (host, &saddr->sin_addr)) { -fprintf (stderr,"inet_aton() failed.\n" ); +error_report ("inet_aton() failed." );exit (1 ); } }else {struct hostent *he =gethostbyname (host);if (!he) { -fprintf (stderr,"gethostbyname() failed.\n" ); +error_report ("gethostbyname() failed." );exit (1 ); } saddr->sin_addr = *(struct in_addr *)he->h_addr;
@@ -590,13 +590,13 @@ vubr_backend_udp_setup(VubrDev *dev, lport =strtol (local_port, (char **)&r,0 );if (r == local_port) { -fprintf (stderr,"lport parsing failed.\n" ); +error_report ("lport parsing failed." );exit (1 ); } rport =strtol (remote_port, (char **)&r,0 );if (r == remote_port) { -fprintf (stderr,"rport parsing failed.\n" ); +error_report ("rport parsing failed." );exit (1 ); }
@@ -714,15 +714,15 @@ main(int argc, char *argv[])return 0 ; out: -fprintf (stderr,"Usage: %s " , argv[0 ]); -fprintf (stderr,"[-c] [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]\n" ); -fprintf (stderr,"\t-u path to unix doman socket. default: %s\n" , +error_report ("Usage: %s " , argv[0 ]); +error_report ("[-c] [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]" ); +error_report ("\t-u path to unix doman socket. default: %s" ,DEFAULT_UD_SOCKET ); -fprintf (stderr,"\t-l local host and port. default: %s:%s\n" , +fprintf (stderr,"\t-l local host and port. default: %s:%s" ,DEFAULT_LHOST ,DEFAULT_LPORT ); -fprintf (stderr,"\t-r remote host and port. default: %s:%s\n" , +error_report ("\t-r remote host and port. default: %s:%s" ,DEFAULT_RHOST ,DEFAULT_RPORT ); -fprintf (stderr,"\t-c client mode\n" ); +error_report ("\t-c client mode" );return 1 ; }
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v4 04/45] tests: Replace fprintf(stderr, "*\n" with error_report()
Quoted 3 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.
s/where/were/
Quoted 26 lines
Some of the error_report()'s were manually kept as
fprintf(stderr, )to maintain standalone test cases.Signed-off-by Alistair Francis <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Igor Mammedov <[email protected]>Cc "Dr. David Alan Gilbert" <[email protected]>Cc Gerd Hoffmann <[email protected]>---
V2:
- Keep some of thefprintf()calls
- Remove a file I accidently checked in+++
b/tests/ahci-test.ctests/ahci-test.c +1
-0@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include <getopt.h> #include "libqtest.h"
tests/ahci-test.c int main(int argc, char **argv) · line 1863
Quoted 5 lines
tests/ahci-test.c +1
-1@@ -1859,7 +1860,7 @@ int main(int argc, char **argv) ahci_pedantic =1 ;break ;default : -fprintf (stderr,"Unrecognized ahci_test option.\n" ); +error_report ("Unrecognized ahci_test option." );
Most of our error_report() calls do not include trailing dot.
Quoted 10 lines
tests/bios-tables-test.c +2
-0+++ b/tests/bios-tables-test.c@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include <glib/gstdio.h> #include "qemu-common.h" #include "hw/smbios/smbios.h"
tests/bios-tables-test.c try_again: · line 400
Quoted 5 lines
tests/bios-tables-test.c +1
-1@@ -396,7 +397,7 @@ try_again: aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, (gchar *)&signature, ext);if (getenv ("V" )) { -fprintf (stderr,"\nLooking for expected file '%s'\n" , aml_file); +error_report ("Looking for expected file '%s'" , aml_file);
Here, it looks like this is a debug statement, gated by whether $V is set in the environment; it's not really an error.
tests/bios-tables-test.c try_again: · line 413
Quoted 10 lines
tests/bios-tables-test.c +1
-1}if (g_file_test (aml_file,G_FILE_TEST_EXISTS )) { exp_sdt.aml_file = aml_file;@@ -408,7 +409,7 @@ try_again: }g_assert (exp_sdt.aml_file);if (getenv ("V" )) { -fprintf (stderr,"\nUsing expected file '%s'\n" , aml_file); +error_report ("Using expected file '%s'" , aml_file); }
Ditto.
Quoted 11 lines
tests/i440fx-test.c +2
-1+++ b/tests/i440fx-test.c@@ -13,7 +13,7 @@*/ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "libqtest.h" #include "libqos/pci.h" #include "libqos/pci-pc.h"
tests/i440fx-test.c static char *create_blob_file(void) · line 299
Quoted 6 lines
tests/i440fx-test.c +1
-1@@ -295,18 +295,18 @@ static char *create_blob_file(void) ret =-1 ; fd =g_file_open_tmp ("blob_XXXXXX" , &pathname, &error);if (fd ==-1 ) { -fprintf (stderr,"unable to create blob file: %s\n" , error->message); +error_report ("unable to create blob file: %s" , error->message);g_error_free (error);
A candidate for
error_reportf_err(error, "unable to create blob file: ");
Quoted 11 lines
tests/libqos/ahci.c +2
-1+++ b/tests/libqos/ahci.c@@ -23,7 +23,7 @@*/ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "libqtest.h" #include "libqos/ahci.h" #include "libqos/pci-pc.h"
tests/libqos/ahci.c static void ahci_atapi_command_set_offset(AHCICommand *cmd, uint64_t lba) · line 990
Quoted 8 lines
tests/libqos/ahci.c +2
-2@@ -985,9 +985,9 @@ static void ahci_atapi_command_set_offset(AHCICommand *cmd, uint64_t lba)default :/* SCSI doesn't have uniform packet formats, * so you have to add support for it manually. Sorry! */ - fprintf(stderr, "The Libqos AHCI driver does not support the " + error_report("The Libqos AHCI driver does not support the " "set_offset operation for ATAPI command 0x%02x, " - "please add support.\n", + "please add support.",
Trailing dot is unusual.
tests/libqos/ahci.c static void ahci_atapi_set_size(AHCICommand *cmd, uint64_t xbytes) · line 1064
Quoted 11 lines
tests/libqos/ahci.c +2
-2cbd[0]);g_assert_not_reached (); }@@ -1060,8 +1060,8 @@ static void ahci_atapi_set_size(AHCICommand *cmd, uint64_t xbytes)default :/* SCSI doesn't have uniform packet formats, * so you have to add support for it manually. Sorry! */ - fprintf(stderr, "The Libqos AHCI driver does not support the set_size " - "operation for ATAPI command 0x%02x, please add support.\n", + error_report("The Libqos AHCI driver does not support the set_size " + "operation for ATAPI command 0x%02x, please add support.",
Again
tests/libqos/libqos.c void mkimg(const char *file, const char *fmt, unsigned size_mb) · line 204
Quoted 9 lines
tests/libqos/libqos.c +2
-1+++ b/tests/libqos/libqos.c@@ -199,7 +200,7 @@ void mkimg(const char *file, const char *fmt, unsigned size_mb) fmt, file, size_mb); ret =g_spawn_command_line_sync (cli, &out, &out2, &rc, &err);if (err) { -fprintf (stderr,"%s\n" , err->message); +error_report ("%s" , err->message);g_error_free (err);
Candidate for error_report_err()
Quoted 10 lines
tests/libqos/malloc.c +2
-0+++ b/tests/libqos/malloc.c@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "libqos/malloc.h" #include "qemu-common.h" #include "qemu/host-utils.h"
tests/libqos/malloc.c static uint64_t mlist_alloc(QGuestAllocator *s, uint64_t size) · line 197
Quoted 5 lines
tests/libqos/malloc.c +1
-1@@ -193,7 +194,7 @@ static uint64_t mlist_alloc(QGuestAllocator *s, uint64_t size) node =mlist_find_space (s->free, size);if (!node) { -fprintf (stderr,"Out of guest memory.\n" ); +error_report ("Out of guest memory." );
trailing dot
tests/libqos/malloc.c static void mlist_free(QGuestAllocator *s, uint64_t addr) · line 214
Quoted 11 lines
tests/libqos/malloc.c +2
-2g_assert_not_reached (); }return mlist_fulfill (s, node, size);@@ -209,8 +210,8 @@ static void mlist_free(QGuestAllocator *s, uint64_t addr) node =mlist_find_key (s->used, addr);if (!node) { - fprintf(stderr, "Error: no record found for an allocation at " - "0x%016" PRIx64 ".\n", + error_report("Error: no record found for an allocation at " + "0x%016" PRIx64 ".",
Again. I'll quit pointing these out.
tests/migration-test.c static void check_guests_ram(QTestState *who) · line 339
Quoted 11 lines
tests/migration-test.c +3
-2+++ b/tests/migration-test.c@@ -334,9 +334,9 @@ static void check_guests_ram(QTestState *who)*/ hit_edge = true; }else { - fprintf(stderr, "Memory content inconsistency at %x" + error_report("Memory content inconsistency at %x" " first_byte = %x last_byte = %x current = %x" - " hit_edge = %x\n", + " hit_edge = %x",
Indentation is now off.
Quoted 8 lines
tests/migration-test.c +0
-0address, first_byte, last_byte, b, hit_edge); bad = true; }tests/migration/stress.c +0
-0
tests/migration/stress.c static __attribute__((noreturn)) void exit_failure(void) · line 51
Quoted 6 lines
tests/migration/stress.c +1
-1@@ -47,7 +47,7 @@ static __attribute__((noreturn)) void exit_failure(void)if (getpid () ==1 ) {sync ();reboot (RB_POWER_OFF ); -fprintf (stderr,"%s (%05d): ERROR: cannot reboot: %s\n" , +error_report ("%s (%05d): cannot reboot: %s" , argv0,gettid (),strerror (errno));
Indentation is now off.
tests/migration/stress.c static __attribute__((noreturn)) void exit_success(void) · line 64
Quoted 9 lines
tests/migration/stress.c +1
-1abort (); }else {@@ -60,7 +60,7 @@ static __attribute__((noreturn)) void exit_success(void)if (getpid () ==1 ) {sync ();reboot (RB_POWER_OFF ); -fprintf (stderr,"%s (%05d): ERROR: cannot reboot: %s\n" , +error_report ("%s (%05d): cannot reboot: %s" , argv0,gettid (),strerror (errno));
And again. I'll quit pointing it out.
Quoted 10 lines
tests/migration/stress.c +2
-0+++ b/tests/rcutorture.c@@ -61,6 +61,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/atomic.h" #include "qemu/rcu.h" #include "qemu/thread.h"
tests/migration/stress.c static int n_threads; · line 90
Quoted 5 lines
tests/migration/stress.c +1
-1@@ -86,7 +87,7 @@ static int n_threads;static void create_thread (void *(*func)(void *)) {if (n_threads >=NR_THREADS ) { -fprintf (stderr,"Thread limit of %d exceeded!\n" ,NR_THREADS ); +error_report ("Thread limit of %d exceeded!" ,NR_THREADS );
Trailing ! is shouting at the user; it's even less appropriate than trailing dot.
tests/migration/stress.c static void gtest_stress_10_5(void) · line 422
Quoted 10 lines
tests/migration/stress.c +1
-1exit (-1 ); } qemu_thread_create(&threads[n_threads], "test", func, &data[n_threads],@@ -417,7 +418,7 @@ static void gtest_stress_10_5(void)static void usage (int argc,char *argv[]) { -fprintf (stderr,"Usage: %s [nreaders [ perf | stress ] ]\n" , argv[0 ]); +error_report ("Usage: %s [nreaders [ perf | stress ] ]" , argv[0 ]);exit (-1 );
Separate patch - but 'exit(-1)' is almost always wrong (it gives status 255 through wait()/waitpid(); meanwhile waitid() is required by POSIX to get at the full 32-bit value except that Linux doesn't obey that requirement). A process where wait() returns 255 makes xargs behave differently. We really want exit(1).
tests/migration/stress.c void error1(const char *filename, int line, const char *fmt, ...) · line 54
Quoted 7 lines
tests/migration/stress.c +2
-1+++ b/tests/tcg/linux-test.c@@ -51,7 +51,7 @@ void error1(const char *filename, int line, const char *fmt, ...)va_start (ap, fmt);fprintf (stderr,"%s:%d: " , filename, line);vfprintf (stderr, fmt, ap); -fprintf (stderr,"\n" ); +error_report ("" );
Umm, a blank line is not a useful error. This hunk is bogus; we probably want to stick with fprintf() for the entire message.
tests/migration/stress.c int main(int argc, char *argv[]) · line 154
Quoted 9 lines
tests/migration/stress.c +3
-2+++ b/tests/tcg/test_path.c@@ -150,8 +150,8 @@ int main(int argc, char *argv[]) ret =do_test ();cleanup ();if (ret) { -fprintf (stderr,"test_path: failed on line %i\n" , ret); -return 1 ; +error_report ("test_path: failed on line %i" , ret); +return 1 ;
Yay for fixing TAB damage along the way.
Quoted 10 lines
tests/migration/stress.c +2
-0+++ b/tests/test-hmp.c@@ -15,6 +15,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "libqtest.h" static int verbose;
tests/migration/stress.c static void test_commands(void) · line 83
Quoted 5 lines
tests/migration/stress.c +1
-1@@ -79,7 +80,7 @@ static void test_commands(void)for (i =0 ; hmp_cmds[i] !=NULL ; i++) {if (verbose) { -fprintf (stderr,"\t%s\n" , hmp_cmds[i]); +error_report ("\t%s" , hmp_cmds[i]);
Verbose messages aren't really errors. I don't think you want this hunk.
tests/migration/stress.c static void test_info_commands(void) · line 106
Quoted 9 lines
tests/migration/stress.c +1
-1} response =hmp ("%s" , hmp_cmds[i]);g_free (response);@@ -102,7 +103,7 @@ static void test_info_commands(void) *endp ='\0' ;/* Now run the info command */ if (verbose) { -fprintf (stderr,"\t%s\n" , info); +error_report ("\t%s" , info);
Likewise.
Quoted 10 lines
tests/migration/stress.c +2
-0+++ b/tests/test-rcu-list.c@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/atomic.h" #include "qemu/rcu.h" #include "qemu/thread.h"
tests/migration/stress.c static int select_random_el(int max) · line 69
Quoted 6 lines
tests/migration/stress.c +1
-1@@ -64,7 +65,7 @@ static int select_random_el(int max)static void create_thread (void *(*func)(void *)) {if (n_threads >=NR_THREADS ) { -fprintf (stderr,"Thread limit of %d exceeded!\n" ,NR_THREADS ); +error_report ("Thread limit of %d exceeded!" ,NR_THREADS );exit (-1 );
Another !, another exit(-1)
tests/migration/stress.c static void ehci_port_test(struct qhc *hc, int port, uint32_t expect) · line 47
Quoted 9 lines
tests/migration/stress.c +2
-1+++ b/tests/usb-hcd-ehci-test.c@@ -42,7 +42,7 @@ static void ehci_port_test(struct qhc *hc, int port, uint32_t expect)uint16_t mask = ~(PORTSC_CSC |PORTSC_PEDC |PORTSC_OCC );#if 0 -fprintf (stderr,"%s: %d, have 0x%08x, want 0x%08x\n" , +error_report ("%s: %d, have 0x%08x, want 0x%08x" , __func__, port, value & mask, expect & mask);#endif
I'd just nuke the #if 0 block entirely, as it is likely to bit-rot (separate patch, though).
Quoted 11 lines
tests/migration/stress.c +3
-3+++ b/tests/vhost-user-bridge.c@@ -714,15 +714,15 @@ main(int argc, char *argv[])return 0 ; out: -fprintf (stderr,"Usage: %s " , argv[0 ]); -fprintf (stderr,"[-c] [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]\n" ); - fprintf(stderr, "\t-u path to unix doman socket. default: %s\n", +error_report ("Usage: %s " , argv[0 ]); +error_report ("[-c] [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]" );
tests/migration/stress.c main(int argc, char *argv[]) · line 725
Quoted 10 lines
tests/migration/stress.c +4
-3+error_report ("\t-u path to unix doman socket. default: %s" ,DEFAULT_UD_SOCKET ); -fprintf (stderr,"\t-l local host and port. default: %s:%s\n" , +fprintf (stderr,"\t-l local host and port. default: %s:%s" ,DEFAULT_LHOST ,DEFAULT_LPORT ); -fprintf (stderr,"\t-r remote host and port. default: %s:%s\n" , +error_report ("\t-r remote host and port. default: %s:%s" ,DEFAULT_RHOST ,DEFAULT_RPORT ); -fprintf (stderr,"\t-c client mode\n" ); +error_report ("\t-c client mode" );
Is usage text really an error?
Quoted 4 lines
tests/migration/stress.c +0
-0return 1 ; }
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v4 04/45] tests: Replace fprintf(stderr, "*\n" with error_report()
Quoted 1 line · Eric Blake
On 11/08/2017 04:56 PM, Alistair Francis wrote:
[...]
Quoted 9 lines
Quoted 8 lines
exit(-1); } qemu_thread_create(&threads[n_threads], "test", func, &data[n_threads], @@ -417,7 +418,7 @@ static void
gtest_stress_10_5(void)static void
usage(int argc, char *argv[]){ - fprintf(stderr,
"Usage: %s [nreaders [ perf | stress ] ]\n", argv[0]); +error_report("Usage: %s [nreaders [ perf | stress ] ]", argv[0]); exit(-1);
Quoted 5 lines
Separate patch - but 'exit(-1)' is almost always wrong (it gives status 255 through wait()/waitpid(); meanwhile
waitid()is required by POSIX to get at the full 32-bit value except that Linux doesn't obey that requirement). A process wherewait()returns 255 makes xargs behave differently. We really want exit(1).
$ git grep 'exit(-' origin/master | wc -l 60
Candidate for another mechanical patch?
Quoted 9 lines
Quoted 6 lines
+++
b/tests/tcg/linux-test.c@@ -51,7 +51,7 @@ voiderror1(const char *filename, int line, const char *fmt, ...)va_start(ap, fmt);fprintf(stderr, "%s:%d: ", filename, line);vfprintf(stderr, fmt, ap); -fprintf(stderr, "\n"); +error_report("");Umm, a blank line is not a useful error. This hunk is bogus; we probably want to stick with
fprintf()for the entire message.
=)
PATCH v4 5/45 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]>
---
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 | 6 +++--- hw/arm/palm.c | 10 +++++----- hw/arm/pxa2xx.c | 7 ++++--- hw/arm/stellaris.c | 3 ++- hw/arm/tosa.c | 17 +++++++++-------- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 8 ++++---- hw/arm/z2.c | 6 +++--- 15 files changed, 77 insertions(+), 71 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 -3
@@ -158,7 +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" , +error_report ("Error registering flash memory %d." , fl_idx); } fl_idx++;
@@ -182,7 +182,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" , +error_report ("Error registering flash memory %d." , fl_idx); } fl_idx++;
@@ -194,7 +194,7 @@ static void sx1_init(MachineState *machine, const int version) }if (!machine->kernel_filename && !fl_idx && !qtest_enabled ()) { -fprintf (stderr,"Kernel or Flash image must be specified\n" ); +error_report ("Kernel or Flash image must be specified" );exit (1 ); }
hw/arm/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 -8
@@ -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,13 +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" , +error_report ("dac: channel %d value 0x%02x" , s->buf[0 ], s->buf[1 ]); }
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
PATCH v4 6/45 hw/block: 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]>
---
V2:
- Split hw patch into individual directories
hw/block/dataplane/virtio-blk.c | 6 +++--- hw/block/onenand.c | 8 ++++---- hw/block/tc58128.c | 44 +++++++++++++++++++---------------------- 3 files changed, 27 insertions(+), 31 deletions(-)
hw/block/dataplane/virtio-blk.c +3 -3
@@ -178,8 +178,8 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)/* Set up guest notifier (irq) */ r = k->set_guest_notifiers (qbus->parent, nvqs, true);if (r !=0 ) { -fprintf (stderr,"virtio-blk failed to set guest notifier (%d), " -"ensure -enable-kvm is set\n" , r); +error_report ("virtio-blk failed to set guest notifier (%d), " +"ensure -enable-kvm is set" , r); goto fail_guest_notifiers; }
@@ -187,7 +187,7 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)for (i =0 ; i < nvqs; i++) { r =virtio_bus_set_host_notifier (VIRTIO_BUS (qbus), i, true);if (r !=0 ) { -fprintf (stderr,"virtio-blk failed to set host notifier (%d)\n" , r); +error_report ("virtio-blk failed to set host notifier (%d)" , r);while (i--) {virtio_bus_set_host_notifier (VIRTIO_BUS (qbus), i, false); }
hw/block/onenand.c +4 -4
@@ -596,7 +596,7 @@ static void onenand_command(OneNANDState *s)default : s->status |=ONEN_ERR_CMD ; s->intstatus |=ONEN_INT ; -fprintf (stderr,"%s: unknown OneNAND command %x\n" , +error_report ("%s: unknown OneNAND command %x" , __func__, s->command); }
@@ -663,7 +663,7 @@ static uint64_t onenand_read(void *opaque, hwaddr addr,return 0x0000 ; } -fprintf (stderr,"%s: unknown OneNAND register %x\n" , +error_report ("%s: unknown OneNAND register %x" , __func__, offset);return 0 ; }
@@ -708,7 +708,7 @@ static void onenand_write(void *opaque, hwaddr addr,break ;default : -fprintf (stderr,"%s: unknown OneNAND boot command %" PRIx64"\n" , +error_report ("%s: unknown OneNAND boot command %" PRIx64"" , __func__, value); }break ;
@@ -759,7 +759,7 @@ static void onenand_write(void *opaque, hwaddr addr,break ;default : -fprintf (stderr,"%s: unknown OneNAND register %x\n" , +error_report ("%s: unknown OneNAND register %x" , __func__, offset); } }
hw/block/tc58128.c +20 -24
72 lines not on this page · raw message
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v4 06/45] hw/block: Replace fprintf(stderr, "*\n" with error_report()
Quoted 4 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.
[...]
hw/block/tc58128.c
Quoted 4 lines
hw/block/tc58128.c +0
-0
OMG you found a rare pearl, I enjoyed reading this file git history :) Not a single logical change since his origin...
http://web.archive.org/web/20070917001736/perso.enst.fr/~polti/realisations/shix20
<3 <3
hw/block/tc58128.c static void init_dev(tc58128_dev * dev, const char *filename) · line 54
Quoted 8 lines
hw/block/tc58128.c +2
-2@@ -50,8 +50,8 @@ static void init_dev(tc58128_dev * dev, const char *filename) dev->flash_contents[1 ] = (blocks >>8 ) &0xff ; dev->flash_contents[2 ] = (blocks >>16 ) &0xff ; dev->flash_contents[3 ] = (blocks >>24 ) &0xff ; -fprintf (stderr,"loaded %d bytes for %s into flash\n" , ret, - filename); +error_report ("loaded %d bytes for %s into flash" , ret, + filename);
This one should be info_report().
hw/block/tc58128.c static void handle_command(tc58128_dev * dev, uint8_t command) · line 63
Quoted 11 lines
hw/block/tc58128.c +1
-3} } }@@ -60,26 +60,26 @@ static void handle_command(tc58128_dev * dev, uint8_t command) {switch (command) {case 0xff : -fprintf (stderr,"reset flash device\n" ); - dev->state =WAIT ; -break ; +error_report ("reset flash device" );
info_report() or even cleaner trace_tc58128_command()?
hw/block/tc58128.c static void handle_command(tc58128_dev * dev, uint8_t command) · line 67
Quoted 8 lines
hw/block/tc58128.c +3
-4+ dev->state =WAIT ; +break ;case 0x00 : -fprintf (stderr,"read mode 1\n" ); - dev->state =READ1 ; - dev->address_cycle =0 ; -break ; +error_report ("read mode 1" );
Ditto.
hw/block/tc58128.c static void handle_command(tc58128_dev * dev, uint8_t command) · line 72
Quoted 9 lines
hw/block/tc58128.c +4
-4+ dev->state =READ1 ; + dev->address_cycle =0 ; +break ;case 0x01 : -fprintf (stderr,"read mode 2\n" ); - dev->state =READ2 ; - dev->address_cycle =0 ; -break ; +error_report ("read mode 2" );
Ditto.
hw/block/tc58128.c static void handle_command(tc58128_dev * dev, uint8_t command) · line 77
Quoted 9 lines
hw/block/tc58128.c +4
-4+ dev->state =READ2 ; + dev->address_cycle =0 ; +break ;case 0x50 : -fprintf (stderr,"read mode 3\n" ); - dev->state =READ3 ; - dev->address_cycle =0 ; -break ; +error_report ("read mode 3" );
Ditto.
Quoted 10 lines
hw/block/tc58128.c +4
-1+ dev->state =READ3 ; + dev->address_cycle =0 ; +break ;default : -fprintf (stderr,"unknown flash command 0x%02x\n" , command); +error_report ("unknown flash command 0x%02x" , command);abort (); } }
hw/block/tc58128.c static void handle_address(tc58128_dev * dev, uint8_t data) · line 107
Quoted 7 lines
hw/block/tc58128.c +2
-2@@ -103,8 +103,8 @@ static void handle_address(tc58128_dev * dev, uint8_t data)break ;case 2 : dev->address += data *528 ; -fprintf (stderr,"address pointer in flash: 0x%08x\n" , - dev->address); +error_report ("address pointer in flash: 0x%08x" , + dev->address);
warn_report()?
Quoted 13 lines
hw/block/tc58128.c +0
-4break ;default :/* Invalid data */ @@ -119,10 +119,6 @@ static void handle_address(tc58128_dev * dev, uint8_t data)static uint8_t handle_read (tc58128_dev * dev) { -#if 0 -if (dev->address %0x100000 ==0 ) -fprintf (stderr,"reading flash at address 0x%08x\n" , dev->address); -#endif return dev->flash_contents[dev->address++]; }
PATCH v4 7/45 hw/bt: 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]>
---
V2:
- Split hw patch into individual directories
hw/bt/core.c | 15 +++++++-------- hw/bt/hci-csr.c | 21 +++++++++++---------- hw/bt/hci.c | 40 ++++++++++++++++++---------------------- hw/bt/hid.c | 2 +- hw/bt/l2cap.c | 47 ++++++++++++++++++++++++----------------------- hw/bt/sdp.c | 7 ++++--- 6 files changed, 65 insertions(+), 67 deletions(-)
hw/bt/core.c +7 -8
@@ -18,6 +18,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "sysemu/bt.h" #include "hw/bt.h"
@@ -31,24 +32,22 @@ static void bt_dummy_lmp_mode_change(struct bt_link_s *link)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" , - __func__); +error_report ("%s: stray LMP_not_accepted received, fixme" , __func__);else -fprintf (stderr,"%s: stray LMP_accepted received, fixme\n" , - __func__); +error_report ("%s: stray LMP_accepted received, fixme" , __func__);exit (-1 ); }static void bt_dummy_lmp_disconnect_master (struct bt_link_s *link) { -fprintf (stderr,"%s: stray LMP_detach received, fixme\n" , __func__); +fprintf (stderr,"%s: stray LMP_detach received, fixme" , __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" , __func__); +error_report ("%s: stray ACL response PDU, fixme" , __func__);exit (-1 ); }
@@ -113,8 +112,8 @@ 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" , __func__, - dev->lmp_name ?:"(null)" ); +error_report ("%s: bad bt device \"%s\"" , __func__, + dev->lmp_name ?:"(null)" );exit (-1 ); }
hw/bt/hci-csr.c +11 -10
@@ -19,6 +19,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "chardev/char-serial.h" #include "qemu/timer.h"
@@ -111,14 +112,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" , __func__, len); +error_report ("%s: can't alloc %i bytes" , __func__, len);exit (-1 ); }return s->outfifo + off; }if (s->out_len > s->out_size) { -fprintf (stderr,"%s: can't alloc %i bytes\n" , __func__, len); +error_report ("%s: can't alloc %i bytes" , __func__, len);exit (-1 ); }
@@ -168,10 +169,10 @@ static void csrhci_in_packet_vendor(struct csrhci_s *s, int ocf, s->bd_addr.b[5 ] = data[offset +2 ]; 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" , __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 ]); +error_report ("%s: bd_address loaded from firmware: " +"%02x:%02x:%02x:%02x:%02x:%02x" , __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 ]); } rpkt =csrhci_out_packet_event (s,EVT_VENDOR ,11 );
@@ -181,7 +182,7 @@ static void csrhci_in_packet_vendor(struct csrhci_s *s, int ocf,break ;default : -fprintf (stderr,"%s: got a bad CMD packet\n" , __func__); +error_report ("%s: got a bad CMD packet" , __func__);return ; }
@@ -226,7 +227,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" , __func__); +error_report ("%s: got a bad NEG packet" , __func__);return ; } pkt +=2 ;
@@ -241,7 +242,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" , __func__); +error_report ("%s: got a bad ALIVE packet" , __func__);return ; }
@@ -254,7 +255,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" , __func__); +error_report ("%s: got a bad packet" , __func__);break ; }
hw/bt/hci.c +18 -22
@@ -19,6 +19,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "qemu/timer.h"
@@ -457,8 +458,7 @@ static inline uint8_t *bt_hci_event_start(struct bt_hci_s *hci,int mask_byte;if (len >255 ) { -fprintf (stderr,"%s: HCI event params too long (%ib)\n" , - __func__, len); +error_report ("%s: HCI event params too long (%ib)" , __func__, len);exit (-1 ); }
@@ -589,8 +589,8 @@ 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" , __func__, - hci->lm.inquiry_mode); +error_report ("%s: bad inquiry mode %02x" , __func__, + hci->lm.inquiry_mode);exit (-1 ); } }
@@ -1971,8 +1971,7 @@ static void bt_submit_hci(struct HCIInfo *info,break ; short_hci: -fprintf (stderr,"%s: HCI packet too short (%iB)\n" , - __func__, length); +error_report ("%s: HCI packet too short (%iB)" , __func__, length);bt_hci_event_status (hci,HCI_INVALID_PARAMETERS );break ; }
@@ -1991,8 +1990,8 @@ static inline void bt_hci_lmp_acl_data(struct bt_hci_s *hci, uint16_t handle,/* TODO: avoid memcpy'ing */ if (len +HCI_ACL_HDR_SIZE >sizeof (hci->acl_buf)) { -fprintf (stderr,"%s: can't take ACL packets %i bytes long\n" , - __func__, len); +error_report ("%s: can't take ACL packets %i bytes long" , + __func__, len);return ; }memcpy (hci->acl_buf +HCI_ACL_HDR_SIZE , data, len);
@@ -2029,8 +2028,7 @@ static void bt_submit_acl(struct HCIInfo *info,struct bt_link_s *link;if (length <HCI_ACL_HDR_SIZE ) { -fprintf (stderr,"%s: ACL packet too short (%iB)\n" , - __func__, length); +error_report ("%s: ACL packet too short (%iB)" , __func__, length);return ; }
@@ -2041,16 +2039,15 @@ static void bt_submit_acl(struct HCIInfo *info, length -=HCI_ACL_HDR_SIZE ;if (bt_hci_handle_bad (hci, handle)) { -fprintf (stderr,"%s: invalid ACL handle %03x\n" , - __func__, handle); +error_report ("%s: invalid ACL handle %03x" , __func__, handle);/* TODO: signal an error */ return ; } handle &= ~HCI_HANDLE_OFFSET ;if (datalen > length) { -fprintf (stderr,"%s: ACL packet too short (%iB < %iB)\n" , - __func__, length, datalen); +error_report ("%s: ACL packet too short (%iB < %iB)" , + __func__, length, datalen);return ; }
@@ -2060,8 +2057,8 @@ static void bt_submit_acl(struct HCIInfo *info,if (!hci->asb_handle) hci->asb_handle = handle;else if (handle != hci->asb_handle) { -fprintf (stderr,"%s: Bad handle %03x in Active Slave Broadcast\n" , - __func__, handle); +error_report ("%s: Bad handle %03x in Active Slave Broadcast" , + __func__, handle);/* TODO: signal an error */ return ; }
@@ -2073,7 +2070,7 @@ static void bt_submit_acl(struct HCIInfo *info,if (!hci->psb_handle) hci->psb_handle = handle;else if (handle != hci->psb_handle) { -fprintf (stderr,"%s: Bad handle %03x in Parked Slave Broadcast\n" , +error_report ("%s: Bad handle %03x in Parked Slave Broadcast" , __func__, handle);/* TODO: signal an error */ return ;
@@ -2105,14 +2102,13 @@ static void bt_submit_sco(struct HCIInfo *info, length -=3 ;if (bt_hci_handle_bad (hci, handle)) { -fprintf (stderr,"%s: invalid SCO handle %03x\n" , - __func__, handle); +error_report ("%s: invalid SCO handle %03x" , __func__, handle);return ; }if (datalen > length) { -fprintf (stderr,"%s: SCO packet too short (%iB < %iB)\n" , - __func__, length, datalen); +error_report ("%s: SCO packet too short (%iB < %iB)" , + __func__, length, datalen);return ; }
@@ -2223,7 +2219,7 @@ struct HCIInfo *hci_init(const char *str)return bt_new_hci (vlan); } -fprintf (stderr,"qemu: Unknown bluetooth HCI `%s'.\n" , str); +error_report ("Unknown bluetooth HCI `%s'." , str);return 0 ; }
hw/bt/hid.c +1 -1
@@ -419,7 +419,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" , +error_report ("%s: bad transaction on Interrupt channel." , __func__); }
hw/bt/l2cap.c +24 -23
119 lines not on this page · raw message
hw/bt/sdp.c +4 -3
@@ -18,6 +18,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/host-utils.h" #include "hw/bt.h"
@@ -506,7 +507,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" , __func__, len); +error_report ("%s: short SDP PDU (%iB)." , __func__, len);return ; }
@@ -517,7 +518,7 @@ static void bt_l2cap_sdp_sdu_in(void *opaque, const uint8_t *data, int len) len -=5 ;if (len != plen) { -fprintf (stderr,"%s: wrong SDP PDU length (%iB != %iB).\n" , +error_report ("%s: wrong SDP PDU length (%iB != %iB)." , __func__, plen, len); err =SDP_INVALID_PDU_SIZE ; goto respond;
@@ -544,7 +545,7 @@ static void bt_l2cap_sdp_sdu_in(void *opaque, const uint8_t *data, int len)case SDP_SVC_SEARCH_RSP :case SDP_SVC_SEARCH_ATTR_RSP :default : -fprintf (stderr,"%s: unexpected SDP PDU ID %02x.\n" , +error_report ("%s: unexpected SDP PDU ID %02x." , __func__, pdu_id); err =SDP_INVALID_SYNTAX ;break ;
Signature · 1 line
2.14.1
PATCH v4 8/45 hw/char: 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.
Some lines were manually converted to qemu_log_mask(LOG_UNIMP, and two abort()'s were removed
Signed-off-by Alistair Francis <[email protected]>
Cc Paolo Bonzini <[email protected]>
---
V4:
- Remove abort()s from guest accessible code
- Use qemu_log_mask(LOG_UNIMP,
V2:
- Split hw patch into individual directories
hw/char/mcf_uart.c | 5 +++-- hw/char/sh_serial.c | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
hw/char/mcf_uart.c +3 -2
@@ -6,6 +6,7 @@* This code is licensed under the GPL */ #include "qemu/osdep.h" +#include "include/qemu/log.h" #include "hw/hw.h" #include "hw/sysbus.h" #include "hw/m68k/mcf.h"
@@ -174,7 +175,7 @@ static void mcf_do_command(mcf_uart_state *s, uint8_t cmd)mcf_uart_do_tx (s);break ;case 3 :/* Reserved. */ -fprintf (stderr,"mcf_uart: Bad TX command\n" ); +qemu_log_mask (LOG_GUEST_ERROR ,"mcf_uart: Bad TX command" );break ; }
@@ -189,7 +190,7 @@ static void mcf_do_command(mcf_uart_state *s, uint8_t cmd) s->rx_enabled =0 ;break ;case 3 :/* Reserved. */ -fprintf (stderr,"mcf_uart: Bad RX command\n" ); +qemu_log_mask (LOG_GUEST_ERROR ,"mcf_uart: Bad RX command" );break ; } }
hw/char/sh_serial.c +5 -6
@@ -25,6 +25,7 @@* THE SOFTWARE. */ #include "qemu/osdep.h" +#include "include/qemu/log.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "chardev/char-fe.h"
@@ -190,9 +191,8 @@ static void sh_serial_write(void *opaque, hwaddr offs, } } -fprintf (stderr,"sh_serial: unsupported write to 0x%02" - HWADDR_PRIx"\n" , offs); -abort (); +qemu_log_mask (LOG_UNIMP ,"sh_serial: unsupported write to 0x%02" + HWADDR_PRIx"" , offs); } static uint64_t sh_serial_read(void *opaque, hwaddr offs,
@@ -290,9 +290,8 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,#endif if (ret & ~((1 <<16 ) -1 )) { -fprintf (stderr,"sh_serial: unsupported read from 0x%02" - HWADDR_PRIx"\n" , offs); -abort (); +qemu_log_mask (LOG_UNIMP ,"sh_serial: unsupported read from 0x%02" + HWADDR_PRIx"" , offs); }return ret;
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v4 08/45] hw/char: Replace fprintf(stderr, "*\n" with error_report()
Quoted 99 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 were then manually tweaked to pass checkpatch.
Some lines were manually converted to qemu_log_mask(LOG_UNIMP, and two abort()'s were removed
Signed-off-by Alistair Francis <[email protected]>Cc Paolo Bonzini <[email protected]>---
V4:
- Remove abort()s from guest accessible code
- Use qemu_log_mask(LOG_UNIMP,
V2:
- Split hw patch into individual directorieshw/char/mcf_uart.c | 5 +++-- hw/char/sh_serial.c | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-)hw/char/mcf_uart.c +3
-2@@ -6,6 +6,7 @@* This code is licensed under the GPL */ #include "qemu/osdep.h" +#include "include/qemu/log.h" #include "hw/hw.h" #include "hw/sysbus.h" #include "hw/m68k/mcf.h" @@ -174,7 +175,7 @@ static void mcf_do_command(mcf_uart_state *s, uint8_t cmd)mcf_uart_do_tx (s);break ;case 3 :/* Reserved. */ -fprintf (stderr,"mcf_uart: Bad TX command\n" ); +qemu_log_mask (LOG_GUEST_ERROR ,"mcf_uart: Bad TX command" );break ; }@@ -189,7 +190,7 @@ static void mcf_do_command(mcf_uart_state *s, uint8_t cmd) s->rx_enabled =0 ;break ;case 3 :/* Reserved. */ -fprintf (stderr,"mcf_uart: Bad RX command\n" ); +qemu_log_mask (LOG_GUEST_ERROR ,"mcf_uart: Bad RX command" );break ; } }hw/char/sh_serial.c +1
-0@@ -25,6 +25,7 @@* THE SOFTWARE. */ #include "qemu/osdep.h" +#include "include/qemu/log.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "chardev/char-fe.h"
hw/char/sh_serial.c static void sh_serial_write(void *opaque, hwaddr offs, · line 195
Quoted 8 lines
hw/char/sh_serial.c +2
-3@@ -190,9 +191,8 @@ static void sh_serial_write(void *opaque, hwaddr offs, } } -fprintf (stderr,"sh_serial: unsupported write to 0x%02" - HWADDR_PRIx"\n" , offs); -abort (); +qemu_log_mask (LOG_UNIMP ,"sh_serial: unsupported write to 0x%02" + HWADDR_PRIx"" , offs);
"" :p
hw/char/sh_serial.c static uint64_t sh_serial_read(void *opaque, hwaddr offs, · line 294
Quoted 12 lines
hw/char/sh_serial.c +2
-3} static uint64_t sh_serial_read(void *opaque, hwaddr offs,@@ -290,9 +290,8 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,#endif if (ret & ~((1 <<16 ) -1 )) { -fprintf (stderr,"sh_serial: unsupported read from 0x%02" - HWADDR_PRIx"\n" , offs); -abort (); +qemu_log_mask (LOG_UNIMP ,"sh_serial: unsupported read from 0x%02" + HWADDR_PRIx"" , offs);
""
Quoted 4 lines
hw/char/sh_serial.c +0
-0}return ret;
PATCH v4 9/45 hw/core: 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 S. Tsirkin" <[email protected]>
Cc Paolo Bonzini <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V3:
- Fix white space error
V2:
- Split hw patch into individual directories
hw/core/loader.c | 43 ++++++++++++++++++++++--------------------- hw/core/ptimer.c | 7 ++++--- 2 files changed, 26 insertions(+), 24 deletions(-)
hw/core/loader.c +22 -21
@@ -43,6 +43,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "disas/disas.h"
@@ -82,8 +83,8 @@ int load_image(const char *filename, uint8_t *addr)return -1 ; size =lseek (fd,0 ,SEEK_END );if (size ==-1 ) { -fprintf (stderr,"file %-20s: get size error: %s\n" , - filename,strerror (errno)); +error_report ("file %-20s: get size error: %s" , + filename,strerror (errno));close (fd);return -1 ; }
@@ -623,8 +624,8 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, goto out;if (hdr->ih_type != image_type) { -fprintf (stderr,"Wrong image type %d, expected %d\n" , hdr->ih_type, - image_type); +error_report ("Wrong image type %d, expected %d" , hdr->ih_type, + image_type); goto out; }
@@ -670,14 +671,14 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, address = *loadaddr;break ;default : -fprintf (stderr,"Unsupported u-boot image type %d\n" , hdr->ih_type); +error_report ("Unsupported u-boot image type %d" , hdr->ih_type); goto out; } data =g_malloc (hdr->ih_size);if (read (fd, data, hdr->ih_size) != hdr->ih_size) { -fprintf (stderr,"Error reading file\n" ); +error_report ("Error reading file" ); goto out; }
@@ -693,7 +694,7 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, bytes =gunzip (data, max_bytes, compressed_data, hdr->ih_size);g_free (compressed_data);if (bytes <0 ) { -fprintf (stderr,"Unable to decompress gzipped image!\n" ); +error_report ("Unable to decompress gzipped image!" ); goto out; } hdr->ih_size = bytes;
@@ -763,8 +764,8 @@ int load_image_gzipped_buffer(const char *filename, uint64_t max_sz, data =g_malloc (max_sz); bytes =gunzip (data, max_sz, compressed_data, len);if (bytes <0 ) { -fprintf (stderr,"%s: unable to decompress gzipped kernel file\n" , - filename); +error_report ("%s: unable to decompress gzipped kernel file" , + filename); goto out; }
@@ -893,8 +894,8 @@ int rom_add_file(const char *file, const char *fw_dir,char devpath[100 ];if (as && mr) { -fprintf (stderr,"Specifying an Address Space and Memory Region is " \ -"not valid when loading a rom\n" ); +error_report ("Specifying an Address Space and Memory Region is " \ +"not valid when loading a rom" );/* We haven't allocated anything so we don't need any cleanup */ return -1 ; }
@@ -909,8 +910,8 @@ int rom_add_file(const char *file, const char *fw_dir, fd =open (rom->path,O_RDONLY |O_BINARY );if (fd ==-1 ) { -fprintf (stderr,"Could not open option rom '%s': %s\n" , - rom->path,strerror (errno)); +error_report ("Could not open option rom '%s': %s" , + rom->path,strerror (errno)); goto err; }
@@ -921,8 +922,8 @@ int rom_add_file(const char *file, const char *fw_dir, rom->addr = addr; rom->romsize =lseek (fd,0 ,SEEK_END );if (rom->romsize ==-1 ) { -fprintf (stderr,"rom: file %-20s: get size error: %s\n" , - rom->name,strerror (errno)); +error_report ("rom: file %-20s: get size error: %s" , + rom->name,strerror (errno)); goto err; }
@@ -931,8 +932,8 @@ int rom_add_file(const char *file, const char *fw_dir,lseek (fd,0 ,SEEK_SET ); rc =read (fd, rom->data, rom->datasize);if (rc != rom->datasize) { -fprintf (stderr,"rom: file %-20s: read error: rc=%d (expected %zd)\n" , - rom->name, rc, rom->datasize); +error_report ("rom: file %-20s: read error: rc=%d (expected %zd)" , + rom->name, rc, rom->datasize); goto err; }close (fd);
@@ -1105,10 +1106,10 @@ int rom_check_and_register_reset(void)continue ; }if ((addr > rom->addr) && (as == rom->as)) { -fprintf (stderr,"rom: requested regions overlap " -"(rom %s. free=0x" TARGET_FMT_plx -", addr=0x" TARGET_FMT_plx")\n" , - rom->name, addr, rom->addr); +error_report ("rom: requested regions overlap " +"(rom %s. free=0x" TARGET_FMT_plx +", addr=0x" TARGET_FMT_plx")" , + rom->name, addr, rom->addr);return -1 ; } addr = rom->addr;
hw/core/ptimer.c +4 -3
@@ -6,6 +6,7 @@* This code is licensed under the GNU LGPL. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h"
@@ -56,7 +57,7 @@ static void ptimer_reload(ptimer_state *s, int delta_adjust)if (s->period ==0 ) {if (!qtest_enabled ()) { -fprintf (stderr,"Timer with period zero, disabling\n" ); +error_report ("Timer with period zero, disabling" ); }timer_del (s->timer); s->enabled =0 ;
@@ -89,7 +90,7 @@ static void ptimer_reload(ptimer_state *s, int delta_adjust)if (delta ==0 ) {if (!qtest_enabled ()) { -fprintf (stderr,"Timer with delta zero, disabling\n" ); +error_report ("Timer with delta zero, disabling" ); }timer_del (s->timer); s->enabled =0 ;
@@ -263,7 +264,7 @@ void ptimer_run(ptimer_state *s, int oneshot)if (was_disabled && s->period ==0 ) {if (!qtest_enabled ()) { -fprintf (stderr,"Timer with period zero, disabling\n" ); +error_report ("Timer with period zero, disabling" ); }return ; }
Signature · 1 line
2.14.1
PATCH v4 10/45 hw/cris: 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 "Edgar E. Iglesias" <[email protected]>
Reviewed-by Philippe Mathieu-Daud <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/cris/axis_dev88.c | 3 ++- hw/cris/boot.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)
hw/cris/axis_dev88.c +2 -1
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
@@ -345,7 +346,7 @@ void axisdev88_init(MachineState *machine) li.cmdline = kernel_cmdline;cris_load_image (cpu, &li); }else if (!qtest_enabled ()) { -fprintf (stderr,"Kernel image must be specified\n" ); +error_report ("Kernel image must be specified" );exit (1 ); } }
hw/cris/boot.c +3 -3
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h"
@@ -86,14 +87,13 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li) }if (image_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - li->image_filename); +error_report ("could not load kernel '%s'" , li->image_filename);exit (1 ); }if (li->cmdline && (kcmdline_len =strlen (li->cmdline))) {if (kcmdline_len >256 ) { -fprintf (stderr,"Too long CRIS kernel cmdline (max 256)\n" ); +error_report ("Too long CRIS kernel cmdline (max 256)" );exit (1 ); }pstrcpy_targphys ("cmdline" ,0x40000000 ,256 , li->cmdline);
Signature · 1 line
2.14.1
PATCH v4 11/45 hw/display: 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]>
---
V2:
- Split hw patch into individual directories
hw/display/blizzard.c | 20 ++++++++++---------- hw/display/omap_dss.c | 14 +++++++------- hw/display/pl110.c | 2 +- hw/display/pxa2xx_lcd.c | 2 +- hw/display/qxl-render.c | 7 +++---- hw/display/qxl.c | 10 +++++----- hw/display/tc6393xb.c | 36 ++++++++++++++++++++---------------- hw/display/virtio-gpu-3d.c | 4 ++-- hw/display/vmware_vga.c | 22 +++++++++++----------- 9 files changed, 60 insertions(+), 57 deletions(-)
hw/display/blizzard.c +10 -10
@@ -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" , __func__, reg); +error_report ("%s: unknown register %02x" , __func__, reg);return 0 ; } }
@@ -501,7 +501,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value)case 0x0c :/* PLL Mode Control 0 */ s->pll_mode = value &0x77 ;if ((value &3 ) ==0 || (value &3 ) ==3 ) -fprintf (stderr,"%s: wrong PLL Control bits (%i)\n" , +error_report ("%s: wrong PLL Control bits (%i)" , __func__, value &3 );break ;
@@ -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" , __func__); +error_report ("%s: data swap not supported!" , __func__);break ;case 0x2a :/* LCD Horizontal Display Width */
@@ -585,7 +585,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value)case 0x40 :/* High-speed Serial Interface Tx Configuration Port 1 */ s->hssi_config[1 ] = value;if (((value >>4 ) &3 ) ==3 ) -fprintf (stderr,"%s: Illegal active-data-links value\n" , +error_report ("%s: Illegal active-data-links value" , __func__);break ;case 0x42 :/* High-speed Serial Interface Tx Mode */
@@ -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" , __func__); +error_report ("%s: Macrovision enable attempt!" , __func__);break ;case 0x6a :/* Special Effects */
@@ -717,7 +717,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->iformat = value &0xf ; s->bpp = blizzard_iformat_bpp[s->iformat];if (!s->bpp) -fprintf (stderr,"%s: Illegal or unsupported input format %x\n" , +error_report ("%s: Illegal or unsupported input format %x" , __func__, s->iformat);break ;case 0x8e :/* Data Source Select */
@@ -729,7 +729,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value) s->iy[1] != s->oy[1])) || !((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" , +error_report ("%s: Illegal input/output window positions" , __func__);blizzard_transfer_setup (s);
@@ -783,8 +783,8 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value)case 0xe6 :/* Power-save */ s->pm = value &0x83 ;if (value & s->mode &1 ) -fprintf (stderr,"%s: The display must be disabled before entering " -"Standby Mode\n" , __func__); +error_report ("%s: The display must be disabled before entering " +"Standby Mode" , __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" , __func__, reg); +error_report ("%s: unknown register %02x" , __func__, reg);break ; } }
hw/display/omap_dss.c +7 -7
@@ -406,10 +406,10 @@ static void omap_disc_write(void *opaque, hwaddr addr, s->lcd.enable = (value >>0 ) &1 ;if (value & (1 <<12 ))/* OVERLAY_OPTIMIZATION */ if (!((s->dispc.l[1 ].attr | s->dispc.l[2 ].attr) &1 )) { -fprintf (stderr,"%s: Overlay Optimization when no overlay " -"region effectively exists leads to " -"unpredictable behaviour!\n" , __func__); - } +error_report ("%s: Overlay Optimization when no overlay " +"region effectively exists leads to " +"unpredictable behaviour!" , __func__); + }if (value & (1 <<6 )) {/* GODIGITAL */ /* XXX: Shadowed fields are: * s->dispc.config
@@ -525,8 +525,8 @@ static void omap_disc_write(void *opaque, hwaddr addr,case 0x0a0 :/* DISPC_GFX_ATTRIBUTES */ s->dispc.l[0 ].attr = value &0x7ff ;if (value & (3 <<9 )) -fprintf (stderr,"%s: Big-endian pixel format not supported\n" , - __func__); +error_report ("%s: Big-endian pixel format not supported" , + __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" , __func__); +error_report ("%s: Bypass mode unimplemented" , __func__);return ; }
hw/display/pl110.c +1 -1
@@ -174,7 +174,7 @@ static void pl110_update_display(void *opaque) dest_width =4 ;break ;default : -fprintf (stderr,"pl110: Bad color depth\n" ); +error_report ("pl110: Bad color depth" );exit (1 ); }if (s->cr &PL110_CR_BGR )
hw/display/pxa2xx_lcd.c +1 -1
@@ -1050,7 +1050,7 @@ PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem, s->dest_width =4 ;break ;default : -fprintf (stderr,"%s: Bad color depth\n" , __func__); +error_report ("%s: Bad color depth" , __func__);exit (1 ); }
hw/display/qxl-render.c +3 -4
@@ -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" , __func__, +error_report ("%s: unhandled format: %x" , __func__, qxl->guest_primary.surface.format); qxl->guest_primary.bytes_pp =4 ; qxl->guest_primary.bits_pp =32 ;
@@ -247,7 +247,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor, }break ;default : -fprintf (stderr,"%s: not implemented: type %d\n" , +error_report ("%s: not implemented: type %d" , __func__, cursor->header.type); goto fail; }
@@ -275,9 +275,8 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext) }if (qxl->debug >1 && cmd->type !=QXL_CURSOR_MOVE ) { -fprintf (stderr,"%s" , __func__); +error_report ("%s" , __func__);qxl_log_cmd_cursor (qxl, cmd, ext->group_id); -fprintf (stderr,"\n" ); }switch (cmd->type) {case QXL_CURSOR_SET :
hw/display/qxl.c +5 -5
@@ -875,7 +875,7 @@ static void interface_notify_update(QXLInstance *sin, uint32_t update_id)* Probably was at some earlier version that is prior to git start (2009), * and is still guest trigerrable. */ -fprintf (stderr,"%s: deprecated\n" , __func__); +error_report ("%s: deprecated" , __func__); }/* called from spice server thread context only */
@@ -905,7 +905,7 @@ static void interface_async_complete_io(PCIQXLDevice *qxl, QXLCookie *cookie)trace_qxl_interface_async_complete_io (qxl->id, current_async, cookie);if (!cookie) { -fprintf (stderr,"qxl: %s: error, cookie is NULL\n" , __func__); +error_report ("qxl: %s: error, cookie is NULL" , __func__);return ; }if (cookie && current_async != cookie->io) {
@@ -930,7 +930,7 @@ static void interface_async_complete_io(PCIQXLDevice *qxl, QXLCookie *cookie)qxl_spice_destroy_surface_wait_complete (qxl, cookie->u.surface_id);break ;default : -fprintf (stderr,"qxl: %s: unexpected current_async %d\n" , __func__, +error_report ("qxl: %s: unexpected current_async %d" , __func__, current_async); }qxl_send_events (qxl,QXL_INTERRUPT_IO_CMD );
@@ -998,7 +998,7 @@ static void interface_async_complete(QXLInstance *sin, uint64_t cookie_token)case QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG :break ;default : -fprintf (stderr,"qxl: %s: unexpected cookie type %d\n" , +error_report ("qxl: %s: unexpected cookie type %d" , __func__, cookie->type);g_free (cookie); }
@@ -1875,7 +1875,7 @@ static void qxl_send_events(PCIQXLDevice *d, uint32_t events)trace_qxl_send_events (d->id, events);if (!qemu_spice_display_is_running (&d->ssd)) {/* spice-server tracks guest running state and should not do this */ -fprintf (stderr,"%s: spice-server bug: guest stopped, ignoring\n" , +error_report ("%s: spice-server bug: guest stopped, ignoring" , __func__);trace_qxl_send_events_vm_stopped (d->id, events);return ;
hw/display/tc6393xb.c +20 -16
@@ -159,7 +159,7 @@ void tc6393xb_gpio_out_set(TC6393xbState *s, int line, qemu_irq handler) {if (line >=TC6393XB_GPIOS ) { -fprintf (stderr,"TC6393xb: no GPIO pin %d\n" , line); +error_report ("TC6393xb: no GPIO pin %d" , line);return ; }
@@ -190,7 +190,7 @@ static void tc6393xb_l3v(void *opaque, int line, int level) {TC6393xbState *s = opaque; s->blank = !level; -fprintf (stderr,"L3V: %d\n" , level); +error_report ("L3V: %d" , level); }static void tc6393xb_sub_irq (void *opaque,int line,int level) {
@@ -257,7 +257,7 @@ static uint32_t tc6393xb_scr_readb(TC6393xbState *s, hwaddr addr)SCR_REG_B (CONFIG );SCR_REG_B (DEBUG ); } -fprintf (stderr,"tc6393xb_scr: unhandled read at %08x\n" , (uint32_t ) addr); +error_report ("tc6393xb_scr: unhandled read at %08x" , (uint32_t ) addr);return 0 ; }#undef SCR_REG_B
@@ -318,8 +318,8 @@ static void tc6393xb_scr_writeb(TC6393xbState *s, hwaddr addr, uint32_t value)SCR_REG_B (CONFIG );SCR_REG_B (DEBUG ); } -fprintf (stderr,"tc6393xb_scr: unhandled write at %08x: %02x\n" , - (uint32_t ) addr, value &0xff ); +error_report ("tc6393xb_scr: unhandled write at %08x: %02x" , + (uint32_t ) addr, value &0xff ); }#undef SCR_REG_B#undef SCR_REG_W
@@ -341,7 +341,7 @@ static uint32_t tc6393xb_nand_cfg_readb(TC6393xbState *s, hwaddr addr) {case NAND_CFG_BASE +3 :return s->nand_phys >> (addr -NAND_CFG_BASE ); } -fprintf (stderr,"tc6393xb_nand_cfg: unhandled read at %08x\n" , (uint32_t ) addr); +error_report ("tc6393xb_nand_cfg: unhandled read at %08x" , (uint32_t ) addr);return 0 ; }static void tc6393xb_nand_cfg_writeb (TC6393xbState *s,hwaddr addr,uint32_t value) {
@@ -357,7 +357,7 @@ static void tc6393xb_nand_cfg_writeb(TC6393xbState *s, hwaddr addr, uint32_t val s->nand_phys |= (value &0xff ) << ((addr -NAND_CFG_BASE ) *8 );return ; } -fprintf (stderr,"tc6393xb_nand_cfg: unhandled write at %08x: %02x\n" , +error_report ("tc6393xb_nand_cfg: unhandled write at %08x: %02x" , (uint32_t ) addr, value &0xff ); }
@@ -377,12 +377,14 @@ static uint32_t tc6393xb_nand_readb(TC6393xbState *s, hwaddr addr) {case NAND_IMR :return s->nand.imr; } -fprintf (stderr,"tc6393xb_nand: unhandled read at %08x\n" , (uint32_t ) addr); +error_report ("tc6393xb_nand: unhandled read at %08x" , (uint32_t ) addr);return 0 ; } -static void tc6393xb_nand_writeb (TC6393xbState *s,hwaddr addr,uint32_t value) { -// fprintf(stderr, "tc6393xb_nand: write at %08x: %02x\n", -// (uint32_t) addr, value & 0xff); +static void tc6393xb_nand_writeb (TC6393xbState *s,hwaddr addr,uint32_t value) +{ +/* error_report("tc6393xb_nand: write at %08x: %02x", +* (uint32_t) addr, value & 0xff); +*/ switch (addr) {case NAND_DATA +0 :case NAND_DATA +1 :
@@ -420,7 +422,7 @@ static void tc6393xb_nand_writeb(TC6393xbState *s, hwaddr addr, uint32_t value)tc6393xb_nand_irq (s);return ; } -fprintf (stderr,"tc6393xb_nand: unhandled write at %08x: %02x\n" , +error_report ("tc6393xb_nand: unhandled write at %08x: %02x" , (uint32_t ) addr, value &0xff ); }
@@ -522,13 +524,15 @@ static uint64_t tc6393xb_readb(void *opaque, hwaddr addr, };if ((addr &~0xff ) == s->nand_phys && s->nand_enable) { -// return tc6393xb_nand_readb(s, addr & 0xff); +/* return tc6393xb_nand_readb(s, addr & 0xff); */ uint8_t d =tc6393xb_nand_readb (s, addr &0xff ); -// fprintf(stderr, "tc6393xb_nand: read at %08x: %02hhx\n", (uint32_t) addr, d); +/* error_report("tc6393xb_nand: read at %08x: %02hhx", +* (uint32_t) addr, d); +*/ return d; } -// fprintf(stderr, "tc6393xb: unhandled read at %08x\n", (uint32_t) addr); +/* error_report("tc6393xb: unhandled read at %08x", (uint32_t) addr); */ return 0 ; }
@@ -548,7 +552,7 @@ static void tc6393xb_writeb(void *opaque, hwaddr addr,if ((addr &~0xff ) == s->nand_phys && s->nand_enable)tc6393xb_nand_writeb (s, addr &0xff , value);else -fprintf (stderr,"tc6393xb: unhandled write at %08x: %02x\n" , +error_report ("tc6393xb: unhandled write at %08x: %02x" , (uint32_t ) addr, (int )value &0xff ); }
hw/display/virtio-gpu-3d.c +2 -2
@@ -473,7 +473,7 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,return ; }if (cmd->error) { -fprintf (stderr,"%s: ctrl 0x%x, error 0x%x\n" , __func__, +error_report ("%s: ctrl 0x%x, error 0x%x" , __func__, cmd->cmd_hdr.type, cmd->error);virtio_gpu_ctrl_response_nodata (g, cmd, cmd->error);return ;
@@ -556,7 +556,7 @@ static void virtio_gpu_print_stats(void *opaque)VirtIOGPU *g = opaque;if (g->stats.requests) { - fprintf(stderr, "stats: vq req %4d, %3d -- 3D %4d (%5d)\n", + error_report("stats: vq req %4d, %3d -- 3D %4d (%5d)", g->stats.requests, g->stats.max_inflight, g->stats.req_3d,
hw/display/vmware_vga.c +11 -11
@@ -293,45 +293,45 @@ static inline bool vmsvga_verify_rect(DisplaySurface *surface, int x, int y, int w, int h) { if (x < 0) { - fprintf(stderr, "%s: x was < 0 (%d)\n", name, x); + error_report("%s: x was < 0 (%d)", name, x);return false; }if (x >SVGA_MAX_WIDTH ) { -fprintf (stderr,"%s: x was > %d (%d)\n" , name,SVGA_MAX_WIDTH , x); +error_report ("%s: x was > %d (%d)" , name,SVGA_MAX_WIDTH , x);return false; }if (w <0 ) { -fprintf (stderr,"%s: w was < 0 (%d)\n" , name, w); +error_report ("%s: w was < 0 (%d)" , name, w);return false; }if (w >SVGA_MAX_WIDTH ) { -fprintf (stderr,"%s: w was > %d (%d)\n" , name,SVGA_MAX_WIDTH , w); +error_report ("%s: w was > %d (%d)" , name,SVGA_MAX_WIDTH , w);return false; }if (x + w >surface_width (surface)) { -fprintf (stderr,"%s: width was > %d (x: %d, w: %d)\n" , +error_report ("%s: width was > %d (x: %d, w: %d)" , name,surface_width (surface), x, w);return false; }if (y <0 ) { -fprintf (stderr,"%s: y was < 0 (%d)\n" , name, y); +error_report ("%s: y was < 0 (%d)" , name, y);return false; }if (y >SVGA_MAX_HEIGHT ) { -fprintf (stderr,"%s: y was > %d (%d)\n" , name,SVGA_MAX_HEIGHT , y); +error_report ("%s: y was > %d (%d)" , name,SVGA_MAX_HEIGHT , y);return false; }if (h <0 ) { -fprintf (stderr,"%s: h was < 0 (%d)\n" , name, h); +error_report ("%s: h was < 0 (%d)" , name, h);return false; }if (h >SVGA_MAX_HEIGHT ) { -fprintf (stderr,"%s: h was > %d (%d)\n" , name,SVGA_MAX_HEIGHT , h); +error_report ("%s: h was > %d (%d)" , name,SVGA_MAX_HEIGHT , h);return false; }if (y + h >surface_height (surface)) { -fprintf (stderr,"%s: update height > %d (y: %d, h: %d)\n" , +error_report ("%s: update height > %d (y: %d, h: %d)" , name,surface_height (surface), y, h);return false; }
@@ -529,7 +529,7 @@ static inline void vmsvga_cursor_define(struct vmsvga_state_s *s,#endif break ;default : -fprintf (stderr,"%s: unhandled bpp %d, using fallback cursor\n" , +error_report ("%s: unhandled bpp %d, using fallback cursor" , __func__, c->bpp);cursor_put (qc); qc =cursor_builtin_left_ptr ();
Signature · 1 line
2.14.1
PATCH v4 12/45 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]>
---
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 v4 12/45] hw/dma: Replace fprintf(stderr, "*\n" with error_report()
Quoted 113 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.
Signed-off-by Alistair Francis <[email protected]>---
V3:
- Remove ""s
V2:
- Split hw patch into individual directorieshw/dma/omap_dma.c | 26 ++++++++++++++------------ hw/dma/soc_dma.c | 36 ++++++++++++++++++------------------ 2 files changed, 32 insertions(+), 30 deletions(-)hw/dma/omap_dma.c +9
-8@@ -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 ;
hw/dma/omap_dma.c static void omap_dma4_write(void *opaque, hwaddr addr, · line 1990
Quoted 7 lines
hw/dma/omap_dma.c +1
-3@@ -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 ]) {
This looks like bad coding of if (a || b) ...
Quoted 26 lines
hw/dma/omap_dma.c +4
-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 +1
-0@@ -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) {
hw/dma/soc_dma.c void soc_dma_port_add_fifo(struct soc_dma_s *soc, hwaddr virt_base, · line 278
Quoted 10 lines
hw/dma/soc_dma.c +5
-5-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));
I wonder why use () here, anyway:
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 50 lines
hw/dma/soc_dma.c +12
-13exit (-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 ); }
PATCH v4 13/45 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]>
---
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
Re: [Qemu-devel] [PATCH v4 13/45] hw/gpio: 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.
Signed-off-by Alistair Francis <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 21 lines
---
V2:
- Split hw patch into individual directorieshw/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 ;
PATCH v4 14/45 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 v4 16/45 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
@@ -410,8 +410,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 ; }
@@ -1053,7 +1053,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
@@ -2765,8 +2765,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 v4 17/45 hw/input: 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 S. Tsirkin" <[email protected]>
Cc Gerd Hoffmann <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/input/lm832x.c | 6 ++-- hw/input/pckbd.c | 3 +- hw/input/pxa2xx_keypad.c | 2 +- hw/input/tsc2005.c | 17 +++++------ hw/input/tsc210x.c | 72 ++++++++++++++++++++++----------------------- hw/input/virtio-input-hid.c | 14 ++++----- hw/input/virtio-input.c | 5 ++-- 7 files changed, 60 insertions(+), 59 deletions(-)
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" , __func__, reg); +error_report ("%s: unknown command %02x" , __func__, reg);return 0x00 ; }
@@ -330,7 +330,7 @@ static void lm_kbd_write(LM823KbdState *s, int reg, int byte, uint8_t value) s->reg = LM832x_GENERAL_ERROR;if ((value &3 ) && (value &3 ) !=3 ) {lm_kbd_error (s,ERR_BADPAR ); -fprintf (stderr,"%s: invalid clock setting in RCPWM\n" , +error_report ("%s: invalid clock setting in RCPWM" , __func__); }/* TODO: Validate that the command is only issued once */
@@ -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" , __func__, reg); +error_report ("%s: unknown command %02x" , __func__, reg);break ; } }
hw/input/pckbd.c +2 -1
@@ -22,6 +22,7 @@* THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/isa/isa.h" #include "hw/i386/pc.h"
@@ -307,7 +308,7 @@ static void kbd_write_command(void *opaque, hwaddr addr,/* ignore that */ break ;default : -fprintf (stderr,"qemu: unsupported keyboard cmd=0x%02x\n" , (int )val); +error_report ("unsupported keyboard cmd=0x%02x" , (int )val);break ; } }
hw/input/pxa2xx_keypad.c +1 -1
@@ -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" , __func__); +error_report ("%s - No PXA keypad map defined" , __func__);exit (-1 ); }
hw/input/tsc2005.c +8 -9
@@ -200,17 +200,17 @@ static void tsc2005_write(TSC2005State *s, int reg, uint16_t data) s->host_mode = (data >>15 ) !=0 ;if (s->enabled != !(data &0x4000 )) { s->enabled = !(data &0x4000 ); -fprintf (stderr,"%s: touchscreen sense %sabled\n" , - __func__, s->enabled ?"en" :"dis" ); +error_report ("%s: touchscreen sense %sabled" , + __func__, s->enabled ?"en" :"dis" );if (s->busy && !s->enabled)timer_del (s->timer); s->busy = s->busy && s->enabled; } s->nextprecision = (data >>13 ) &1 ; s->timing[0 ] = data &0x1fff ; -if ((s->timing[0 ] >>11 ) ==3 ) -fprintf (stderr,"%s: illegal conversion clock setting\n" , - __func__); +if ((s->timing[0 ] >>11 ) ==3 ) { +error_report ("%s: illegal conversion clock setting" , __func__); + }break ;case 0xd :/* CFR1 */ s->timing[1 ] = data &0xf07 ;
@@ -221,8 +221,7 @@ static void tsc2005_write(TSC2005State *s, int reg, uint16_t data)break ;default : -fprintf (stderr,"%s: write into read-only register %x\n" , - __func__, reg); +error_report ("%s: write into read-only register %x" , __func__, reg); } }
@@ -337,8 +336,8 @@ static uint8_t tsc2005_txrx_word(void *opaque, uint8_t value) s->nextprecision = (value >>2 ) &1 ;if (s->enabled != !(value &1 )) { s->enabled = !(value &1 ); -fprintf (stderr,"%s: touchscreen sense %sabled\n" , - __func__, s->enabled ?"en" :"dis" ); +error_report ("%s: touchscreen sense %sabled" , + __func__, s->enabled ?"en" :"dis" );if (s->busy && !s->enabled)timer_del (s->timer); s->busy = s->busy && s->enabled;
hw/input/tsc210x.c +36 -36
185 lines not on this page · raw message
hw/input/virtio-input-hid.c +7 -7
@@ -209,8 +209,8 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,virtio_input_send (vinput, &event); }else {if (key->down) { -fprintf (stderr,"%s: unmapped key: %d [%s]\n" , __func__, - qcode,QKeyCode_str (qcode)); +error_report ("%s: unmapped key: %d [%s]" , __func__, + qcode,QKeyCode_str (qcode)); } }break ;
@@ -230,9 +230,9 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,virtio_input_send (vinput, &event); }else {if (btn->down) { -fprintf (stderr,"%s: unmapped button: %d [%s]\n" , __func__, - btn->button, -InputButton_str (btn->button)); +error_report ("%s: unmapped button: %d [%s]" , __func__, + btn->button, +InputButton_str (btn->button)); } }break ;
@@ -318,8 +318,8 @@ static void virtio_input_hid_handle_status(VirtIOInput *vinput,kbd_put_ledstate (vhid->ledstate);break ;default : -fprintf (stderr,"%s: unknown type %d\n" , __func__, -le16_to_cpu (event->type)); +error_report ("%s: unknown type %d" , __func__, +le16_to_cpu (event->type));break ; } }
hw/input/virtio-input.c +3 -2
@@ -5,6 +5,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu/iov.h" #include "trace.h"
@@ -121,8 +122,8 @@ void virtio_input_add_config(VirtIOInput *vinput,if (virtio_input_find_config (vinput, config->select, config->subsel)) {/* should not happen */ -fprintf (stderr,"%s: duplicate config: %d/%d\n" , - __func__, config->select, config->subsel); +error_report ("%s: duplicate config: %d/%d" , + __func__, config->select, config->subsel);abort (); }
Signature · 1 line
2.14.1
PATCH v4 18/45 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]>
---
V2:
- Split hw patch into individual directories
hw/intc/arm_gic_kvm.c | 12 ++++++------ hw/intc/omap_intc.c | 4 ++-- hw/intc/openpic.c | 7 ++++--- hw/intc/openpic_kvm.c | 8 ++++---- hw/intc/s390_flic_kvm.c | 4 ++-- 5 files changed, 18 insertions(+), 17 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 +4 -3
@@ -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"
@@ -173,7 +174,7 @@ static int inttgt_to_output(int inttgt) } } -fprintf (stderr,"%s: unsupported inttgt %d\n" , __func__, inttgt); +error_report ("%s: unsupported inttgt %d" , __func__, inttgt);return OPENPIC_OUTPUT_INT ; }
@@ -547,7 +548,7 @@ static void openpic_set_irq(void *opaque, int n_IRQ, int level)IRQSource *src;if (n_IRQ >=OPENPIC_MAX_IRQ ) { -fprintf (stderr,"%s: IRQ %d out of range\n" , __func__, n_IRQ); +error_report ("%s: IRQ %d out of range" , __func__, n_IRQ);abort (); }
@@ -1221,7 +1222,7 @@ static uint32_t openpic_iack(OpenPICState *opp, IRQDest *dst, int cpu) src = &opp->src[irq];if (!(src->ivpr &IVPR_ACTIVITY_MASK ) || !(IVPR_PRIORITY (src->ivpr) > dst->ctpr)) { -fprintf (stderr,"%s: bad raised IRQ %d ctpr %d ivpr 0x%08x\n" , +error_report ("%s: bad raised IRQ %d ctpr %d ivpr 0x%08x" , __func__, irq, dst->ctpr, src->ivpr);openpic_update_irq (opp, irq); retval = opp->spve;
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
Re: [Qemu-devel] [PATCH v4 18/45] hw/intc: Replace fprintf(stderr, "*\n" with error_report()
Quoted 49 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 8 lines
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]>
Quoted 146 lines
---
V2:
- Split hw patch into individual directorieshw/intc/arm_gic_kvm.c | 12 ++++++------ hw/intc/omap_intc.c | 4 ++-- hw/intc/openpic.c | 7 ++++--- hw/intc/openpic_kvm.c | 8 ++++---- hw/intc/s390_flic_kvm.c | 4 ++-- 5 files changed, 18 insertions(+), 17 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 +4
-3@@ -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" @@ -173,7 +174,7 @@ static int inttgt_to_output(int inttgt) } } -fprintf (stderr,"%s: unsupported inttgt %d\n" , __func__, inttgt); +error_report ("%s: unsupported inttgt %d" , __func__, inttgt);return OPENPIC_OUTPUT_INT ; }@@ -547,7 +548,7 @@ static void openpic_set_irq(void *opaque, int n_IRQ, int level)IRQSource *src;if (n_IRQ >=OPENPIC_MAX_IRQ ) { -fprintf (stderr,"%s: IRQ %d out of range\n" , __func__, n_IRQ); +error_report ("%s: IRQ %d out of range" , __func__, n_IRQ);abort (); }@@ -1221,7 +1222,7 @@ static uint32_t openpic_iack(OpenPICState *opp, IRQDest *dst, int cpu) src = &opp->src[irq];if (!(src->ivpr &IVPR_ACTIVITY_MASK ) || !(IVPR_PRIORITY (src->ivpr) > dst->ctpr)) { -fprintf (stderr,"%s: bad raised IRQ %d ctpr %d ivpr 0x%08x\n" , +error_report ("%s: bad raised IRQ %d ctpr %d ivpr 0x%08x" , __func__, irq, dst->ctpr, src->ivpr);openpic_update_irq (opp, irq); retval = opp->spve;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" ); } }
PATCH v4 19/45 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 v4 20/45 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 v4 21/45 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]>
---
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 v4 22/45 hw/microblaze: 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 "Edgar E. Iglesias" <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/microblaze/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/microblaze/boot.c +1 -1
@@ -86,7 +86,7 @@ static int microblaze_load_dtb(hwaddr addr, 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 v4 23/45 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]>
---
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
@@ -267,10 +267,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
@@ -97,7 +97,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 );
@@ -111,9 +111,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,
@@ -121,8 +120,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 ); } }
@@ -195,9 +194,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);
@@ -238,7 +236,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
Re: [Qemu-devel] [PATCH v4 23/45] hw/mips: Replace fprintf(stderr, "*\n" with error_report()
Le 08/11/2017 à 23:57, Alistair Francis a écrit :
Quoted 38 lines
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 8 lines
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]
PATCH v4 24/45 hw/misc: 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/misc/a9scu.c | 3 ++- hw/misc/omap_gpmc.c | 11 ++++++----- hw/misc/omap_l4.c | 5 +++-- hw/misc/omap_sdrc.c | 3 ++- hw/misc/vmport.c | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-)
hw/misc/a9scu.c +2 -1
@@ -9,6 +9,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/misc/a9scu.h" static uint64_t a9_scu_read(void *opaque, hwaddr offset,
@@ -59,7 +60,7 @@ static void a9_scu_write(void *opaque, hwaddr offset, mask =0xffffffff ;break ;default : -fprintf (stderr,"Invalid size %u in write to a9 scu register %x\n" , +error_report ("Invalid size %u in write to a9 scu register %x" , size, (unsigned )offset);return ; }
hw/misc/omap_gpmc.c +6 -5
@@ -19,6 +19,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 "hw/block/flash.h" #include "hw/arm/omap.h"
@@ -408,7 +409,7 @@ static void omap_gpmc_cs_map(struct omap_gpmc_s *s, int cs)/* TODO: check for overlapping regions and report access errors */ if (mask !=0x8 && mask !=0xc && mask !=0xe && mask !=0xf && !(s->accept_256 && !mask)) { -fprintf (stderr,"%s: invalid chip-select mask address (0x%x)\n" , +error_report ("%s: invalid chip-select mask address (0x%x)" , __func__, mask); }
@@ -642,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" , +error_report ("%s: bad SDRAM idle mode %" PRIi64"" , __func__, value >>3 );if (value &2 )omap_gpmc_reset (s);
@@ -806,7 +807,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" , __func__); +error_report ("%s: test mode enable attempt" , __func__);break ;default :
@@ -864,7 +865,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" , __func__, cs); +error_report ("%s: bad chip-select %i" , __func__, cs);exit (-1 ); } f = &s->cs_file[cs];
@@ -881,7 +882,7 @@ void omap_gpmc_attach_nand(struct omap_gpmc_s *s, int cs, DeviceState *nand)assert (nand);if (cs <0 || cs >=8 ) { -fprintf (stderr,"%s: bad chip-select %i\n" , __func__, cs); +error_report ("%s: bad chip-select %i" , __func__, cs);exit (-1 ); } f = &s->cs_file[cs];
hw/misc/omap_l4.c +3 -2
@@ -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 "hw/arm/omap.h"
@@ -126,7 +127,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" , __func__, cs); +error_report ("%s: bad target agent (%i)" , __func__, cs);exit (-1 ); }
@@ -151,7 +152,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" , __func__, region); +error_report ("%s: bad io region (%i)" , __func__, region);exit (-1 ); }
hw/misc/omap_sdrc.c +2 -1
@@ -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 "hw/arm/omap.h"
@@ -108,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" , +error_report ("%s: bad SDRAM idle mode %i" , __func__, (unsigned )value >>3 );if (value &2 )omap_sdrc_reset (s);
hw/misc/vmport.c +1 -1
@@ -80,7 +80,7 @@ static uint64_t vmport_ioport_read(void *opaque, hwaddr addr,if (!s->func[command]) {#ifdef VMPORT_DEBUG -fprintf (stderr,"vmport: unknown command %x\n" , command); +error_report ("vmport: unknown command %x" , command);#endif return eax; }
Signature · 1 line
2.14.1
PATCH v4 25/45 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]>
---
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"
@@ -61,8 +62,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 ); }
@@ -75,9 +76,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,
@@ -85,8 +85,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 v4 26/45 hw/net: 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.
Manually remove a trailing '.' from hw/net/pcnet.c
Signed-off-by Alistair Francis <[email protected]>
Cc Alexander Graf <[email protected]>
Cc Jason Wang <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V3:
- Drop tailing '.'
V2:
- Split hw patch into individual directories
hw/net/fsl_etsec/etsec.c | 2 +- hw/net/pcnet.c | 2 +- hw/net/smc91c111.c | 5 +++-- hw/net/vhost_net.c | 16 ++++++++-------- 4 files changed, 13 insertions(+), 12 deletions(-)
hw/net/fsl_etsec/etsec.c +1 -1
@@ -347,7 +347,7 @@ static ssize_t etsec_receive(NetClientState *nc,eTSEC *etsec =qemu_get_nic_opaque (nc);#if defined(HEX_DUMP ) -fprintf (stderr,"%s receive size:%zd\n" , nc->name, size); +error_report ("%s receive size:%zd" , nc->name, size);qemu_hexdump ((void *)buf, stderr,"" , size);#endif /* Flush is unnecessary as are already in receiving path */
hw/net/pcnet.c +1 -1
@@ -1070,7 +1070,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)if (!s->looptest) {if (size >4092 ) {#ifdef PCNET_DEBUG_RMD -fprintf (stderr,"pcnet: truncates rx packet.\n" ); +error_report ("pcnet: truncates rx packet" );#endif size =4092 ; }
hw/net/smc91c111.c +3 -2
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/sysbus.h" #include "net/net.h" #include "hw/devices.h"
@@ -362,9 +363,9 @@ static void smc91c111_writeb(void *opaque, hwaddr offset,return ;case 12 :/* Control */ if (value &1 ) -fprintf (stderr,"smc91c111:EEPROM store not implemented\n" ); +error_report ("smc91c111:EEPROM store not implemented" );if (value &2 ) -fprintf (stderr,"smc91c111:EEPROM reload not implemented\n" ); +error_report ("smc91c111:EEPROM reload not implemented" ); value &= ~3 ;SET_LOW (ctr, value);return ;
hw/net/vhost_net.c +8 -8
@@ -135,7 +135,7 @@ static int vhost_net_get_fd(NetClientState *backend)case NET_CLIENT_DRIVER_TAP :return tap_get_fd (backend);default : -fprintf (stderr,"vhost-net requires tap backend\n" ); +error_report ("vhost-net requires tap backend" );return -EBADFD ; } }
@@ -148,7 +148,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)uint64_t features =0 ;if (!options->net_backend) { -fprintf (stderr,"vhost-net requires net backend to be setup\n" ); +error_report ("vhost-net requires net backend to be setup" ); goto fail; } net->nc = options->net_backend;
@@ -186,8 +186,8 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) net->dev.features &= ~(1ULL <<VIRTIO_NET_F_MRG_RXBUF ); }if (~net->dev.features & net->dev.backend_features) { -fprintf (stderr,"vhost lacks feature mask %" PRIu64 -" for backend\n" , +error_report ("vhost lacks feature mask %" PRIu64 +" for backend" , (uint64_t )(~net->dev.features & net->dev.backend_features)); goto fail; }
@@ -197,8 +197,8 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)if (net->nc->info->type ==NET_CLIENT_DRIVER_VHOST_USER ) { features =vhost_user_get_acked_features (net->nc);if (~net->dev.features & features) { -fprintf (stderr,"vhost lacks feature mask %" PRIu64 -" for backend\n" , +error_report ("vhost lacks feature mask %" PRIu64 +" for backend" , (uint64_t )(~net->dev.features & features)); goto fail; }
@@ -349,7 +349,7 @@ err_start: } e = k->set_guest_notifiers (qbus->parent, total_queues *2 , false);if (e <0 ) { -fprintf (stderr,"vhost guest notifier cleanup failed: %d\n" , e); +error_report ("vhost guest notifier cleanup failed: %d" , e);fflush (stderr); } err:
@@ -370,7 +370,7 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs, r = k->set_guest_notifiers (qbus->parent, total_queues *2 , false);if (r <0 ) { -fprintf (stderr,"vhost guest notifier cleanup failed: %d\n" , r); +error_report ("vhost guest notifier cleanup failed: %d" , r);fflush (stderr); }assert (r >=0 );
Signature · 1 line
2.14.1
PATCH v4 27/45 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
@@ -96,7 +96,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 v4 28/45 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().
Signed-off-by Alistair Francis <[email protected]>
---
V3:
- Add g_assert_not_reached() in unused function
V2:
- Split hw patch into individual directories
hw/nvram/eeprom93xx.c | 5 +++-- hw/nvram/fw_cfg.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
hw/nvram/eeprom93xx.c +3 -2
@@ -36,6 +36,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/nvram/eeprom93xx.h"
@@ -105,8 +106,8 @@ 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" ); +error_report ("uint16_from_uint8 is used only for backwards compatibility." ); +error_report ("Never should be used to write a new state." );exit (0 );return 0 ;
hw/nvram/fw_cfg.c +3 -2
@@ -518,8 +518,9 @@ 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
Re: [Qemu-devel] [PATCH v4 28/45] hw/nvram: Replace fprintf(stderr, "*\n" with error_report()
Quoted 67 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.
Some of the message in
put_unused()was removed and replaced withg_assert_not_reached().Signed-off-by Alistair Francis <[email protected]>---
V3:
- Addg_assert_not_reached()in unused function
V2:
- Split hw patch into individual directorieshw/nvram/eeprom93xx.c | 5 +++-- hw/nvram/fw_cfg.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)hw/nvram/eeprom93xx.c +1
-0@@ -36,6 +36,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/nvram/eeprom93xx.h"
hw/nvram/eeprom93xx.c static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size, · line 110
Quoted 7 lines
hw/nvram/eeprom93xx.c +2
-2@@ -105,8 +106,8 @@ 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" ); +error_report ("uint16_from_uint8 is used only for backwards compatibility." ); +error_report ("Never should be used to write a new state." );
Sounds like funny english :)
hw/nvram/eeprom93xx.c static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size, · line 111
Quoted 1 line
hw/nvram/eeprom93xx.c +0
-0exit (0 );
Why not use g_assert_not_reached() for consistency?
Quoted 19 lines
hw/nvram/eeprom93xx.c +0
-0return 0 ;hw/nvram/fw_cfg.c +3
-2@@ -518,8 +518,9 @@ 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 ; }
PATCH v4 29/45 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]>
---
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
Re: [Qemu-devel] [PATCH v4 29/45] hw/openrisc: 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 6 lines
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]>
Quoted 30 lines
---
V2:
- Split hw patch into individual directorieshw/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;
PATCH v4 30/45 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 v4 31/45 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 where then manually tweaked to pass checkpatch.
Signed-off-by Alistair Francis <[email protected]>
Acked-by David Gibson <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/ppc/e500.c | 22 +++++++++++----------- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/mpc8544_guts.c | 5 +++-- hw/ppc/ppc405_boards.c | 15 ++++++--------- hw/ppc/ppc440_bamboo.c | 22 +++++++++++----------- hw/ppc/ppc4xx_pci.c | 3 ++- hw/ppc/prep.c | 4 ++-- hw/ppc/virtex_ml507.c | 4 ++-- 9 files changed, 39 insertions(+), 40 deletions(-)
hw/ppc/e500.c +11 -11
@@ -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" ); } }
@@ -353,7 +353,7 @@ 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" ); +error_report ("couldn't set /chosen/bootargs" );if (kvm_enabled ()) {/* Read out host's frequencies */
@@ -720,7 +720,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" , +error_report ("%s: failed to connect vcpu to irqchip" , __func__);abort (); }
@@ -815,7 +815,7 @@ 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" , +error_report ("MMU model %i not supported by this machine." , env->mmu_model);exit (1 ); }
@@ -961,8 +961,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 ); }
@@ -976,8 +976,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 ); }
@@ -1018,7 +1018,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 ); } }
@@ -1031,7 +1031,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 +3 -2
@@ -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,7 +103,7 @@ static void mpc8544_guts_write(void *opaque, hwaddr addr, }break ;default : -fprintf (stderr,"guts: Unknown register write: %x = %x\n" , +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 +11 -11
@@ -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,22 @@ 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" ); +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,7 +187,7 @@ 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" , +error_report ("MMU model %i not supported by this machine." , env->mmu_model);exit (1 ); }
@@ -220,7 +221,7 @@ static void bamboo_init(MachineState *machine) NULL); pcibus = (PCIBus *)qdev_get_child_bus (dev,"pci.0" );if (!pcibus) { -fprintf (stderr,"couldn't create PCI controller!\n" ); +error_report ("couldn't create PCI controller!" );exit (1 ); }
@@ -261,8 +262,7 @@ static void bamboo_init(MachineState *machine) }/* XXX try again as binary */ if (success <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , - kernel_filename); +error_report ("could not load kernel '%s'" , kernel_filename);exit (1 ); } }
@@ -273,8 +273,8 @@ static void bamboo_init(MachineState *machine) ram_size - RAMDISK_ADDR);if (initrd_size <0 ) { -fprintf (stderr,"qemu: could not load ram disk '%s' at %x\n" , - initrd_filename,RAMDISK_ADDR ); +error_report ("could not load ram disk '%s' at %x" , + initrd_filename,RAMDISK_ADDR );exit (1 ); } }
@@ -283,7 +283,7 @@ static void bamboo_init(MachineState *machine)if (kernel_filename) {if (bamboo_load_device_tree (FDT_ADDR , ram_size,RAMDISK_ADDR , initrd_size, kernel_cmdline) <0 ) { -fprintf (stderr,"couldn't load device tree\n" ); +error_report ("couldn't load device tree" );exit (1 ); } }
hw/ppc/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
@@ -573,7 +573,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 ); } }
@@ -594,7 +594,7 @@ static void ppc_prep_init(MachineState *machine)qdev_init_nofail (dev); pci_bus = (PCIBus *)qdev_get_child_bus (dev,"pci.0" );if (pci_bus ==NULL ) { -fprintf (stderr,"Couldn't create PCI host controller.\n" ); +error_report ("Couldn't create PCI host controller." );exit (1 ); } sysctrl->contiguous_map_irq =qdev_get_gpio_in (dev,0 );
hw/ppc/virtex_ml507.c +2 -2
@@ -187,7 +187,7 @@ 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" ); +error_report ("couldn't set /chosen/bootargs" );cpu_physical_memory_write (addr, fdt, fdt_size);return fdt_size; }
@@ -215,7 +215,7 @@ 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" , +error_report ("MMU model %i not supported by this machine." , env->mmu_model);exit (1 ); }
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v4 31/45] hw/ppc: Replace fprintf(stderr, "*\n" with error_report()
Cc'ing Alexander to ask him about the mpc8544ds.
Quoted 4 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.
[...]
Quoted 13 lines
hw/ppc/mpc8544_guts.c +1
-0@@ -18,6 +18,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h"
hw/ppc/mpc8544_guts.c static uint64_t mpc8544_guts_read(void *opaque, hwaddr addr, · line 87
Quoted 5 lines
hw/ppc/mpc8544_guts.c +1
-1@@ -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);
Alexander: Should this be reported as UNIMP or GUEST_ERROR?
hw/ppc/mpc8544_guts.c static void mpc8544_guts_write(void *opaque, hwaddr addr, · line 109
Quoted 12 lines
hw/ppc/mpc8544_guts.c +1
-1break ; }@@ -102,7 +103,7 @@ static void mpc8544_guts_write(void *opaque, hwaddr addr, }break ;default : -fprintf (stderr,"guts: Unknown register write: %x = %x\n" , +error_report ("guts: Unknown register write: %x = %x" , (int )addr, (unsigned )value);break ; }
Thanks,
Phil.
PATCH v4 32/45 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
PATCH v4 33/45 hw/scsi: 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 Paolo Bonzini <[email protected]>
Cc David Gibson <[email protected]>
Cc Alexander Graf <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/scsi/lsi53c895a.c | 4 ++-- hw/scsi/spapr_vscsi.c | 49 +++++++++++++++++++++-------------------- hw/scsi/virtio-scsi-dataplane.c | 6 ++--- 3 files changed, 30 insertions(+), 29 deletions(-)
hw/scsi/lsi53c895a.c +2 -2
@@ -14,7 +14,7 @@*/ #include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h"
@@ -1501,7 +1501,7 @@ again:This is apparently sufficient to beat the drivers into submission. */ if (!(s->sien0 &LSI_SIST0_UDC )) -fprintf (stderr,"inf. loop with UDC masked\n" ); +error_report ("inf. loop with UDC masked" );lsi_script_scsi_interrupt (s,LSI_SIST0_UDC ,0 );lsi_disconnect (s); }else if (s->istat1 &LSI_ISTAT1_SRUN && !s->waiting) {
hw/scsi/spapr_vscsi.c +25 -24
187 lines not on this page · raw message
hw/scsi/virtio-scsi-dataplane.c +3 -3
@@ -97,7 +97,7 @@ static int virtio_scsi_vring_init(VirtIOSCSI *s, VirtQueue *vq, int n,/* Set up virtqueue notify */ rc =virtio_bus_set_host_notifier (VIRTIO_BUS (qbus), n, true);if (rc !=0 ) { -fprintf (stderr,"virtio-scsi: Failed to set host notifier (%d)\n" , +error_report ("virtio-scsi: Failed to set host notifier (%d)" , rc); s->dataplane_fenced = true;return rc;
@@ -141,8 +141,8 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev)/* Set up guest notifier (irq) */ rc = k->set_guest_notifiers (qbus->parent, vs->conf.num_queues +2 , true);if (rc !=0 ) { -fprintf (stderr,"virtio-scsi: Failed to set guest notifiers (%d), " -"ensure -enable-kvm is set\n" , rc); +error_report ("virtio-scsi: Failed to set guest notifiers (%d), " +"ensure -enable-kvm is set" , rc); goto fail_guest_notifiers; }
Signature · 1 line
2.14.1
PATCH v4 34/45 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 v4 35/45 hw/sh4: 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 Magnus Damm <[email protected]>
Cc Aurelien Jarno <[email protected]>
---
V2:
- Split hw patch into individual directories
hw/sh4/r2d.c | 9 ++++---- hw/sh4/sh7750.c | 64 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 38 insertions(+), 35 deletions(-)
hw/sh4/r2d.c +5 -4
@@ -24,6 +24,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
@@ -314,8 +315,8 @@ static void r2d_init(MachineState *machine)SDRAM_BASE +LINUX_LOAD_OFFSET , INITRD_LOAD_OFFSET - LINUX_LOAD_OFFSET);if (kernel_size <0 ) { -fprintf (stderr,"qemu: could not load kernel '%s'\n" , kernel_filename); -exit (1 ); +error_report ("could not load kernel '%s'" , kernel_filename); +exit (1 ); }/* initialization which should be done by firmware */
@@ -334,8 +335,8 @@ static void r2d_init(MachineState *machine) SDRAM_SIZE - INITRD_LOAD_OFFSET);if (initrd_size <0 ) { -fprintf (stderr,"qemu: could not load initrd '%s'\n" , initrd_filename); -exit (1 ); +error_report ("could not load initrd '%s'" , initrd_filename); +exit (1 ); }/* initialization which should be done by firmware */
hw/sh4/sh7750.c +33 -31
108 lines not on this page · raw message
Signature · 1 line
2.14.1
PATCH v4 36/45 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]>
---
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
@@ -260,8 +260,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 ); }
@@ -272,8 +271,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 ); } }
@@ -681,7 +680,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 ); } }
@@ -747,10 +746,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 v4 37/45 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 v4 38/45 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]>
---
V2:
- Split hw patch into individual directories
hw/timer/omap_gptimer.c | 11 ++++++----- hw/timer/twl92230.c | 2 +- hw/timer/xilinx_timer.c | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-)
hw/timer/omap_gptimer.c +6 -5
@@ -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,7 +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" , +error_report ("%s: illegal IDLEMODE value in TIOCP_CFG" , __func__);if (value &2 )/* SOFTRESET */ omap_gp_timer_reset (s);
@@ -394,11 +395,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 -1
@@ -614,7 +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" , +error_report ("%s: bad RTC_UPDATE value %02x" , __func__, value); s->status |=1 <<10 ;/* RTCERR */ menelaus_update (s);
hw/timer/xilinx_timer.c +4 -4
@@ -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,7 +135,7 @@ static void timer_enable(struct xlx_timer *xt) {uint64_t count; -D (fprintf (stderr,"%s timer=%d down=%d\n" , __func__, +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 v4 39/45 hw/usb: 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 debug prints in usb_net_handle_control() where reverted to use fprintf(stderr, and usb_mtp_cancel_packet() now uses g_assert_not_reached().
Signed-off-by Alistair Francis <[email protected]>
Cc Gerd Hoffmann <[email protected]>
---
V3:
- Use g_assert_not_reached() in usb_mtp_cancel_packet()
- Leave the fprintf(stderr in usb_net_handle_control()
V2:
- Split hw patch into individual directories
hw/usb/core.c | 15 ++++++++------- hw/usb/desc.c | 6 +++--- hw/usb/dev-audio.c | 39 ++++++++++++++++++++------------------- hw/usb/dev-bluetooth.c | 4 ++-- hw/usb/dev-mtp.c | 9 +++++---- hw/usb/dev-network.c | 14 +++++++------- hw/usb/hcd-ehci.c | 32 ++++++++++++++++---------------- hw/usb/hcd-musb.c | 4 ++-- hw/usb/hcd-xhci.c | 3 ++- hw/usb/host-legacy.c | 3 ++- 10 files changed, 67 insertions(+), 62 deletions(-)
hw/usb/core.c +8 -7
@@ -24,6 +24,7 @@* THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "hw/usb.h" #include "qemu/iov.h"
@@ -599,7 +600,7 @@ void usb_packet_copy(USBPacket *p, void *ptr, size_t bytes)iov_from_buf (iov->iov, iov->niov, p->actual_length, ptr, bytes);break ;default : -fprintf (stderr,"%s: invalid pid: %x\n" , __func__, p->pid); +error_report ("%s: invalid pid: %x" , __func__, p->pid);abort (); } p->actual_length += bytes;
@@ -681,7 +682,7 @@ void usb_ep_dump(USBDevice *dev) };int ifnum, ep, first; -fprintf (stderr,"Device \"%s\", config %d\n" , +error_report ("Device \"%s\", config %d" , dev->product_desc, dev->configuration);for (ifnum =0 ; ifnum <16 ; ifnum++) { first =1 ;
@@ -690,10 +691,10 @@ void usb_ep_dump(USBDevice *dev) dev->ep_in[ep].ifnum == ifnum) {if (first) { first =0 ; -fprintf (stderr," Interface %d, alternative %d\n" , +error_report (" Interface %d, alternative %d" , ifnum, dev->altsetting[ifnum]); } -fprintf (stderr," Endpoint %d, IN, %s, %d max\n" , ep, +error_report (" Endpoint %d, IN, %s, %d max" , ep, tname[dev->ep_in[ep].type], dev->ep_in[ep].max_packet_size); }
@@ -701,16 +702,16 @@ void usb_ep_dump(USBDevice *dev) dev->ep_out[ep].ifnum == ifnum) {if (first) { first =0 ; -fprintf (stderr," Interface %d, alternative %d\n" , +error_report (" Interface %d, alternative %d" , ifnum, dev->altsetting[ifnum]); } -fprintf (stderr," Endpoint %d, OUT, %s, %d max\n" , ep, +error_report (" Endpoint %d, OUT, %s, %d max" , ep, tname[dev->ep_out[ep].type], dev->ep_out[ep].max_packet_size); } } } -fprintf (stderr,"--\n" ); +error_report ("--" ); }struct USBEndpoint *usb_ep_get (USBDevice *dev,int pid,int ep)
hw/usb/desc.c +3 -3
@@ -1,5 +1,5 @@#include "qemu/osdep.h" - +#include "qemu/error-report.h" #include "hw/usb.h" #include "hw/usb/desc.h" #include "trace.h"
@@ -688,8 +688,8 @@ int usb_desc_get_descriptor(USBDevice *dev, USBPacket *p,break ;default : -fprintf (stderr,"%s: %d unknown type %d (len %zd)\n" , __func__, - dev->addr, type, len); +error_report ("%s: %d unknown type %d (len %zd)" , __func__, + dev->addr, type, len);break ; }
hw/usb/dev-audio.c +20 -19
@@ -30,6 +30,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "hw/usb.h" #include "hw/usb/desc.h"
@@ -398,7 +399,7 @@ static int usb_audio_set_output_altset(USBAudioState *s, int altset) }if (s->debug) { -fprintf (stderr,"usb-audio: set interface %d\n" , altset); +error_report ("usb-audio: set interface %d" , altset); } s->out.altset = altset;return 0 ;
@@ -478,7 +479,7 @@ static int usb_audio_set_control(USBAudioState *s, uint8_t attrib,uint16_t vol = data[0 ] + (data[1 ] <<8 );if (s->debug) { -fprintf (stderr,"usb-audio: vol %04x\n" , (uint16_t )vol); +error_report ("usb-audio: vol %04x" , (uint16_t )vol); } vol -=0x8000 ;
@@ -496,8 +497,8 @@ static int usb_audio_set_control(USBAudioState *s, uint8_t attrib,if (set_vol) {if (s->debug) { -fprintf (stderr,"usb-audio: mute %d, lvol %3d, rvol %3d\n" , - s->out.mute, s->out.vol[0 ], s->out.vol[1 ]); +error_report ("usb-audio: mute %d, lvol %3d, rvol %3d" , + s->out.mute, s->out.vol[0 ], s->out.vol[1 ]); }AUD_set_volume_out (s->out.voice, s->out.mute, s->out.vol[0 ], s->out.vol[1 ]);
@@ -514,9 +515,9 @@ static void usb_audio_handle_control(USBDevice *dev, USBPacket *p,int ret =0 ;if (s->debug) { -fprintf (stderr,"usb-audio: control transaction: " -"request 0x%04x value 0x%04x index 0x%04x length 0x%04x\n" , - request, value, index, length); +error_report ("usb-audio: control transaction: " +"request 0x%04x value 0x%04x index 0x%04x length 0x%04x" , + request, value, index, length); } ret =usb_desc_handle_control (dev, p, request, value, index, length, data);
@@ -533,7 +534,7 @@ static void usb_audio_handle_control(USBDevice *dev, USBPacket *p, length, data);if (ret <0 ) {if (s->debug) { -fprintf (stderr,"usb-audio: fail: get control\n" ); +error_report ("usb-audio: fail: get control" ); } goto fail; }
@@ -548,7 +549,7 @@ static void usb_audio_handle_control(USBDevice *dev, USBPacket *p, length, data);if (ret <0 ) {if (s->debug) { -fprintf (stderr,"usb-audio: fail: set control\n" ); +error_report ("usb-audio: fail: set control" ); } goto fail; }
@@ -557,9 +558,9 @@ static void usb_audio_handle_control(USBDevice *dev, USBPacket *p,default : fail:if (s->debug) { -fprintf (stderr,"usb-audio: failed control transaction: " -"request 0x%04x value 0x%04x index 0x%04x length 0x%04x\n" , - request, value, index, length); +error_report ("usb-audio: failed control transaction: " +"request 0x%04x value 0x%04x index 0x%04x length 0x%04x" , + request, value, index, length); } p->status =USB_RET_STALL ;break ;
@@ -581,7 +582,7 @@ static void usb_audio_handle_reset(USBDevice *dev)USBAudioState *s =USB_AUDIO (dev);if (s->debug) { -fprintf (stderr,"usb-audio: reset\n" ); +error_report ("usb-audio: reset" ); }usb_audio_set_output_altset (s,ALTSET_OFF ); }
@@ -595,8 +596,8 @@ static void usb_audio_handle_dataout(USBAudioState *s, USBPacket *p)streambuf_put (&s->out.buf, p);if (p->actual_length < p->iov.size && s->debug >1 ) { -fprintf (stderr,"usb-audio: output overrun (%zd bytes)\n" , - p->iov.size - p->actual_length); +error_report ("usb-audio: output overrun (%zd bytes)" , + p->iov.size - p->actual_length); } }
@@ -611,9 +612,9 @@ static void usb_audio_handle_data(USBDevice *dev, USBPacket *p) p->status =USB_RET_STALL ;if (s->debug) { -fprintf (stderr,"usb-audio: failed data transaction: " -"pid 0x%x ep 0x%x len 0x%zx\n" , - p->pid, p->ep->nr, p->iov.size); +error_report ("usb-audio: failed data transaction: " +"pid 0x%x ep 0x%x len 0x%zx" , + p->pid, p->ep->nr, p->iov.size); } }
@@ -622,7 +623,7 @@ static void usb_audio_unrealize(USBDevice *dev, Error **errp)USBAudioState *s =USB_AUDIO (dev);if (s->debug) { -fprintf (stderr,"usb-audio: destroy\n" ); +error_report ("usb-audio: destroy" ); }usb_audio_set_output_altset (s,ALTSET_OFF );
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" , __func__, len); +error_report ("%s: can't alloc %i bytes" , __func__, len);exit (-1 ); } buf = fifo->data + off; }else {if (fifo->dlen > fifo->dsize) { -fprintf (stderr,"%s: can't alloc %i bytes\n" , __func__, len); +error_report ("%s: can't alloc %i bytes" , __func__, len);exit (-1 ); } buf = fifo->data + off - fifo->dsize;
hw/usb/dev-mtp.c +5 -4
@@ -10,6 +10,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include <wchar.h> #include <dirent.h>
@@ -546,7 +547,7 @@ static void inotify_watchfn(void *arg)break ;default : -fprintf (stderr,"usb-mtp: failed to parse inotify event\n" ); +error_report ("usb-mtp: failed to parse inotify event" );continue ; }
@@ -617,7 +618,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o)#ifdef CONFIG_INOTIFY1 int watchfd =usb_mtp_add_watch (s->inotifyfd, o->path);if (watchfd ==-1 ) { -fprintf (stderr,"usb-mtp: failed to add watch for %s\n" , o->path); +error_report ("usb-mtp: failed to add watch for %s" , o->path); }else {trace_usb_mtp_inotify_event (s->dev.addr, o->path,0 ,"Watch Added" );
@@ -1144,7 +1145,7 @@ static void usb_mtp_command(MTPState *s, MTPControl *c)usb_mtp_object_alloc (s, s->next_handle++,NULL , s->root);#ifdef CONFIG_INOTIFY1 if (usb_mtp_inotify_init (s)) { -fprintf (stderr,"usb-mtp: file monitoring init failed\n" ); +error_report ("usb-mtp: file monitoring init failed" ); }#endif break ;
@@ -1348,7 +1349,7 @@ static void usb_mtp_handle_control(USBDevice *dev, USBPacket *p,static void usb_mtp_cancel_packet (USBDevice *dev,USBPacket *p) {/* we don't use async packets, so this should never be called */ -fprintf (stderr,"%s\n" , __func__); +g_assert_not_reached (); }static void usb_mtp_handle_data (USBDevice *dev,USBPacket *p)
hw/usb/dev-network.c +7 -7
@@ -815,7 +815,7 @@ static int ndis_query(USBNetState *s, uint32_t oid,return sizeof (le32);default : -fprintf (stderr,"usbnet: unknown OID 0x%08x\n" , oid); +error_report ("usbnet: unknown OID 0x%08x" , oid);return 0 ; }return -1 ;
@@ -1120,9 +1120,9 @@ static void usb_net_handle_control(USBDevice *dev, USBPacket *p,default : fail: -fprintf (stderr,"usbnet: failed control transaction: " -"request 0x%x value 0x%x index 0x%x length 0x%x\n" , - request, value, index, length); +error_report ("usbnet: failed control transaction: " +"request 0x%x value 0x%x index 0x%x length 0x%x" , + request, value, index, length); p->status =USB_RET_STALL ;break ; }
@@ -1190,7 +1190,7 @@ static void usb_net_handle_dataout(USBNetState *s, USBPacket *p)uint32_t len;#ifdef TRAFFIC_DEBUG -fprintf (stderr,"usbnet: data out len %zu\n" , p->iov.size); +error_report ("usbnet: data out len %zu" , p->iov.size);iov_hexdump (p->iov.iov, p->iov.niov, stderr,"usbnet" , p->iov.size);#endif
@@ -1260,8 +1260,8 @@ static void usb_net_handle_data(USBDevice *dev, USBPacket *p) }if (p->status ==USB_RET_STALL ) { -fprintf (stderr,"usbnet: failed data transaction: " -"pid 0x%x ep 0x%x len 0x%zx\n" , +error_report ("usbnet: failed data transaction: " +"pid 0x%x ep 0x%x len 0x%zx" , p->pid, p->ep->nr, p->iov.size); } }
hw/usb/hcd-ehci.c +16 -16
@@ -419,7 +419,7 @@ static int ehci_get_pid(EHCIqtd *qtd)case 2 :return USB_TOKEN_SETUP ;default : -fprintf (stderr,"bad token\n" ); +error_report ("bad token" );return 0 ; } }
@@ -1033,7 +1033,7 @@ static void ehci_opreg_write(void *ptr, hwaddr addr,/* not supporting dynamic frame list size at the moment */ if ((val &USBCMD_FLS ) && !(s->usbcmd &USBCMD_FLS )) { -fprintf (stderr,"attempt to set frame list size -- value %d\n" , +error_report ("attempt to set frame list size -- value %d" , (int )val &USBCMD_FLS ); val &= ~USBCMD_FLS ; }
@@ -1190,7 +1190,7 @@ static int ehci_init_transfer(EHCIPacket *p)while (bytes >0 ) {if (cpage >4 ) { -fprintf (stderr,"cpage out of range (%d)\n" , cpage); +error_report ("cpage out of range (%d)" , cpage);qemu_sglist_destroy (&p->sgl);return -1 ; }
@@ -1296,7 +1296,7 @@ static void ehci_execute_complete(EHCIQueue *q)break ;default :/* should not be triggerable */ -fprintf (stderr,"USB invalid response %d\n" , p->packet.status); +error_report ("USB invalid response %d" , p->packet.status);g_assert_not_reached ();break ; }
@@ -1345,7 +1345,7 @@ static int ehci_execute(EHCIPacket *p, const char *action) p->async == EHCI_ASYNC_INITIALIZED);if (!(p->qtd.token &QTD_TOKEN_ACTIVE )) { -fprintf (stderr,"Attempting to execute inactive qtd\n" ); +error_report ("Attempting to execute inactive qtd" );return -1 ; }
@@ -1383,7 +1383,7 @@ static int ehci_execute(EHCIPacket *p, const char *action) p->packet.actual_length);if (p->packet.actual_length >BUFF_SIZE ) { -fprintf (stderr,"ret from usb_handle_packet > BUFF_SIZE\n" ); +error_report ("ret from usb_handle_packet > BUFF_SIZE" );return -1 ; }
@@ -1461,7 +1461,7 @@ static int ehci_process_itd(EHCIState *ehci,case USB_RET_SUCCESS :break ;default : -fprintf (stderr,"Unexpected iso usb result: %d\n" , +error_report ("Unexpected iso usb result: %d" , ehci->ipacket.status);/* Fall through */ case USB_RET_IOERROR :
@@ -1564,7 +1564,7 @@ static int ehci_state_fetchentry(EHCIState *ehci, int async)/* section 4.8, only QH in async schedule */ if (async && (NLPTR_TYPE_GET (entry) !=NLPTR_TYPE_QH )) { -fprintf (stderr,"non queue head request in async schedule\n" ); +error_report ("non queue head request in async schedule" );return -1 ; }
@@ -1586,8 +1586,8 @@ static int ehci_state_fetchentry(EHCIState *ehci, int async)default :/* TODO: handle FSTN type */ -fprintf (stderr,"FETCHENTRY: entry at %X is of type %d " -"which is not supported yet\n" , entry,NLPTR_TYPE_GET (entry)); +error_report ("FETCHENTRY: entry at %X is of type %d " +"which is not supported yet" , entry,NLPTR_TYPE_GET (entry));return -1 ; }
@@ -2086,7 +2086,7 @@ static void ehci_advance_state(EHCIState *ehci, int async)break ;default : -fprintf (stderr,"Bad state!\n" ); +error_report ("Bad state!" ); again =-1 ;g_assert_not_reached ();break ;
@@ -2094,7 +2094,7 @@ static void ehci_advance_state(EHCIState *ehci, int async)if (again <0 || itd_count >16 ) {/* TODO: notify guest (raise HSE irq?) */ -fprintf (stderr,"processing error - resetting ehci HC\n" ); +error_report ("processing error - resetting ehci HC" );ehci_reset (ehci); again =0 ; }
@@ -2151,8 +2151,8 @@ static void ehci_advance_async_state(EHCIState *ehci)default :/* this should only be due to a developer mistake */ -fprintf (stderr,"ehci: Bad asynchronous state %d. " -"Resetting to active\n" , ehci->astate); +error_report ("ehci: Bad asynchronous state %d. " +"Resetting to active" , ehci->astate);g_assert_not_reached (); } }
@@ -2201,8 +2201,8 @@ static void ehci_advance_periodic_state(EHCIState *ehci)default :/* this should only be due to a developer mistake */ -fprintf (stderr,"ehci: Bad periodic state %d. " -"Resetting to active\n" , ehci->pstate); +error_report ("ehci: Bad periodic state %d. " +"Resetting to active" , ehci->pstate);g_assert_not_reached (); } }
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", __func__, \ - __LINE__, ##__VA_ARGS__) +#define TRACE (fmt, ...) error_report("%s@%d: " fmt "", __func__, \ + __LINE__, ##__VA_ARGS__)#else #define TRACE (...)#endif
hw/usb/hcd-xhci.c +2 -1
@@ -19,6 +19,7 @@* License along with this library; 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 "qemu/queue.h"
@@ -39,7 +40,7 @@#else #define DPRINTF (...) do {} while (0)#endif -#define FIXME (_msg) do { fprintf(stderr, "FIXME %s:%d %s\n", \ +#define FIXME (_msg) do { error_report("FIXME %s:%d %s", \ __func__, __LINE__, _msg); abort(); } while (0)#define TRB_LINK_LIMIT 32
hw/usb/host-legacy.c +2 -1
@@ -34,6 +34,7 @@#include "qemu-common.h" #include "hw/usb.h" #include "hw/usb/host.h" +#include "qemu/error-report.h" /* * Autoconnect filter
@@ -86,7 +87,7 @@ static int parse_filter(const char *spec, struct USBAutoFilter *f) }if (i <DEV ) { -fprintf (stderr,"husb: invalid auto filter spec %s\n" , spec); +error_report ("husb: invalid auto filter spec %s" , spec);return -1 ; }
Signature · 1 line
2.14.1
PATCH v4 40/45 hw/watchdog: 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.
Some lines in wdt_i6300esb.c were manuallly changed to qemu_log_mask().
Signed-off-by Alistair Francis <[email protected]>
---
V3:
- Use qemu_log_mask(LOG_UNIMP,... in wdt_i6300esb.c
V2:
- Split hw patch into individual directories
hw/watchdog/watchdog.c | 11 +++++------ hw/watchdog/wdt_i6300esb.c | 10 +++++++--- 2 files changed, 12 insertions(+), 9 deletions(-)
hw/watchdog/watchdog.c +5 -6
@@ -20,6 +20,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/queue.h"
@@ -52,8 +53,7 @@ int select_watchdog(const char *p)/* -watchdog ? lists available devices and exits cleanly. */ if (is_help_option (p)) { QLIST_FOREACH(model, &watchdog_list, entry) { -fprintf (stderr,"\t%s\t%s\n" , - model->wdt_name, model->wdt_description); +error_report ("\t%s\t%s" , model->wdt_name, model->wdt_description); }return 2 ; }
@@ -68,10 +68,9 @@ int select_watchdog(const char *p) } } -fprintf (stderr,"Unknown -watchdog device. Supported devices are:\n" ); +error_report ("Unknown -watchdog device. Supported devices are:" ); QLIST_FOREACH(model, &watchdog_list, entry) { -fprintf (stderr,"\t%s\t%s\n" , - model->wdt_name, model->wdt_description); +error_report ("\t%s\t%s" , model->wdt_name, model->wdt_description); }return 1 ; }
@@ -126,7 +125,7 @@ void watchdog_perform_action(void)case WATCHDOG_ACTION_DEBUG :qapi_event_send_watchdog (WATCHDOG_ACTION_DEBUG , &error_abort); -fprintf (stderr,"watchdog: timer fired\n" ); +error_report ("watchdog: timer fired" );break ;case WATCHDOG_ACTION_NONE :
hw/watchdog/wdt_i6300esb.c +7 -3
@@ -20,7 +20,7 @@*/ #include "qemu/osdep.h" - +#include "include/qemu/log.h" #include "qemu-common.h" #include "qemu/timer.h" #include "sysemu/watchdog.h"
@@ -186,10 +186,14 @@ static void i6300esb_timer_expired(void *vp)/* What to do at the end of stage 1? */ switch (d->int_type) {case INT_TYPE_IRQ : -fprintf (stderr,"i6300esb_timer_expired: I would send APIC 1 INT 10 here if I knew how (XXX)\n" ); +qemu_log_mask (LOG_UNIMP , +"i6300esb: timer expired but System " +"APIC 1 INT10 not emitted\n" );break ;case INT_TYPE_SMI : -fprintf (stderr,"i6300esb_timer_expired: I would send SMI here if I knew how (XXX)\n" ); +qemu_log_mask (LOG_UNIMP , +"i6300esb: timer expired but System " +"Management Interrupt not emitted\n" );break ; }
Signature · 1 line
2.14.1
Re: [Qemu-devel] [PATCH v4 40/45] hw/watchdog: Replace fprintf(stderr, "*\n" with error_report()
Quoted 89 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 were then manually tweaked to pass checkpatch.
Some lines in
wdt_i6300esb.cwere manuallly changed toqemu_log_mask().Signed-off-by Alistair Francis <[email protected]>---
V3:
- Use qemu_log_mask(LOG_UNIMP,... inwdt_i6300esb.c
V2:
- Split hw patch into individual directorieshw/watchdog/watchdog.c | 11 +++++------ hw/watchdog/wdt_i6300esb.c | 10 +++++++--- 2 files changed, 12 insertions(+), 9 deletions(-)hw/watchdog/watchdog.c +4
-5@@ -20,6 +20,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/queue.h" @@ -52,8 +53,7 @@ int select_watchdog(const char *p)/* -watchdog ? lists available devices and exits cleanly. */ if (is_help_option (p)) { QLIST_FOREACH(model, &watchdog_list, entry) { -fprintf (stderr,"\t%s\t%s\n" , - model->wdt_name, model->wdt_description); +error_report ("\t%s\t%s" , model->wdt_name, model->wdt_description); }return 2 ; }@@ -68,10 +68,9 @@ int select_watchdog(const char *p) } } -fprintf (stderr,"Unknown -watchdog device. Supported devices are:\n" ); +error_report ("Unknown -watchdog device. Supported devices are:" ); QLIST_FOREACH(model, &watchdog_list, entry) { -fprintf (stderr,"\t%s\t%s\n" , - model->wdt_name, model->wdt_description); +error_report ("\t%s\t%s" , model->wdt_name, model->wdt_description); }return 1 ; }
hw/watchdog/watchdog.c void watchdog_perform_action(void) · line 128
Quoted 5 lines
hw/watchdog/watchdog.c +1
-1@@ -126,7 +125,7 @@ void watchdog_perform_action(void)case WATCHDOG_ACTION_DEBUG :qapi_event_send_watchdog (WATCHDOG_ACTION_DEBUG , &error_abort); -fprintf (stderr,"watchdog: timer fired\n" ); +error_report ("watchdog: timer fired" );
I don't think this is an error and would rather use info_report() here.
Richard what do you think?
Quoted 34 lines
hw/watchdog/watchdog.c +0
-0break ;case WATCHDOG_ACTION_NONE :hw/watchdog/wdt_i6300esb.c +7
-3@@ -20,7 +20,7 @@*/ #include "qemu/osdep.h" - +#include "include/qemu/log.h" #include "qemu-common.h" #include "qemu/timer.h" #include "sysemu/watchdog.h" @@ -186,10 +186,14 @@ static void i6300esb_timer_expired(void *vp)/* What to do at the end of stage 1? */ switch (d->int_type) {case INT_TYPE_IRQ : -fprintf (stderr,"i6300esb_timer_expired: I would send APIC 1 INT 10 here if I knew how (XXX)\n" ); +qemu_log_mask (LOG_UNIMP , +"i6300esb: timer expired but System " +"APIC 1 INT10 not emitted\n" );break ;case INT_TYPE_SMI : -fprintf (stderr,"i6300esb_timer_expired: I would send SMI here if I knew how (XXX)\n" ); +qemu_log_mask (LOG_UNIMP , +"i6300esb: timer expired but System " +"Management Interrupt not emitted\n" );break ; }
Re: [Qemu-devel] [PATCH v4 40/45] hw/watchdog: Replace fprintf(stderr, "*\n" with error_report()
Quoted 10 lines · Philippe Mathieu-Daudé
hw/watchdog/watchdog.c void watchdog_perform_action(void) · line 128
Quoted 6 lines
hw/watchdog/watchdog.c +1
-1@@ -126,7 +125,7 @@ void watchdog_perform_action(void)case WATCHDOG_ACTION_DEBUG :qapi_event_send_watchdog (WATCHDOG_ACTION_DEBUG , &error_abort); -fprintf (stderr,"watchdog: timer fired\n" ); +error_report ("watchdog: timer fired" );I don't think this is an error and would rather use
info_report()here.Richard what do you think?
Yes, this is not an error. It's an informational message.
Rich.
Signature · 5 lines
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top
PATCH v4 41/45 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]>
---
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 v4 42/45 util: 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}' \
{} +The error in aio_poll() was removed manually.
Signed-off-by Alistair Francis <[email protected]>
Cc Kevin Wolf <[email protected]>
Cc Markus Armbruster <[email protected]>
Cc Paolo Bonzini <[email protected]>
Cc Stefan Weil <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
V4:
- Remove the error in aio_poll()
util/aio-posix.c | 1 + util/coroutine-sigaltstack.c | 2 +- util/error.c | 4 ++-- util/main-loop.c | 2 +- util/mmap-alloc.c | 3 ++- util/module.c | 6 +++--- util/osdep.c | 4 ++-- util/oslib-posix.c | 3 ++- util/oslib-win32.c | 3 ++- util/qemu-coroutine.c | 5 +++-- util/qemu-progress.c | 3 ++- util/qemu-thread-posix.c | 5 +++-- util/qemu-thread-win32.c | 5 +++-- util/qemu-timer-common.c | 3 ++- util/qht.c | 2 +- 15 files changed, 30 insertions(+), 21 deletions(-)
util/aio-posix.c +1 -0
@@ -15,6 +15,7 @@#include "qemu/osdep.h" #include "qemu-common.h" +#include "qemu/error-report.h" #include "block/block.h" #include "qemu/rcu_queue.h" #include "qemu/sockets.h"
util/coroutine-sigaltstack.c +1 -1
@@ -80,7 +80,7 @@ static void __attribute__((constructor)) coroutine_init(void) ret =pthread_key_create (&thread_state_key, qemu_coroutine_thread_cleanup);if (ret !=0 ) { -fprintf (stderr,"unable to create leader key: %s\n" ,strerror (errno)); +error_report ("unable to create leader key: %s" ,strerror (errno));abort (); } }
util/error.c +2 -2
@@ -32,8 +32,8 @@ Error *error_fatal;static void error_handle_fatal (Error **errp,Error *err) {if (errp == &error_abort) { -fprintf (stderr,"Unexpected error in %s() at %s:%d:\n" , - err->func, err->src, err->line); +error_report ("Unexpected error in %s() at %s:%d:" , + err->func, err->src, err->line);error_report_err (err);abort (); }
util/main-loop.c +1 -1
@@ -95,7 +95,7 @@ static int qemu_signal_init(void)sigdelset (&set,SIG_IPI ); sigfd =qemu_signalfd (&set);if (sigfd ==-1 ) { -fprintf (stderr,"failed to create signalfd\n" ); +error_report ("failed to create signalfd" );return -errno; }
util/mmap-alloc.c +2 -1
@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/mmap-alloc.h" #include "qemu/host-utils.h"
@@ -51,7 +52,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path) }while (ret !=0 && errno ==EINTR );if (ret !=0 ) { -fprintf (stderr,"Couldn't statfs() memory path: %s\n" , +error_report ("Couldn't statfs() memory path: %s" ,strerror (errno));exit (1 ); }
util/module.c +3 -3
@@ -124,13 +124,13 @@ static int module_load_file(const char *fname) g_module =g_module_open (fname,G_MODULE_BIND_LAZY |G_MODULE_BIND_LOCAL );if (!g_module) { -fprintf (stderr,"Failed to open module: %s\n" , +error_report ("Failed to open module: %s" ,g_module_error ()); ret = -EINVAL ; goto out; }if (!g_module_symbol (g_module,DSO_STAMP_FUN_STR , (gpointer *)&sym)) { -fprintf (stderr,"Failed to initialize module: %s\n" , +error_report ("Failed to initialize module: %s" , fname);/* Print some info if this is a QEMU module (but from different build), * this will make debugging user problems easier. */
@@ -169,7 +169,7 @@ void module_load_one(const char *prefix, const char *lib_name)static GHashTable *loaded_modules;if (!g_module_supported ()) { -fprintf (stderr,"Module is not supported by system.\n" ); +error_report ("Module is not supported by system." );return ; }
util/osdep.c +2 -2
@@ -466,7 +466,7 @@ void fips_set_state(bool requested)#endif /* __linux__ */ #ifdef _FIPS_DEBUG -fprintf (stderr,"FIPS mode %s (requested %s)\n" , +error_report ("FIPS mode %s (requested %s)" , (fips_enabled ?"enabled" :"disabled" ), (requested ?"enabled" :"disabled" ));#endif
@@ -493,7 +493,7 @@ int socket_init(void) ret =WSAStartup (MAKEWORD (2 ,2 ), &Data);if (ret !=0 ) { err =WSAGetLastError (); -fprintf (stderr,"WSAStartup: %d\n" , err); +error_report ("WSAStartup: %d" , err);return -1 ; }atexit (socket_cleanup);
util/oslib-posix.c +2 -1
@@ -34,6 +34,7 @@#include "sysemu/sysemu.h" #include "trace.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "qemu/sockets.h" #include <libgen.h> #include <sys/signal.h>
@@ -91,7 +92,7 @@ int qemu_daemon(int nochdir, int noclose)void *qemu_oom_check (void *ptr) {if (ptr ==NULL ) { -fprintf (stderr,"Failed to allocate memory: %s\n" ,strerror (errno)); +error_report ("Failed to allocate memory: %s" ,strerror (errno));abort (); }return ptr;
util/oslib-win32.c +2 -1
@@ -30,6 +30,7 @@* see the license comment there. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include <windows.h> #include "qapi/error.h" #include "sysemu/sysemu.h"
@@ -44,7 +45,7 @@void *qemu_oom_check (void *ptr) {if (ptr ==NULL ) { -fprintf (stderr,"Failed to allocate memory: %lu\n" ,GetLastError ()); +error_report ("Failed to allocate memory: %lu" ,GetLastError ());abort (); }return ptr;
util/qemu-coroutine.c +3 -2
@@ -13,6 +13,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "trace.h" #include "qemu-common.h" #include "qemu/thread.h"
@@ -110,7 +111,7 @@ void qemu_aio_coroutine_enter(AioContext *ctx, Coroutine *co)trace_qemu_aio_coroutine_enter (ctx, self, co, co->entry_arg);if (co->caller) { -fprintf (stderr,"Co-routine re-entered recursively\n" ); +error_report ("Co-routine re-entered recursively" );abort (); }
@@ -164,7 +165,7 @@ void coroutine_fn qemu_coroutine_yield(void)trace_qemu_coroutine_yield (self, to);if (!to) { -fprintf (stderr,"Co-routine is yielding to no one\n" ); +error_report ("Co-routine is yielding to no one" );abort (); }
util/qemu-progress.c +2 -1
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" struct progress_state {
@@ -68,7 +69,7 @@ static void sigusr_print(int signal)static void progress_dummy_print (void ) {if (print_pending) { -fprintf (stderr," (%3.2f/100%%)\n" , state.current); +error_report (" (%3.2f/100%%)" , state.current); print_pending =0 ; } }
util/qemu-thread-posix.c +3 -2
@@ -11,6 +11,7 @@* */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/thread.h" #include "qemu/atomic.h" #include "qemu/notify.h"
@@ -25,14 +26,14 @@ void qemu_thread_naming(bool enable)#ifndef CONFIG_THREAD_SETNAME_BYTHREAD /* This is a debugging option, not fatal */ if (enable) { -fprintf (stderr,"qemu: thread naming not supported on this host\n" ); +error_report ("thread naming not supported on this host" ); }#endif }static void error_exit (int err,const char *msg) { -fprintf (stderr,"qemu: %s: %s\n" , msg,strerror (err)); +error_report ("%s: %s" , msg,strerror (err));abort (); }
util/qemu-thread-win32.c +3 -2
@@ -16,6 +16,7 @@#endif #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/thread.h" #include "qemu/notify.h"
@@ -29,7 +30,7 @@ void qemu_thread_naming(bool enable)/* But note we don't actually name them on Windows yet */ name_threads = enable; -fprintf (stderr,"qemu: thread naming not supported on this host\n" ); +error_report ("thread naming not supported on this host" ); }static void error_exit (int err,const char *msg)
@@ -38,7 +39,7 @@ static void error_exit(int err, const char *msg)FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM |FORMAT_MESSAGE_ALLOCATE_BUFFER ,NULL , err,0 , (LPTSTR )&pstr,2 ,NULL ); -fprintf (stderr,"qemu: %s: %s\n" , msg, pstr); +error_report ("%s: %s" , msg, pstr);LocalFree (pstr);abort (); }
util/qemu-timer-common.c +2 -1
@@ -22,6 +22,7 @@* THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/timer.h" /***********************************************************/
@@ -37,7 +38,7 @@ static void __attribute__((constructor)) init_get_clock(void)int ret; ret =QueryPerformanceFrequency (&freq);if (ret ==0 ) { -fprintf (stderr,"Could not calibrate ticks\n" ); +error_report ("Could not calibrate ticks" );exit (1 ); } clock_freq = freq.QuadPart;
util/qht.c +1 -1
@@ -154,7 +154,7 @@ static void qht_bucket_debug__locked(struct qht_bucket *b)continue ; }if (seen_empty) { -fprintf (stderr,"%s: b: %p, pos: %i, hash: 0x%x, p: %p\n" , +error_report ("%s: b: %p, pos: %i, hash: 0x%x, p: %p" , __func__, b, i, b->hashes[i], b->pointers[i]); corrupt = true; }
Signature · 1 line
2.14.1
PATCH v4 43/45 ui: 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 Peter Maydell <[email protected]>
Cc Gerd Hoffmann <[email protected]>
---
ui/cocoa.m | 6 +++--- ui/console.c | 2 +- ui/curses.c | 2 +- ui/cursor.c | 10 +++++----- ui/gtk.c | 10 +++++----- ui/input-linux.c | 3 ++- ui/keymaps.c | 4 ++-- ui/sdl.c | 14 +++++++------- ui/sdl2.c | 8 ++++---- ui/sdl_zoom.c | 3 ++- ui/shader.c | 9 +++++---- ui/spice-display.c | 10 +++++----- ui/vnc-enc-tight.c | 4 ++-- ui/vnc-enc-zlib.c | 4 ++-- ui/vnc-enc-zrle.c | 4 ++-- ui/vnc.c | 2 +- 16 files changed, 49 insertions(+), 46 deletions(-)
ui/cocoa.m +3 -3
@@ -235,7 +235,7 @@ const int mac_to_qkeycode_map[] = { static int cocoa_keycode_to_qemu(int keycode) { if (ARRAY_SIZE(mac_to_qkeycode_map) <= keycode) { - fprintf(stderr, "(cocoa) warning unknown keycode 0x%x\n", keycode); + error_report("(cocoa) warning unknown keycode 0x%x", keycode); return 0; } return mac_to_qkeycode_map[keycode];
@@ -945,7 +945,7 @@ QemuCocoaView *cocoaView; // create a view and add it to the window cocoaView = [[QemuCocoaView alloc] initWithFrame:NSMakeRect(0.0, 0.0, 640.0, 480.0)]; if(!cocoaView) { - fprintf(stderr, "(cocoa) can't create a view\n"); + error_report("(cocoa) can't create a view"); exit(1); }
@@ -954,7 +954,7 @@ QemuCocoaView *cocoaView; styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskMiniaturizable|NSWindowStyleMaskClosable backing:NSBackingStoreBuffered defer:NO]; if(!normalWindow) { - fprintf(stderr, "(cocoa) can't create window\n"); + error_report("(cocoa) can't create window"); exit(1); } [normalWindow setAcceptsMouseMovedEvents:YES];
ui/console.c +1 -1
@@ -1422,7 +1422,7 @@ void register_displaychangelistener(DisplayChangeListener *dcl)/* display has opengl support */ assert (dcl->con);if (dcl->con->gl) { -fprintf (stderr,"can't register two opengl displays (%s, %s)\n" , +error_report ("can't register two opengl displays (%s, %s)" , dcl->ops->dpy_name, dcl->con->gl->ops->dpy_name);exit (1 ); }
ui/curses.c +1 -1
@@ -438,7 +438,7 @@ void curses_display_init(DisplayState *ds, int full_screen) {#ifndef _WIN32if (!isatty (1 )) { -fprintf (stderr,"We need a terminal output\n" ); +error_report ("We need a terminal output" );exit (1 ); }#endif
ui/cursor.c +5 -5
@@ -18,12 +18,12 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[])/* parse header line: width, height, #colors, #chars */ if (sscanf (xpm[line],"%u %u %u %u" , &width, &height, &colors, &chars) !=4 ) { -fprintf (stderr,"%s: header parse error: \"%s\"\n" , - __func__, xpm[line]); +error_report ("%s: header parse error: \"%s\"" , + __func__, xpm[line]);return NULL ; }if (chars !=1 ) { -fprintf (stderr,"%s: chars != 1 not supported\n" , __func__); +error_report ("%s: chars != 1 not supported" , __func__);return NULL ; } line++;
@@ -40,7 +40,7 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[])continue ; } } -fprintf (stderr,"%s: color parse error: \"%s\"\n" , +error_report ("%s: color parse error: \"%s\"" , __func__, xpm[line]);return NULL ; }
@@ -75,7 +75,7 @@ void cursor_print_ascii_art(QEMUCursor *c, const char *prefix)fprintf (stderr,"o" );/* other */ } } -fprintf (stderr,"|\n" ); +error_report ("|" ); } }
ui/gtk.c +5 -5
@@ -1254,7 +1254,7 @@ static gboolean gd_win_grab(void *opaque) {VirtualConsole *vc = opaque; -fprintf (stderr,"%s: %s\n" , __func__, vc->label); +error_report ("%s: %s" , __func__, vc->label);if (vc->s->ptr_owner) {gd_ungrab_pointer (vc->s); }else {
@@ -2215,12 +2215,12 @@ static void gd_set_keycode_type(GtkDisplayState *s) keycodes =XGetAtomName (x11_display, desc->names->keycodes); }if (keycodes ==NULL ) { -fprintf (stderr,"could not lookup keycode name\n" ); +error_report ("could not lookup keycode name" ); }else if (strstart (keycodes,"evdev" ,NULL )) { s->has_evdev = true; }else if (!strstart (keycodes,"xfree86" ,NULL )) { -fprintf (stderr,"unknown keycodes `%s', please report to " -"[email protected]\n" , keycodes); +error_report ("unknown keycodes `%s', please report to " +"[email protected]" , keycodes); }if (desc) {
@@ -2244,7 +2244,7 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)GdkDisplay *window_display;if (!gtkinit) { -fprintf (stderr,"gtk initialization failed\n" ); +error_report ("gtk initialization failed" );exit (1 ); }
ui/input-linux.c +2 -1
@@ -5,6 +5,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "qemu/config-file.h"
@@ -241,7 +242,7 @@ static void input_linux_event(void *opaque) rc =read (il->fd, &p[il->read_offset], read_size);if (rc != read_size) {if (rc <0 && errno !=EAGAIN ) { -fprintf (stderr,"%s: read: %s\n" , __func__,strerror (errno)); +error_report ("%s: read: %s" , __func__,strerror (errno));qemu_set_fd_handler (il->fd,NULL ,NULL ,NULL );close (il->fd); }else if (rc >0 ) {
ui/keymaps.c +2 -2
@@ -105,7 +105,7 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, f = filename ?fopen (filename,"r" ) :NULL ;g_free (filename);if (!f) { -fprintf (stderr,"Could not read keymap file: '%s'\n" , language); +error_report ("Could not read keymap file: '%s'" , language);return NULL ; }
@@ -150,7 +150,7 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,if (strstr (rest,"numlock" )) {add_to_key_range (&k->keypad_range, keycode);add_to_key_range (&k->numlock_range, keysym); -/* fprintf(stderr, "keypad keysym %04x keycode %d\n", +/* error_report("keypad keysym %04x keycode %d", keysym, keycode); */ }
ui/sdl.c +7 -7
@@ -91,7 +91,7 @@ static void sdl_update(DisplayChangeListener *dcl,SDL_BlitSurface (guest_screen, &rec, real_screen, &rec); }else {if (sdl_zoom_blit (guest_screen, real_screen,SMOOTHING_ON , &rec) <0 ) { -fprintf (stderr,"Zoom blit failed\n" ); +error_report ("Zoom blit failed" );exit (1 ); } }
@@ -120,7 +120,7 @@ static void do_sdl_resize(int width, int height, int bpp) tmp_screen =SDL_SetVideoMode (width, height, bpp, flags);if (!real_screen) {if (!tmp_screen) { -fprintf (stderr,"Could not open SDL display (%dx%dx%d): %s\n" , +error_report ("Could not open SDL display (%dx%dx%d): %s" , width, height, bpp,SDL_GetError ());exit (1 ); }
@@ -130,7 +130,7 @@ static void do_sdl_resize(int width, int height, int bpp)* resolution failed. */ if (!tmp_screen) { -fprintf (stderr,"Failed to set SDL display (%dx%dx%d): %s\n" , +error_report ("Failed to set SDL display (%dx%dx%d): %s" , width, height, bpp,SDL_GetError ());return ; }
@@ -241,12 +241,12 @@ static int check_for_evdev(void) XkbKeycodesNameMask, desc) == Success)) { keycodes =XGetAtomName (info.info.x11.display, desc->names->keycodes);if (keycodes ==NULL ) { -fprintf (stderr,"could not lookup keycode name\n" ); +error_report ("could not lookup keycode name" ); }else if (strstart (keycodes,"evdev" ,NULL )) { has_evdev =1 ; }else if (!strstart (keycodes,"xfree86" ,NULL )) { -fprintf (stderr,"unknown keycodes `%s', please report to " -"[email protected]\n" , keycodes); +error_report ("unknown keycodes `%s', please report to " +"[email protected]" , keycodes); } }
@@ -988,7 +988,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) flags =SDL_INIT_VIDEO |SDL_INIT_NOPARACHUTE ;if (SDL_Init (flags)) { -fprintf (stderr,"Could not initialize SDL(%s) - exiting\n" , +error_report ("Could not initialize SDL(%s) - exiting" ,SDL_GetError ());exit (1 ); }
ui/sdl2.c +4 -4
@@ -400,7 +400,7 @@ static void handle_keydown(SDL_Event *ev) 160); height = (surface_height (scon->surface) * width) /surface_width (scon->surface); -fprintf (stderr,"%s: scale to %dx%d\n" , +error_report ("%s: scale to %dx%d" , __func__, width, height);sdl_scale (scon, width, height);sdl2_redraw (scon);
@@ -686,13 +686,13 @@ static void sdl_mouse_define(DisplayChangeListener *dcl, 0xff0000, 0x00ff00, 0xff, 0xff000000);if (!guest_sprite_surface) { -fprintf (stderr,"Failed to make rgb surface from %p\n" , c); +error_report ("Failed to make rgb surface from %p" , c);return ; } guest_sprite =SDL_CreateColorCursor (guest_sprite_surface, c->hot_x, c->hot_y);if (!guest_sprite) { -fprintf (stderr,"Failed to make color cursor from %p\n" , c); +error_report ("Failed to make color cursor from %p" , c);return ; } if (guest_cursor &&
@@ -783,7 +783,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) flags =SDL_INIT_VIDEO |SDL_INIT_NOPARACHUTE ;if (SDL_Init (flags)) { -fprintf (stderr,"Could not initialize SDL(%s) - exiting\n" , +error_report ("Could not initialize SDL(%s) - exiting" ,SDL_GetError ());exit (1 ); }
ui/sdl_zoom.c +2 -1
@@ -12,6 +12,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "sdl_zoom.h" static void sdl_zoom_rgb16(SDL_Surface *src, SDL_Surface *dst, int smooth,
@@ -81,7 +82,7 @@ int sdl_zoom_blit(SDL_Surface *src_sfc, SDL_Surface *dst_sfc, int smooth,else if (src_sfc->format->BitsPerPixel ==16 )sdl_zoom_rgb16 (src_sfc, dst_sfc, smooth, &zoom);else { -fprintf (stderr,"pixel format not supported\n" ); +error_report ("pixel format not supported" );return -1 ; }
ui/shader.c +5 -4
@@ -25,6 +25,7 @@* THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "ui/shader.h"
@@ -96,9 +97,9 @@ static GLuint qemu_gl_create_compile_shader(GLenum type, const GLchar *src)glGetShaderiv (shader,GL_INFO_LOG_LENGTH , &length); errmsg =g_malloc (length);glGetShaderInfoLog (shader, length, &length, errmsg); -fprintf (stderr,"%s: compile %s error\n%s\n" , __func__, - (type ==GL_VERTEX_SHADER ) ?"vertex" :"fragment" , - errmsg); +error_report ("%s: compile %s error: %s" , __func__, + (type ==GL_VERTEX_SHADER ) ?"vertex" :"fragment" , + errmsg);g_free (errmsg);return 0 ; }
@@ -121,7 +122,7 @@ static GLuint qemu_gl_create_link_program(GLuint vert, GLuint frag)glGetProgramiv (program,GL_INFO_LOG_LENGTH , &length); errmsg =g_malloc (length);glGetProgramInfoLog (program, length, &length, errmsg); -fprintf (stderr,"%s: link program: %s\n" , __func__, errmsg); +error_report ("%s: link program: %s" , __func__, errmsg);g_free (errmsg);return 0 ; }
ui/spice-display.c +5 -5
@@ -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" , __func__); +error_report ("%s: abort()" , __func__);abort (); }static int interface_flush_resources (QXLInstance *sin) { -fprintf (stderr,"%s: abort()\n" , __func__); +error_report ("%s: abort()" , __func__);abort ();return 0 ; }
@@ -646,7 +646,7 @@ static void interface_update_area_complete(QXLInstance *sin, QXLRect *dirty, uint32_t num_updated_rects) {/* should never be called, used in qxl native mode only */ - fprintf(stderr, "%s: abort()\n", __func__); +error_report ("%s: abort()" , __func__);abort (); }
@@ -671,7 +671,7 @@ static void interface_async_complete(QXLInstance *sin, uint64_t cookie_token)#endif default :/* should never be called, used in qxl native mode only */ -fprintf (stderr,"%s: abort()\n" , __func__); +error_report ("%s: abort()" , __func__);abort (); }g_free (cookie);
@@ -955,7 +955,7 @@ static void qemu_spice_gl_scanout_texture(DisplayChangeListener *dcl,assert (tex_id); fd =egl_get_fd_for_texture (tex_id, &stride, &fourcc);if (fd <0 ) { -fprintf (stderr,"%s: failed to get fd for texture\n" , __func__); +error_report ("%s: failed to get fd for texture" , __func__);return ; } dprint(1, "%s: %dx%d (stride %d, fourcc 0x%x)\n", __func__,
ui/vnc-enc-tight.c +2 -2
@@ -800,7 +800,7 @@ static int tight_init_stream(VncState *vs, int stream_id, MAX_MEM_LEVEL, strategy);if (err !=Z_OK ) { -fprintf (stderr,"VNC: error initializing zlib\n" ); +error_report ("VNC: error initializing zlib" );return -1 ; }
@@ -865,7 +865,7 @@ static int tight_compress_data(VncState *vs, int stream_id, size_t bytes,/* start encoding */ if (deflate (zstream,Z_SYNC_FLUSH ) !=Z_OK ) { -fprintf (stderr,"VNC: error during tight compression\n" ); +error_report ("VNC: error during tight compression" );return -1 ; }
ui/vnc-enc-zlib.c +2 -2
@@ -80,7 +80,7 @@ static int vnc_zlib_stop(VncState *vs) MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY);if (err !=Z_OK ) { -fprintf (stderr,"VNC: error initializing zlib\n" ); +error_report ("VNC: error initializing zlib" );return -1 ; }
@@ -109,7 +109,7 @@ static int vnc_zlib_stop(VncState *vs)// start encoding if (deflate (zstream,Z_SYNC_FLUSH ) !=Z_OK ) { -fprintf (stderr,"VNC: error during zlib compression\n" ); +error_report ("VNC: error during zlib compression" );return -1 ; }
ui/vnc-enc-zrle.c +2 -2
@@ -85,7 +85,7 @@ static int zrle_compress_data(VncState *vs, int level) MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY);if (err !=Z_OK ) { -fprintf (stderr,"VNC: error initializing zlib\n" ); +error_report ("VNC: error initializing zlib" );return -1 ; }
@@ -104,7 +104,7 @@ static int zrle_compress_data(VncState *vs, int level)/* start encoding */ if (deflate (zstream,Z_SYNC_FLUSH ) !=Z_OK ) { -fprintf (stderr,"VNC: error during zrle compression\n" ); +error_report ("VNC: error during zrle compression" );return -1 ; }
ui/vnc.c +1 -1
@@ -71,7 +71,7 @@ static void vnc_set_share_mode(VncState *vs, VncShareMode mode) [VNC_SHARE_MODE_EXCLUSIVE] = "exclusive", [VNC_SHARE_MODE_DISCONNECTED ] ="disconnected" , }; -fprintf (stderr,"%s/%p: %s -> %s\n" , __func__, +error_report ("%s/%p: %s -> %s" , __func__, vs->ioc, mn[vs->share_mode], mn[mode]);#endif
Signature · 1 line
2.14.1
PATCH v4 44/45 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 | 8 ++++---- exec.c | 14 +++++++------- tcg/optimize.c | 8 ++++---- tcg/tcg.c | 2 +- tcg/tcg.h | 3 ++- tcg/tci.c | 2 +- tcg/tci/tcg-target.inc.c | 4 ++-- vl.c | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-)
cpus.c +4 -4
@@ -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,7 +1527,7 @@ 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" , +error_report ("%s: QueueUserAPC failed with error %lu" , __func__,GetLastError ());exit (1 ); }
exec.c +7 -7
@@ -1076,7 +1076,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:
@@ -1689,7 +1689,7 @@ 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" , +error_report ("Failed to find gap of requested size: %" PRIu64"" , (uint64_t )size);abort (); }
@@ -1719,8 +1719,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" ); } } }
@@ -1756,7 +1756,7 @@ 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" , +error_report ("RAMBlock \"%s\" already registered, abort!" , new_block->idstr);abort (); }
@@ -2184,8 +2184,8 @@ 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" , +error_report ("Could not remap addr: " +RAM_ADDR_FMT "@" RAM_ADDR_FMT "" , length, addr);exit (1 ); }
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 -1
@@ -35,7 +35,7 @@/* Marker for missing code. */ #define TODO () \ do { \ - fprintf(stderr, "TODO %s:%u: %s()\n", \ + error_report("TODO %s:%u: %s()", \ __FILE__, __LINE__, __func__); \ tcg_abort(); \ } while (0)
tcg/tci/tcg-target.inc.c +2 -2
@@ -29,7 +29,7 @@/* Marker for missing code. */ #define TODO () \ do { \ - fprintf(stderr, "TODO %s:%u: %s()\n", \ + error_report("TODO %s:%u: %s()", \ __FILE__, __LINE__, __func__); \ tcg_abort(); \ } while (0)
@@ -403,7 +403,7 @@ 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" , +error_report ("TCG %s %u, %u, %u" , def->name, def->nb_oargs, def->nb_iargs, def->nb_cargs); }#endif
vl.c +1 -1
@@ -2232,7 +2232,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