* [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "*
@ 2017-09-30 0:14 Alistair Francis
2017-09-30 0:14 ` Alistair Francis
` (46 more replies)
0 siblings, 47 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:14 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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.
This series has expaneded a little bit and is now pretty intense. Sorry
about that.
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 (47):
Replace all occurances of __FUNCTION__ with __func__
Fixes after renaming __FUNCTION__ to __func__
audio: Replace AUDIO_FUNC with __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/m68k: 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, ...)
target: Replace fprintf(stderr, "*\n" with error_report()
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 | 34 +++++++--------
hw/arm/gumstix.c | 13 +++---
hw/arm/mainstone.c | 7 ++--
hw/arm/musicpal.c | 2 +-
hw/arm/nseries.c | 2 +-
hw/arm/omap1.c | 47 +++++++++++----------
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 | 17 ++++----
hw/bt/hci.c | 48 ++++++++++-----------
hw/bt/hid.c | 4 +-
hw/bt/l2cap.c | 49 +++++++++++-----------
hw/bt/sdp.c | 11 ++---
hw/char/exynos4210_uart.c | 6 +--
hw/char/mcf_uart.c | 5 ++-
hw/char/sh_serial.c | 9 ++--
hw/core/loader.c | 31 +++++++-------
hw/core/ptimer.c | 7 ++--
hw/cris/axis_dev88.c | 3 +-
hw/cris/boot.c | 5 ++-
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 | 37 +++++++++--------
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 | 18 ++++----
hw/i386/pc_piix.c | 2 +-
hw/i386/pc_sysfw.c | 5 ++-
hw/i386/xen/xen-hvm.c | 32 +++++++-------
hw/i386/xen/xen-mapcache.c | 12 +++---
hw/i386/xen/xen_apic.c | 3 +-
hw/ide/ahci.c | 6 +--
hw/ide/core.c | 2 +-
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.c | 1 +
hw/ipmi/ipmi_bmc_extern.c | 5 ++-
hw/isa/isa-bus.c | 7 ++--
hw/isa/vt82c686.c | 2 +-
hw/lm32/lm32_boards.c | 5 ++-
hw/lm32/milkymist.c | 5 ++-
hw/m68k/an5206.c | 4 +-
hw/m68k/mcf5206.c | 3 +-
hw/m68k/mcf5208.c | 7 ++--
hw/microblaze/boot.c | 2 +-
hw/mips/boston.c | 4 +-
hw/mips/gt64xxx_pci.c | 2 +-
hw/mips/mips_fulong2e.c | 4 +-
hw/mips/mips_jazz.c | 4 +-
hw/mips/mips_malta.c | 4 +-
hw/mips/mips_mipssim.c | 4 +-
hw/mips/mips_r4k.c | 6 +--
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 | 7 ++--
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 | 4 +-
hw/openrisc/openrisc_sim.c | 3 +-
hw/pci-host/bonito.c | 8 ++--
hw/pci/pci.c | 10 ++---
hw/ppc/e500.c | 20 ++++-----
hw/ppc/mac_newworld.c | 2 +-
hw/ppc/mac_oldworld.c | 2 +-
hw/ppc/mpc8544_guts.c | 5 ++-
hw/ppc/ppc405_boards.c | 8 ++--
hw/ppc/ppc440_bamboo.c | 19 +++++----
hw/ppc/ppc4xx_pci.c | 3 +-
hw/ppc/prep.c | 4 +-
hw/ppc/virtex_ml507.c | 4 +-
hw/s390x/virtio-ccw.c | 2 +-
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 | 14 +++----
hw/sh4/r2d.c | 9 ++--
hw/sh4/sh7750.c | 64 ++++++++++++++--------------
hw/sparc/leon3.c | 9 ++--
hw/sparc/sun4m.c | 8 ++--
hw/sparc64/niagara.c | 2 +-
hw/sparc64/sun4u.c | 9 ++--
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 | 4 +-
hw/usb/dev-audio.c | 29 ++++++-------
hw/usb/dev-bluetooth.c | 4 +-
hw/usb/dev-mtp.c | 9 ++--
hw/usb/dev-network.c | 20 ++++-----
hw/usb/hcd-ehci.c | 32 +++++++-------
hw/usb/hcd-musb.c | 4 +-
hw/usb/hcd-xhci.c | 3 +-
hw/usb/host-legacy.c | 2 +-
hw/usb/tusb6010.c | 14 +++----
hw/watchdog/watchdog.c | 9 ++--
hw/watchdog/wdt_i6300esb.c | 8 ++--
hw/xen/xen-common.c | 11 ++---
hw/xen/xen_pt.c | 4 +-
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/arm/arm-powerctl.c | 5 ++-
target/arm/arm-semi.c | 3 +-
target/arm/helper.c | 4 +-
target/arm/kvm.c | 16 +++----
target/arm/kvm32.c | 2 +-
target/arm/kvm64.c | 2 +-
target/arm/translate-a64.c | 4 +-
target/arm/translate.c | 2 +-
target/cris/helper.c | 2 +-
target/cris/translate.c | 2 +-
target/i386/hax-all.c | 52 +++++++++++------------
target/i386/hax-darwin.c | 26 ++++++------
target/i386/hax-mem.c | 4 +-
target/i386/hax-windows.c | 42 +++++++++----------
target/i386/kvm.c | 38 ++++++++---------
target/i386/misc_helper.c | 12 +++---
target/lm32/op_helper.c | 4 +-
target/mips/mips-semi.c | 3 +-
target/mips/translate.c | 2 +-
target/ppc/excp_helper.c | 4 +-
target/ppc/kvm.c | 34 +++++++--------
target/ppc/mmu-hash64.c | 2 +-
target/ppc/mmu_helper.c | 2 +-
target/ppc/translate.c | 22 +++++-----
target/ppc/translate_init.c | 53 ++++++++++++------------
target/s390x/kvm.c | 20 ++++-----
target/s390x/misc_helper.c | 2 +-
target/sh4/translate.c | 4 +-
target/unicore32/translate.c | 4 +-
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/stress.c | 36 ++++++++--------
tests/postcopy-test.c | 8 ++--
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 | 5 ++-
util/coroutine-sigaltstack.c | 2 +-
util/error.c | 2 +-
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 +-
265 files changed, 1426 insertions(+), 1341 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 01/47] Replace all occurances of __FUNCTION__ with __func__
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
@ 2017-09-30 0:14 ` Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 02/47] Fixes after renaming __FUNCTION__ to __func__ Alistair Francis
` (45 subsequent siblings)
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:14 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Gerd Hoffmann,
Andrzej Zaborowski, Stefano Stabellini, Anthony Perard,
John Snow, Aurelien Jarno, Yongbok Kim, Peter Crosthwaite,
Stefan Hajnoczi, Fam Zheng, Juan Quintela,
Dr. David Alan Gilbert, qemu-arm, qemu-block, xen-devel
Replace 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 <alistair.francis@xilinx.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: John Snow <jsnow@redhat.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Yongbok Kim <yongbok.kim@imgtec.com>
Cc: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Fam Zheng <famz@redhat.com>
Cc: Juan Quintela <quintela@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: qemu-arm@nongnu.org
Cc: qemu-block@nongnu.org
Cc: xen-devel@lists.xenproject.org
Reviewed-by: Eric Blake <eblake@redhat.com>
---
audio/audio_int.h | 2 +-
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 ++--
65 files changed, 273 insertions(+), 273 deletions(-)
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 5bcb1c60e1..543b1bd8d5 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -253,7 +253,7 @@ static inline int audio_ring_dist (int dst, int src, int len)
#define AUDIO_STRINGIFY(n) AUDIO_STRINGIFY_(n)
#if defined _MSC_VER || defined __GNUC__
-#define AUDIO_FUNC __FUNCTION__
+#define AUDIO_FUNC __func__
#else
#define AUDIO_FUNC __FILE__ ":" AUDIO_STRINGIFY (__LINE__)
#endif
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 58005b6619..32687afced 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -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)) {
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index b3e7625130..1388200191 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -999,7 +999,7 @@ static uint64_t omap_id_read(void *opaque, hwaddr addr,
case omap1510:
return 0x03310115;
default:
- hw_error("%s: bad mpu model\n", __FUNCTION__);
+ hw_error("%s: bad mpu model\n", __func__);
}
break;
@@ -1010,7 +1010,7 @@ static uint64_t omap_id_read(void *opaque, hwaddr addr,
case omap1510:
return 0xfb47002f;
default:
- hw_error("%s: bad mpu model\n", __FUNCTION__);
+ hw_error("%s: bad mpu model\n", __func__);
}
break;
}
@@ -1716,7 +1716,7 @@ static void omap_clkm_write(void *opaque, hwaddr addr,
case 0x18: /* ARM_SYSST */
if ((s->clkm.clocking_scheme ^ (value >> 11)) & 7) {
s->clkm.clocking_scheme = (value >> 11) & 7;
- printf("%s: clocking scheme set to %s\n", __FUNCTION__,
+ printf("%s: clocking scheme set to %s\n", __func__,
clkschemename[s->clkm.clocking_scheme]);
}
s->clkm.cold_start &= value & 0x3f;
@@ -2129,14 +2129,14 @@ qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s)
void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler)
{
if (line >= 16 || line < 0)
- hw_error("%s: No GPIO line %i\n", __FUNCTION__, line);
+ hw_error("%s: No GPIO line %i\n", __func__, line);
s->handler[line] = handler;
}
void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down)
{
if (row >= 5 || row < 0)
- hw_error("%s: No key %i-%i\n", __FUNCTION__, col, row);
+ hw_error("%s: No key %i-%i\n", __func__, col, row);
if (down)
s->buttons[row] |= 1 << col;
@@ -2313,7 +2313,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", __FUNCTION__, chipselect);
+ fprintf(stderr, "%s: Bad chipselect %i\n", __func__, chipselect);
exit(-1);
}
@@ -2335,7 +2335,7 @@ static void omap_pwl_update(struct omap_pwl_s *s)
if (output != s->output) {
s->output = output;
- printf("%s: Backlight now at %i/256\n", __FUNCTION__, output);
+ printf("%s: Backlight now at %i/256\n", __func__, output);
}
}
@@ -2473,7 +2473,7 @@ static void omap_pwt_write(void *opaque, hwaddr addr,
case 0x04: /* VRC */
if ((value ^ s->vrc) & 1) {
if (value & 1)
- printf("%s: %iHz buzz on\n", __FUNCTION__, (int)
+ printf("%s: %iHz buzz on\n", __func__, (int)
/* 1.5 MHz from a 12-MHz or 13-MHz PWT_CLK */
((omap_clk_getrate(s->clk) >> 3) /
/* Pre-multiplexer divider */
@@ -2490,7 +2490,7 @@ static void omap_pwt_write(void *opaque, hwaddr addr,
((value & (1 << 5)) ? 80 : 127) /
(107 * 55 * 63 * 127)));
else
- printf("%s: silence!\n", __FUNCTION__);
+ printf("%s: silence!\n", __func__);
}
s->vrc = value & 0x7f;
break;
@@ -2562,7 +2562,7 @@ static void omap_rtc_alarm_update(struct omap_rtc_s *s)
{
s->alarm_ti = mktimegm(&s->alarm_tm);
if (s->alarm_ti == -1)
- printf("%s: conversion failed\n", __FUNCTION__);
+ printf("%s: conversion failed\n", __func__);
}
static uint64_t omap_rtc_read(void *opaque, hwaddr addr,
@@ -3028,7 +3028,7 @@ static void omap_mcbsp_source_tick(void *opaque)
if (!s->rx_rate)
return;
if (s->rx_req)
- printf("%s: Rx FIFO overrun\n", __FUNCTION__);
+ printf("%s: Rx FIFO overrun\n", __func__);
s->rx_req = s->rx_rate << bps[(s->rcr[0] >> 5) & 7];
@@ -3074,7 +3074,7 @@ static void omap_mcbsp_sink_tick(void *opaque)
if (!s->tx_rate)
return;
if (s->tx_req)
- printf("%s: Tx FIFO underrun\n", __FUNCTION__);
+ printf("%s: Tx FIFO underrun\n", __func__);
s->tx_req = s->tx_rate << bps[(s->xcr[0] >> 5) & 7];
@@ -3176,7 +3176,7 @@ static uint64_t omap_mcbsp_read(void *opaque, hwaddr addr,
/* Fall through. */
case 0x02: /* DRR1 */
if (s->rx_req < 2) {
- printf("%s: Rx FIFO underrun\n", __FUNCTION__);
+ printf("%s: Rx FIFO underrun\n", __func__);
omap_mcbsp_rx_done(s);
} else {
s->tx_req -= 2;
@@ -3282,7 +3282,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,
if (s->tx_req < 2)
omap_mcbsp_tx_done(s);
} else
- printf("%s: Tx FIFO overrun\n", __FUNCTION__);
+ printf("%s: Tx FIFO overrun\n", __func__);
return;
case 0x08: /* SPCR2 */
@@ -3297,7 +3297,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,
s->spcr[0] &= 0x0006;
s->spcr[0] |= 0xf8f9 & value;
if (value & (1 << 15)) /* DLB */
- printf("%s: Digital Loopback mode enable attempt\n", __FUNCTION__);
+ printf("%s: Digital Loopback mode enable attempt\n", __func__);
if (~value & 1) { /* RRST */
s->spcr[0] &= ~6;
s->rx_req = 0;
@@ -3330,13 +3330,13 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,
s->mcr[1] = value & 0x03e3;
if (value & 3) /* XMCM */
printf("%s: Tx channel selection mode enable attempt\n",
- __FUNCTION__);
+ __func__);
return;
case 0x1a: /* MCR1 */
s->mcr[0] = value & 0x03e1;
if (value & 1) /* RMCM */
printf("%s: Rx channel selection mode enable attempt\n",
- __FUNCTION__);
+ __func__);
return;
case 0x1c: /* RCERA */
s->rcer[0] = value & 0xffff;
@@ -3418,7 +3418,7 @@ static void omap_mcbsp_writew(void *opaque, hwaddr addr,
if (s->tx_req < 4)
omap_mcbsp_tx_done(s);
} else
- printf("%s: Tx FIFO overrun\n", __FUNCTION__);
+ printf("%s: Tx FIFO overrun\n", __func__);
return;
}
@@ -3536,7 +3536,7 @@ static void omap_lpg_tick(void *opaque)
timer_mod(s->tm, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->on);
s->cycle = !s->cycle;
- printf("%s: LED is %s\n", __FUNCTION__, s->cycle ? "on" : "off");
+ printf("%s: LED is %s\n", __func__, s->cycle ? "on" : "off");
}
static void omap_lpg_update(struct omap_lpg_s *s)
@@ -3557,9 +3557,9 @@ static void omap_lpg_update(struct omap_lpg_s *s)
timer_del(s->tm);
if (on == period && s->on < s->period)
- printf("%s: LED is on\n", __FUNCTION__);
+ printf("%s: LED is on\n", __func__);
else if (on == 0 && s->on)
- printf("%s: LED is off\n", __FUNCTION__);
+ printf("%s: LED is off\n", __func__);
else if (on && (on != s->on || period != s->period)) {
s->cycle = 0;
s->on = on;
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index f5b148881c..b53878b8b9 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -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);
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index a1f55d79b4..285f43709d 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -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);
}
}
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index ab691a7985..db860c238e 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -107,7 +107,7 @@ static uint64_t pxa2xx_pm_read(void *opaque, hwaddr addr,
return s->pm_regs[addr >> 2];
default:
fail:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -139,7 +139,7 @@ static void pxa2xx_pm_write(void *opaque, hwaddr addr,
break;
}
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
}
@@ -180,7 +180,7 @@ static uint64_t pxa2xx_cm_read(void *opaque, hwaddr addr,
return s->cm_regs[CCCR >> 2] | (3 << 28);
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -205,7 +205,7 @@ static void pxa2xx_cm_write(void *opaque, hwaddr addr,
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
}
@@ -410,7 +410,7 @@ static uint64_t pxa2xx_mm_read(void *opaque, hwaddr addr,
return s->mm_regs[addr >> 2];
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -429,7 +429,7 @@ static void pxa2xx_mm_write(void *opaque, hwaddr addr,
}
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
}
@@ -619,7 +619,7 @@ static uint64_t pxa2xx_ssp_read(void *opaque, hwaddr addr,
if (!s->enable)
return 0xffffffff;
if (s->rx_level < 1) {
- printf("%s: SSP Rx Underrun\n", __FUNCTION__);
+ printf("%s: SSP Rx Underrun\n", __func__);
return 0xffffffff;
}
s->rx_level --;
@@ -636,7 +636,7 @@ static uint64_t pxa2xx_ssp_read(void *opaque, hwaddr addr,
case SSACD:
return s->ssacd;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -653,9 +653,9 @@ static void pxa2xx_ssp_write(void *opaque, hwaddr addr,
s->sscr[0] = value & 0xc7ffffff;
s->enable = value & SSCR0_SSE;
if (value & SSCR0_MOD)
- printf("%s: Attempt to use network mode\n", __FUNCTION__);
+ printf("%s: Attempt to use network mode\n", __func__);
if (s->enable && SSCR0_DSS(value) < 4)
- printf("%s: Wrong data size: %i bits\n", __FUNCTION__,
+ printf("%s: Wrong data size: %i bits\n", __func__,
SSCR0_DSS(value));
if (!(value & SSCR0_SSE)) {
s->sssr = 0;
@@ -668,7 +668,7 @@ static void pxa2xx_ssp_write(void *opaque, hwaddr addr,
case SSCR1:
s->sscr[1] = value;
if (value & (SSCR1_LBM | SSCR1_EFWR))
- printf("%s: Attempt to use SSP test mode\n", __FUNCTION__);
+ printf("%s: Attempt to use SSP test mode\n", __func__);
pxa2xx_ssp_fifo_update(s);
break;
@@ -728,7 +728,7 @@ static void pxa2xx_ssp_write(void *opaque, hwaddr addr,
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
}
@@ -990,7 +990,7 @@ static uint64_t pxa2xx_rtc_read(void *opaque, hwaddr addr,
else
return s->last_swcr;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -1096,7 +1096,7 @@ static void pxa2xx_rtc_write(void *opaque, hwaddr addr,
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
}
}
@@ -1344,7 +1344,7 @@ static uint64_t pxa2xx_i2c_read(void *opaque, hwaddr addr,
s->ibmr = 0;
return s->ibmr;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -1417,7 +1417,7 @@ static void pxa2xx_i2c_write(void *opaque, hwaddr addr,
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
}
}
@@ -1618,7 +1618,7 @@ static uint64_t pxa2xx_i2s_read(void *opaque, hwaddr addr,
}
return 0;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -1641,14 +1641,14 @@ static void pxa2xx_i2s_write(void *opaque, hwaddr addr,
s->status &= ~(1 << 7); /* I2SOFF */
}
if (value & (1 << 4)) /* EFWR */
- printf("%s: Attempt to use special function\n", __FUNCTION__);
+ printf("%s: Attempt to use special function\n", __func__);
s->enable = (value & 9) == 1; /* ENB && !RST*/
pxa2xx_i2s_update(s);
break;
case SACR1:
s->control[1] = value & 0x0039;
if (value & (1 << 5)) /* ENLBF */
- printf("%s: Attempt to use loopback function\n", __FUNCTION__);
+ printf("%s: Attempt to use loopback function\n", __func__);
if (value & (1 << 4)) /* DPRL */
s->fifo_len = 0;
pxa2xx_i2s_update(s);
@@ -1675,7 +1675,7 @@ static void pxa2xx_i2s_write(void *opaque, hwaddr addr,
}
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
}
}
@@ -1851,7 +1851,7 @@ static uint64_t pxa2xx_fir_read(void *opaque, hwaddr addr,
pxa2xx_fir_update(s);
return ret;
}
- printf("%s: Rx FIFO underrun.\n", __FUNCTION__);
+ printf("%s: Rx FIFO underrun.\n", __func__);
break;
case ICSR0:
return s->status[0];
@@ -1860,7 +1860,7 @@ static uint64_t pxa2xx_fir_read(void *opaque, hwaddr addr,
case ICFOR:
return s->rx_len;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -1912,7 +1912,7 @@ static void pxa2xx_fir_write(void *opaque, hwaddr addr,
case ICFOR:
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
}
}
diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c
index 521dbad039..e15070188e 100644
--- a/hw/arm/pxa2xx_gpio.c
+++ b/hw/arm/pxa2xx_gpio.c
@@ -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);
}
}
diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c
index b516ced8c0..61275fa040 100644
--- a/hw/arm/pxa2xx_pic.c
+++ b/hw/arm/pxa2xx_pic.c
@@ -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);
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index 044796350a..a55b1a369c 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -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;
}
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index 5402cd196c..e8aa7842e6 100644
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -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++)
diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 18a50a8f83..ed51177b15 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -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 res
if (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]);
diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
index 8bb44a7cc1..6d8b728923 100644
--- a/hw/audio/wm8750.c
+++ b/hw/audio/wm8750.c
@@ -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
}
diff --git a/hw/block/nand.c b/hw/block/nand.c
index 76dcd3f76e..919cb9b803 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -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);
diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index 30e40f3914..7542ef9634 100644
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -663,12 +663,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;
}
@@ -713,7 +713,7 @@ static void onenand_write(void *opaque, hwaddr addr,
default:
fprintf(stderr, "%s: unknown OneNAND boot command %"PRIx64"\n",
- __FUNCTION__, value);
+ __func__, value);
}
break;
@@ -764,7 +764,7 @@ static void onenand_write(void *opaque, hwaddr addr,
default:
fprintf(stderr, "%s: unknown OneNAND register %x\n",
- __FUNCTION__, offset);
+ __func__, offset);
}
}
diff --git a/hw/bt/core.c b/hw/bt/core.c
index 615f0af073..c1806b71a3 100644
--- a/hw/bt/core.c
+++ b/hw/bt/core.c
@@ -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);
}
diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index d13192b9b5..ac067b81f6 100644
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -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;
}
diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index 476ebec0ab..df05f07887 100644
--- a/hw/bt/hci.c
+++ b/hw/bt/hci.c
@@ -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;
}
diff --git a/hw/bt/hid.c b/hw/bt/hid.c
index f6affbbb44..09d17322e4 100644
--- a/hw/bt/hid.c
+++ b/hw/bt/hid.c
@@ -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. */
diff --git a/hw/bt/l2cap.c b/hw/bt/l2cap.c
index e342045140..3e53dd082d 100644
--- a/hw/bt/l2cap.c
+++ b/hw/bt/l2cap.c
@@ -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);
}
diff --git a/hw/bt/sdp.c b/hw/bt/sdp.c
index 3cb60b9495..7c0d38b504 100644
--- a/hw/bt/sdp.c
+++ b/hw/bt/sdp.c
@@ -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;
}
diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
index cbf07d14d9..291abe6fca 100644
--- a/hw/display/blizzard.c
+++ b/hw/display/blizzard.c
@@ -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;
}
}
diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c
index 783e9e1318..601f178fdd 100644
--- a/hw/display/omap_dss.c
+++ b/hw/display/omap_dss.c
@@ -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;
}
diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c
index 845521c5b2..b83f80753a 100644
--- a/hw/display/pxa2xx_lcd.c
+++ b/hw/display/pxa2xx_lcd.c
@@ -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);
}
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index 90e0865618..e7ac4f8789 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -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");
}
diff --git a/hw/display/qxl.h b/hw/display/qxl.h
index f6556adb73..7d1b60014a 100644
--- a/hw/display/qxl.h
+++ b/hw/display/qxl.h
@@ -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(); \
}
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index 74d10af3d4..79f161740a 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -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;
}
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index 8e2547ac05..30cd415330 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -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);
}
diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c
index 45dfe7aadd..abd18c67ea 100644
--- a/hw/dma/omap_dma.c
+++ b/hw/dma/omap_dma.c
@@ -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;
diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c
index 634a4328f0..f4eb26cf17 100644
--- a/hw/dma/pxa2xx_dma.c
+++ b/hw/dma/pxa2xx_dma.c
@@ -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;
diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
index f82e3e6555..4c203ef5c6 100644
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@ -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:
diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 17891e2d0f..08472193b5 100644
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -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;
diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index 12264ee0f5..26e3e5ebf6 100644
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -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:
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 32d1296a64..c25e293d88 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -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;
}
diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 17917c0b30..3090254783 100644
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -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);
}
}
diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
index 2340523da0..d39953126b 100644
--- a/hw/input/lm832x.c
+++ b/hw/input/lm832x.c
@@ -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;
}
}
diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c
index 2b70bbb95c..93db9ed25b 100644
--- a/hw/input/pxa2xx_keypad.c
+++ b/hw/input/pxa2xx_keypad.c
@@ -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);
}
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index eb5320af40..7990954b6c 100644
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -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;
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index 75ac8c2ab5..1cad57f644 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -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
diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index ccdda89dab..6844c1aa83 100644
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -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 */
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 50dc83df77..72bf674403 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -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
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index e8b2eef688..41a7690560 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -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
diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c
index 677274ce3e..25e337ea77 100644
--- a/hw/misc/cbus.c
+++ b/hw/misc/cbus.c
@@ -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);
}
}
diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c
index 19151d07d6..9ea14186d4 100644
--- a/hw/misc/omap_clk.c
+++ b/hw/misc/omap_clk.c
@@ -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)
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 67d8e2f023..84f9e4c612 100644
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -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];
diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c
index 88c533a0fe..96fc057b4e 100644
--- a/hw/misc/omap_l4.c
+++ b/hw/misc/omap_l4.c
@@ -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);
}
diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c
index dff37ecaf9..7b38c5568c 100644
--- a/hw/misc/omap_sdrc.c
+++ b/hw/misc/omap_sdrc.c
@@ -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;
diff --git a/hw/misc/omap_tap.c b/hw/misc/omap_tap.c
index e6ea8ee235..3f595e8df7 100644
--- a/hw/misc/omap_tap.c
+++ b/hw/misc/omap_tap.c
@@ -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 */
diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
index 04e83787d4..9e22d64e36 100644
--- a/hw/misc/tmp105.c
+++ b/hw/misc/tmp105.c
@@ -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);
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 89133a9dd3..1767d2af61 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -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
diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index 3deccf02c9..0d4b88c609 100644
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -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);
}
}
diff --git a/hw/ssi/omap_spi.c b/hw/ssi/omap_spi.c
index 22034656b8..34163e5646 100644
--- a/hw/ssi/omap_spi.c
+++ b/hw/ssi/omap_spi.c
@@ -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;
diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c
index 6d7c8a396f..ae2dc99832 100644
--- a/hw/timer/omap_gptimer.c
+++ b/hw/timer/omap_gptimer.c
@@ -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 */
diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c
index eb58c378e0..ef116c636c 100644
--- a/hw/timer/twl92230.c
+++ b/hw/timer/twl92230.c
@@ -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
}
}
diff --git a/hw/usb/desc.c b/hw/usb/desc.c
index c36bf30e4f..85c15addc5 100644
--- a/hw/usb/desc.c
+++ b/hw/usb/desc.c
@@ -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;
}
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 443e3c301d..0bbceaea0b 100644
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -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;
diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c
index 27d9d0bd82..d70a91a58c 100644
--- a/hw/usb/hcd-musb.c
+++ b/hw/usb/hcd-musb.c
@@ -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
diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c
index 8f593a6fdb..2662c060ed 100644
--- a/hw/usb/tusb6010.c
+++ b/hw/usb/tusb6010.c
@@ -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;
}
}
diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c
index c89ced2e88..027f76fad1 100644
--- a/hw/xenpv/xen_domainbuild.c
+++ b/hw/xenpv/xen_domainbuild.c
@@ -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);
}
diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
index 31d2f25627..69a52a9f93 100644
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -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);
}
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index cac1b2ba43..b398607b06 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -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)
diff --git a/include/hw/arm/sharpsl.h b/include/hw/arm/sharpsl.h
index 13981a6d03..5bf6db1fa2 100644
--- a/include/hw/arm/sharpsl.h
+++ b/include/hw/arm/sharpsl.h
@@ -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 */
diff --git a/memory_mapping.c b/memory_mapping.c
index a5d38552a6..775466f3a8 100644
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -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
}
diff --git a/migration/block.c b/migration/block.c
index 606ad4db92..418d313fbf 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -626,7 +626,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();
@@ -653,7 +653,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;
diff --git a/ui/cursor.c b/ui/cursor.c
index 2e2fe13fa6..f3da0cee79 100644
--- a/ui/cursor.c
+++ b/ui/cursor.c
@@ -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;
}
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 0963c7825f..346fff44f4 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -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;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [PATCH v2 01/47] Replace all occurances of __FUNCTION__ with __func__
@ 2017-09-30 0:14 ` Alistair Francis
0 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:14 UTC (permalink / raw)
To: qemu-devel
Cc: Dr. David Alan Gilbert, Stefano Stabellini, Fam Zheng,
qemu-block, Peter Crosthwaite, John Snow, Juan Quintela, armbru,
alistair.francis, Yongbok Kim, qemu-arm, Gerd Hoffmann,
Stefan Hajnoczi, xen-devel, Anthony Perard, alistair23,
Andrzej Zaborowski, Aurelien Jarno
Replace 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 <alistair.francis@xilinx.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: John Snow <jsnow@redhat.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Yongbok Kim <yongbok.kim@imgtec.com>
Cc: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Fam Zheng <famz@redhat.com>
Cc: Juan Quintela <quintela@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: qemu-arm@nongnu.org
Cc: qemu-block@nongnu.org
Cc: xen-devel@lists.xenproject.org
Reviewed-by: Eric Blake <eblake@redhat.com>
---
audio/audio_int.h | 2 +-
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 ++--
65 files changed, 273 insertions(+), 273 deletions(-)
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 5bcb1c60e1..543b1bd8d5 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -253,7 +253,7 @@ static inline int audio_ring_dist (int dst, int src, int len)
#define AUDIO_STRINGIFY(n) AUDIO_STRINGIFY_(n)
#if defined _MSC_VER || defined __GNUC__
-#define AUDIO_FUNC __FUNCTION__
+#define AUDIO_FUNC __func__
#else
#define AUDIO_FUNC __FILE__ ":" AUDIO_STRINGIFY (__LINE__)
#endif
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 58005b6619..32687afced 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -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)) {
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index b3e7625130..1388200191 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -999,7 +999,7 @@ static uint64_t omap_id_read(void *opaque, hwaddr addr,
case omap1510:
return 0x03310115;
default:
- hw_error("%s: bad mpu model\n", __FUNCTION__);
+ hw_error("%s: bad mpu model\n", __func__);
}
break;
@@ -1010,7 +1010,7 @@ static uint64_t omap_id_read(void *opaque, hwaddr addr,
case omap1510:
return 0xfb47002f;
default:
- hw_error("%s: bad mpu model\n", __FUNCTION__);
+ hw_error("%s: bad mpu model\n", __func__);
}
break;
}
@@ -1716,7 +1716,7 @@ static void omap_clkm_write(void *opaque, hwaddr addr,
case 0x18: /* ARM_SYSST */
if ((s->clkm.clocking_scheme ^ (value >> 11)) & 7) {
s->clkm.clocking_scheme = (value >> 11) & 7;
- printf("%s: clocking scheme set to %s\n", __FUNCTION__,
+ printf("%s: clocking scheme set to %s\n", __func__,
clkschemename[s->clkm.clocking_scheme]);
}
s->clkm.cold_start &= value & 0x3f;
@@ -2129,14 +2129,14 @@ qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s)
void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler)
{
if (line >= 16 || line < 0)
- hw_error("%s: No GPIO line %i\n", __FUNCTION__, line);
+ hw_error("%s: No GPIO line %i\n", __func__, line);
s->handler[line] = handler;
}
void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down)
{
if (row >= 5 || row < 0)
- hw_error("%s: No key %i-%i\n", __FUNCTION__, col, row);
+ hw_error("%s: No key %i-%i\n", __func__, col, row);
if (down)
s->buttons[row] |= 1 << col;
@@ -2313,7 +2313,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", __FUNCTION__, chipselect);
+ fprintf(stderr, "%s: Bad chipselect %i\n", __func__, chipselect);
exit(-1);
}
@@ -2335,7 +2335,7 @@ static void omap_pwl_update(struct omap_pwl_s *s)
if (output != s->output) {
s->output = output;
- printf("%s: Backlight now at %i/256\n", __FUNCTION__, output);
+ printf("%s: Backlight now at %i/256\n", __func__, output);
}
}
@@ -2473,7 +2473,7 @@ static void omap_pwt_write(void *opaque, hwaddr addr,
case 0x04: /* VRC */
if ((value ^ s->vrc) & 1) {
if (value & 1)
- printf("%s: %iHz buzz on\n", __FUNCTION__, (int)
+ printf("%s: %iHz buzz on\n", __func__, (int)
/* 1.5 MHz from a 12-MHz or 13-MHz PWT_CLK */
((omap_clk_getrate(s->clk) >> 3) /
/* Pre-multiplexer divider */
@@ -2490,7 +2490,7 @@ static void omap_pwt_write(void *opaque, hwaddr addr,
((value & (1 << 5)) ? 80 : 127) /
(107 * 55 * 63 * 127)));
else
- printf("%s: silence!\n", __FUNCTION__);
+ printf("%s: silence!\n", __func__);
}
s->vrc = value & 0x7f;
break;
@@ -2562,7 +2562,7 @@ static void omap_rtc_alarm_update(struct omap_rtc_s *s)
{
s->alarm_ti = mktimegm(&s->alarm_tm);
if (s->alarm_ti == -1)
- printf("%s: conversion failed\n", __FUNCTION__);
+ printf("%s: conversion failed\n", __func__);
}
static uint64_t omap_rtc_read(void *opaque, hwaddr addr,
@@ -3028,7 +3028,7 @@ static void omap_mcbsp_source_tick(void *opaque)
if (!s->rx_rate)
return;
if (s->rx_req)
- printf("%s: Rx FIFO overrun\n", __FUNCTION__);
+ printf("%s: Rx FIFO overrun\n", __func__);
s->rx_req = s->rx_rate << bps[(s->rcr[0] >> 5) & 7];
@@ -3074,7 +3074,7 @@ static void omap_mcbsp_sink_tick(void *opaque)
if (!s->tx_rate)
return;
if (s->tx_req)
- printf("%s: Tx FIFO underrun\n", __FUNCTION__);
+ printf("%s: Tx FIFO underrun\n", __func__);
s->tx_req = s->tx_rate << bps[(s->xcr[0] >> 5) & 7];
@@ -3176,7 +3176,7 @@ static uint64_t omap_mcbsp_read(void *opaque, hwaddr addr,
/* Fall through. */
case 0x02: /* DRR1 */
if (s->rx_req < 2) {
- printf("%s: Rx FIFO underrun\n", __FUNCTION__);
+ printf("%s: Rx FIFO underrun\n", __func__);
omap_mcbsp_rx_done(s);
} else {
s->tx_req -= 2;
@@ -3282,7 +3282,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,
if (s->tx_req < 2)
omap_mcbsp_tx_done(s);
} else
- printf("%s: Tx FIFO overrun\n", __FUNCTION__);
+ printf("%s: Tx FIFO overrun\n", __func__);
return;
case 0x08: /* SPCR2 */
@@ -3297,7 +3297,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,
s->spcr[0] &= 0x0006;
s->spcr[0] |= 0xf8f9 & value;
if (value & (1 << 15)) /* DLB */
- printf("%s: Digital Loopback mode enable attempt\n", __FUNCTION__);
+ printf("%s: Digital Loopback mode enable attempt\n", __func__);
if (~value & 1) { /* RRST */
s->spcr[0] &= ~6;
s->rx_req = 0;
@@ -3330,13 +3330,13 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,
s->mcr[1] = value & 0x03e3;
if (value & 3) /* XMCM */
printf("%s: Tx channel selection mode enable attempt\n",
- __FUNCTION__);
+ __func__);
return;
case 0x1a: /* MCR1 */
s->mcr[0] = value & 0x03e1;
if (value & 1) /* RMCM */
printf("%s: Rx channel selection mode enable attempt\n",
- __FUNCTION__);
+ __func__);
return;
case 0x1c: /* RCERA */
s->rcer[0] = value & 0xffff;
@@ -3418,7 +3418,7 @@ static void omap_mcbsp_writew(void *opaque, hwaddr addr,
if (s->tx_req < 4)
omap_mcbsp_tx_done(s);
} else
- printf("%s: Tx FIFO overrun\n", __FUNCTION__);
+ printf("%s: Tx FIFO overrun\n", __func__);
return;
}
@@ -3536,7 +3536,7 @@ static void omap_lpg_tick(void *opaque)
timer_mod(s->tm, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->on);
s->cycle = !s->cycle;
- printf("%s: LED is %s\n", __FUNCTION__, s->cycle ? "on" : "off");
+ printf("%s: LED is %s\n", __func__, s->cycle ? "on" : "off");
}
static void omap_lpg_update(struct omap_lpg_s *s)
@@ -3557,9 +3557,9 @@ static void omap_lpg_update(struct omap_lpg_s *s)
timer_del(s->tm);
if (on == period && s->on < s->period)
- printf("%s: LED is on\n", __FUNCTION__);
+ printf("%s: LED is on\n", __func__);
else if (on == 0 && s->on)
- printf("%s: LED is off\n", __FUNCTION__);
+ printf("%s: LED is off\n", __func__);
else if (on && (on != s->on || period != s->period)) {
s->cycle = 0;
s->on = on;
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index f5b148881c..b53878b8b9 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -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);
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index a1f55d79b4..285f43709d 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -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);
}
}
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index ab691a7985..db860c238e 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -107,7 +107,7 @@ static uint64_t pxa2xx_pm_read(void *opaque, hwaddr addr,
return s->pm_regs[addr >> 2];
default:
fail:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -139,7 +139,7 @@ static void pxa2xx_pm_write(void *opaque, hwaddr addr,
break;
}
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
}
@@ -180,7 +180,7 @@ static uint64_t pxa2xx_cm_read(void *opaque, hwaddr addr,
return s->cm_regs[CCCR >> 2] | (3 << 28);
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -205,7 +205,7 @@ static void pxa2xx_cm_write(void *opaque, hwaddr addr,
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
}
@@ -410,7 +410,7 @@ static uint64_t pxa2xx_mm_read(void *opaque, hwaddr addr,
return s->mm_regs[addr >> 2];
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -429,7 +429,7 @@ static void pxa2xx_mm_write(void *opaque, hwaddr addr,
}
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
}
@@ -619,7 +619,7 @@ static uint64_t pxa2xx_ssp_read(void *opaque, hwaddr addr,
if (!s->enable)
return 0xffffffff;
if (s->rx_level < 1) {
- printf("%s: SSP Rx Underrun\n", __FUNCTION__);
+ printf("%s: SSP Rx Underrun\n", __func__);
return 0xffffffff;
}
s->rx_level --;
@@ -636,7 +636,7 @@ static uint64_t pxa2xx_ssp_read(void *opaque, hwaddr addr,
case SSACD:
return s->ssacd;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -653,9 +653,9 @@ static void pxa2xx_ssp_write(void *opaque, hwaddr addr,
s->sscr[0] = value & 0xc7ffffff;
s->enable = value & SSCR0_SSE;
if (value & SSCR0_MOD)
- printf("%s: Attempt to use network mode\n", __FUNCTION__);
+ printf("%s: Attempt to use network mode\n", __func__);
if (s->enable && SSCR0_DSS(value) < 4)
- printf("%s: Wrong data size: %i bits\n", __FUNCTION__,
+ printf("%s: Wrong data size: %i bits\n", __func__,
SSCR0_DSS(value));
if (!(value & SSCR0_SSE)) {
s->sssr = 0;
@@ -668,7 +668,7 @@ static void pxa2xx_ssp_write(void *opaque, hwaddr addr,
case SSCR1:
s->sscr[1] = value;
if (value & (SSCR1_LBM | SSCR1_EFWR))
- printf("%s: Attempt to use SSP test mode\n", __FUNCTION__);
+ printf("%s: Attempt to use SSP test mode\n", __func__);
pxa2xx_ssp_fifo_update(s);
break;
@@ -728,7 +728,7 @@ static void pxa2xx_ssp_write(void *opaque, hwaddr addr,
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
}
@@ -990,7 +990,7 @@ static uint64_t pxa2xx_rtc_read(void *opaque, hwaddr addr,
else
return s->last_swcr;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -1096,7 +1096,7 @@ static void pxa2xx_rtc_write(void *opaque, hwaddr addr,
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
}
}
@@ -1344,7 +1344,7 @@ static uint64_t pxa2xx_i2c_read(void *opaque, hwaddr addr,
s->ibmr = 0;
return s->ibmr;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -1417,7 +1417,7 @@ static void pxa2xx_i2c_write(void *opaque, hwaddr addr,
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
}
}
@@ -1618,7 +1618,7 @@ static uint64_t pxa2xx_i2s_read(void *opaque, hwaddr addr,
}
return 0;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -1641,14 +1641,14 @@ static void pxa2xx_i2s_write(void *opaque, hwaddr addr,
s->status &= ~(1 << 7); /* I2SOFF */
}
if (value & (1 << 4)) /* EFWR */
- printf("%s: Attempt to use special function\n", __FUNCTION__);
+ printf("%s: Attempt to use special function\n", __func__);
s->enable = (value & 9) == 1; /* ENB && !RST*/
pxa2xx_i2s_update(s);
break;
case SACR1:
s->control[1] = value & 0x0039;
if (value & (1 << 5)) /* ENLBF */
- printf("%s: Attempt to use loopback function\n", __FUNCTION__);
+ printf("%s: Attempt to use loopback function\n", __func__);
if (value & (1 << 4)) /* DPRL */
s->fifo_len = 0;
pxa2xx_i2s_update(s);
@@ -1675,7 +1675,7 @@ static void pxa2xx_i2s_write(void *opaque, hwaddr addr,
}
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
}
}
@@ -1851,7 +1851,7 @@ static uint64_t pxa2xx_fir_read(void *opaque, hwaddr addr,
pxa2xx_fir_update(s);
return ret;
}
- printf("%s: Rx FIFO underrun.\n", __FUNCTION__);
+ printf("%s: Rx FIFO underrun.\n", __func__);
break;
case ICSR0:
return s->status[0];
@@ -1860,7 +1860,7 @@ static uint64_t pxa2xx_fir_read(void *opaque, hwaddr addr,
case ICFOR:
return s->rx_len;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
break;
}
return 0;
@@ -1912,7 +1912,7 @@ static void pxa2xx_fir_write(void *opaque, hwaddr addr,
case ICFOR:
break;
default:
- printf("%s: Bad register " REG_FMT "\n", __FUNCTION__, addr);
+ printf("%s: Bad register " REG_FMT "\n", __func__, addr);
}
}
diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c
index 521dbad039..e15070188e 100644
--- a/hw/arm/pxa2xx_gpio.c
+++ b/hw/arm/pxa2xx_gpio.c
@@ -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);
}
}
diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c
index b516ced8c0..61275fa040 100644
--- a/hw/arm/pxa2xx_pic.c
+++ b/hw/arm/pxa2xx_pic.c
@@ -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);
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index 044796350a..a55b1a369c 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -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;
}
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index 5402cd196c..e8aa7842e6 100644
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -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++)
diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 18a50a8f83..ed51177b15 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -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 res
if (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]);
diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
index 8bb44a7cc1..6d8b728923 100644
--- a/hw/audio/wm8750.c
+++ b/hw/audio/wm8750.c
@@ -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
}
diff --git a/hw/block/nand.c b/hw/block/nand.c
index 76dcd3f76e..919cb9b803 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -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);
diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index 30e40f3914..7542ef9634 100644
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -663,12 +663,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;
}
@@ -713,7 +713,7 @@ static void onenand_write(void *opaque, hwaddr addr,
default:
fprintf(stderr, "%s: unknown OneNAND boot command %"PRIx64"\n",
- __FUNCTION__, value);
+ __func__, value);
}
break;
@@ -764,7 +764,7 @@ static void onenand_write(void *opaque, hwaddr addr,
default:
fprintf(stderr, "%s: unknown OneNAND register %x\n",
- __FUNCTION__, offset);
+ __func__, offset);
}
}
diff --git a/hw/bt/core.c b/hw/bt/core.c
index 615f0af073..c1806b71a3 100644
--- a/hw/bt/core.c
+++ b/hw/bt/core.c
@@ -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);
}
diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index d13192b9b5..ac067b81f6 100644
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -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;
}
diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index 476ebec0ab..df05f07887 100644
--- a/hw/bt/hci.c
+++ b/hw/bt/hci.c
@@ -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;
}
diff --git a/hw/bt/hid.c b/hw/bt/hid.c
index f6affbbb44..09d17322e4 100644
--- a/hw/bt/hid.c
+++ b/hw/bt/hid.c
@@ -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. */
diff --git a/hw/bt/l2cap.c b/hw/bt/l2cap.c
index e342045140..3e53dd082d 100644
--- a/hw/bt/l2cap.c
+++ b/hw/bt/l2cap.c
@@ -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);
}
diff --git a/hw/bt/sdp.c b/hw/bt/sdp.c
index 3cb60b9495..7c0d38b504 100644
--- a/hw/bt/sdp.c
+++ b/hw/bt/sdp.c
@@ -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;
}
diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
index cbf07d14d9..291abe6fca 100644
--- a/hw/display/blizzard.c
+++ b/hw/display/blizzard.c
@@ -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;
}
}
diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c
index 783e9e1318..601f178fdd 100644
--- a/hw/display/omap_dss.c
+++ b/hw/display/omap_dss.c
@@ -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;
}
diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c
index 845521c5b2..b83f80753a 100644
--- a/hw/display/pxa2xx_lcd.c
+++ b/hw/display/pxa2xx_lcd.c
@@ -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);
}
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index 90e0865618..e7ac4f8789 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -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");
}
diff --git a/hw/display/qxl.h b/hw/display/qxl.h
index f6556adb73..7d1b60014a 100644
--- a/hw/display/qxl.h
+++ b/hw/display/qxl.h
@@ -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(); \
}
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index 74d10af3d4..79f161740a 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -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;
}
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index 8e2547ac05..30cd415330 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -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);
}
diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c
index 45dfe7aadd..abd18c67ea 100644
--- a/hw/dma/omap_dma.c
+++ b/hw/dma/omap_dma.c
@@ -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;
diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c
index 634a4328f0..f4eb26cf17 100644
--- a/hw/dma/pxa2xx_dma.c
+++ b/hw/dma/pxa2xx_dma.c
@@ -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;
diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
index f82e3e6555..4c203ef5c6 100644
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@ -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:
diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 17891e2d0f..08472193b5 100644
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -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;
diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index 12264ee0f5..26e3e5ebf6 100644
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -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:
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 32d1296a64..c25e293d88 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -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;
}
diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 17917c0b30..3090254783 100644
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -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);
}
}
diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
index 2340523da0..d39953126b 100644
--- a/hw/input/lm832x.c
+++ b/hw/input/lm832x.c
@@ -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;
}
}
diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c
index 2b70bbb95c..93db9ed25b 100644
--- a/hw/input/pxa2xx_keypad.c
+++ b/hw/input/pxa2xx_keypad.c
@@ -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);
}
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index eb5320af40..7990954b6c 100644
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -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;
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index 75ac8c2ab5..1cad57f644 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -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
diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index ccdda89dab..6844c1aa83 100644
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -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 */
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 50dc83df77..72bf674403 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -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
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index e8b2eef688..41a7690560 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -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
diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c
index 677274ce3e..25e337ea77 100644
--- a/hw/misc/cbus.c
+++ b/hw/misc/cbus.c
@@ -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);
}
}
diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c
index 19151d07d6..9ea14186d4 100644
--- a/hw/misc/omap_clk.c
+++ b/hw/misc/omap_clk.c
@@ -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)
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 67d8e2f023..84f9e4c612 100644
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -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];
diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c
index 88c533a0fe..96fc057b4e 100644
--- a/hw/misc/omap_l4.c
+++ b/hw/misc/omap_l4.c
@@ -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);
}
diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c
index dff37ecaf9..7b38c5568c 100644
--- a/hw/misc/omap_sdrc.c
+++ b/hw/misc/omap_sdrc.c
@@ -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;
diff --git a/hw/misc/omap_tap.c b/hw/misc/omap_tap.c
index e6ea8ee235..3f595e8df7 100644
--- a/hw/misc/omap_tap.c
+++ b/hw/misc/omap_tap.c
@@ -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 */
diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
index 04e83787d4..9e22d64e36 100644
--- a/hw/misc/tmp105.c
+++ b/hw/misc/tmp105.c
@@ -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);
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 89133a9dd3..1767d2af61 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -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
diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index 3deccf02c9..0d4b88c609 100644
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -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);
}
}
diff --git a/hw/ssi/omap_spi.c b/hw/ssi/omap_spi.c
index 22034656b8..34163e5646 100644
--- a/hw/ssi/omap_spi.c
+++ b/hw/ssi/omap_spi.c
@@ -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;
diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c
index 6d7c8a396f..ae2dc99832 100644
--- a/hw/timer/omap_gptimer.c
+++ b/hw/timer/omap_gptimer.c
@@ -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 */
diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c
index eb58c378e0..ef116c636c 100644
--- a/hw/timer/twl92230.c
+++ b/hw/timer/twl92230.c
@@ -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
}
}
diff --git a/hw/usb/desc.c b/hw/usb/desc.c
index c36bf30e4f..85c15addc5 100644
--- a/hw/usb/desc.c
+++ b/hw/usb/desc.c
@@ -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;
}
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 443e3c301d..0bbceaea0b 100644
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -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;
diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c
index 27d9d0bd82..d70a91a58c 100644
--- a/hw/usb/hcd-musb.c
+++ b/hw/usb/hcd-musb.c
@@ -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
diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c
index 8f593a6fdb..2662c060ed 100644
--- a/hw/usb/tusb6010.c
+++ b/hw/usb/tusb6010.c
@@ -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;
}
}
diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c
index c89ced2e88..027f76fad1 100644
--- a/hw/xenpv/xen_domainbuild.c
+++ b/hw/xenpv/xen_domainbuild.c
@@ -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);
}
diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
index 31d2f25627..69a52a9f93 100644
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -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);
}
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index cac1b2ba43..b398607b06 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -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)
diff --git a/include/hw/arm/sharpsl.h b/include/hw/arm/sharpsl.h
index 13981a6d03..5bf6db1fa2 100644
--- a/include/hw/arm/sharpsl.h
+++ b/include/hw/arm/sharpsl.h
@@ -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 */
diff --git a/memory_mapping.c b/memory_mapping.c
index a5d38552a6..775466f3a8 100644
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -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
}
diff --git a/migration/block.c b/migration/block.c
index 606ad4db92..418d313fbf 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -626,7 +626,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();
@@ -653,7 +653,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;
diff --git a/ui/cursor.c b/ui/cursor.c
index 2e2fe13fa6..f3da0cee79 100644
--- a/ui/cursor.c
+++ b/ui/cursor.c
@@ -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;
}
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 0963c7825f..346fff44f4 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -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;
}
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 02/47] Fixes after renaming __FUNCTION__ to __func__
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
2017-09-30 0:14 ` Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-09-30 6:31 ` Thomas Huth
2017-10-02 14:00 ` Eric Blake
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 03/47] audio: Replace AUDIO_FUNC with __func__ Alistair Francis
` (44 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, Eric Blake
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Eric Blake <eblake@redhat.com>
---
hw/arm/omap1.c | 4 ++--
hw/arm/omap2.c | 2 +-
hw/block/onenand.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 1388200191..64f2ee8356 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -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;
@@ -3336,7 +3336,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,
s->mcr[0] = value & 0x03e1;
if (value & 1) /* RMCM */
printf("%s: Rx channel selection mode enable attempt\n",
- __func__);
+ __func__);
return;
case 0x1c: /* RCERA */
s->rcer[0] = value & 0xffff;
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index b53878b8b9..758a26f3d8 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -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",
- __func__);
+ __func__);
}
static void omap_prcm_dpll_update(struct omap_prcm_s *s)
diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index 7542ef9634..08c63adc9a 100644
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -663,7 +663,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;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 03/47] audio: Replace AUDIO_FUNC with __func__
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
2017-09-30 0:14 ` Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 02/47] Fixes after renaming __FUNCTION__ to __func__ Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-09-30 6:35 ` Thomas Huth
2017-10-02 14:08 ` Eric Blake
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 04/47] tests: Replace fprintf(stderr, "*\n" with error_report() Alistair Francis
` (43 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, Gerd Hoffmann
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 repleace AUDIO_FUNC with
__func__ instead.
Checkpatch failures where manually fixed.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
---
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(-)
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 3652a7b5fa..92a96f8b2b 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -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);
diff --git a/audio/audio.c b/audio/audio.c
index beafed209b..7658d2af66 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -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",
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 543b1bd8d5..5b25da0a37 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -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 __func__
-#else
-#define AUDIO_FUNC __FILE__ ":" AUDIO_STRINGIFY (__LINE__)
-#endif
-
#endif /* QEMU_AUDIO_INT_H */
diff --git a/audio/audio_pt_int.c b/audio/audio_pt_int.c
index 21ff9c5803..3fe56d8514 100644
--- a/audio/audio_pt_int.c
+++ b/audio/audio_pt_int.c
@@ -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;
diff --git a/audio/audio_template.h b/audio/audio_template.h
index 99b27b285e..7de227d2d1 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -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;
}
diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index 516846eb80..bc39cb9b4d 100644
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -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;
diff --git a/audio/mixeng.c b/audio/mixeng.c
index 0bf9b5360f..2ab22df2aa 100644
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -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));
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 0edd7ea5fe..a0428881c2 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -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);
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 65beb6f010..8cf19c51d0 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -206,7 +206,7 @@ static void *qpa_thread_out (void *arg)
PAVoiceOut *pa = arg;
HWVoiceOut *hw = &pa->hw;
- if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) {
+ if (audio_pt_lock(&pa->pt, __func__)) {
return NULL;
}
@@ -222,7 +222,7 @@ static void *qpa_thread_out (void *arg)
break;
}
- if (audio_pt_wait (&pa->pt, AUDIO_FUNC)) {
+ if (audio_pt_wait(&pa->pt, __func__)) {
goto exit;
}
}
@@ -230,7 +230,7 @@ static void *qpa_thread_out (void *arg)
decr = to_mix = audio_MIN (pa->live, pa->g->conf.samples >> 2);
rpos = pa->rpos;
- if (audio_pt_unlock (&pa->pt, AUDIO_FUNC)) {
+ if (audio_pt_unlock(&pa->pt, __func__)) {
return NULL;
}
@@ -251,7 +251,7 @@ static void *qpa_thread_out (void *arg)
to_mix -= chunk;
}
- if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) {
+ if (audio_pt_lock(&pa->pt, __func__)) {
return NULL;
}
@@ -261,7 +261,7 @@ static void *qpa_thread_out (void *arg)
}
exit:
- audio_pt_unlock (&pa->pt, AUDIO_FUNC);
+ audio_pt_unlock(&pa->pt, __func__);
return NULL;
}
@@ -270,7 +270,7 @@ static int qpa_run_out (HWVoiceOut *hw, int live)
int decr;
PAVoiceOut *pa = (PAVoiceOut *) hw;
- if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) {
+ if (audio_pt_lock(&pa->pt, __func__)) {
return 0;
}
@@ -279,10 +279,10 @@ static int qpa_run_out (HWVoiceOut *hw, int live)
pa->live = live - decr;
hw->rpos = pa->rpos;
if (pa->live > 0) {
- audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC);
+ audio_pt_unlock_and_signal(&pa->pt, __func__);
}
else {
- audio_pt_unlock (&pa->pt, AUDIO_FUNC);
+ audio_pt_unlock(&pa->pt, __func__);
}
return decr;
}
@@ -298,7 +298,7 @@ static void *qpa_thread_in (void *arg)
PAVoiceIn *pa = arg;
HWVoiceIn *hw = &pa->hw;
- if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) {
+ if (audio_pt_lock(&pa->pt, __func__)) {
return NULL;
}
@@ -314,7 +314,7 @@ static void *qpa_thread_in (void *arg)
break;
}
- if (audio_pt_wait (&pa->pt, AUDIO_FUNC)) {
+ if (audio_pt_wait(&pa->pt, __func__)) {
goto exit;
}
}
@@ -322,7 +322,7 @@ static void *qpa_thread_in (void *arg)
incr = to_grab = audio_MIN (pa->dead, pa->g->conf.samples >> 2);
wpos = pa->wpos;
- if (audio_pt_unlock (&pa->pt, AUDIO_FUNC)) {
+ if (audio_pt_unlock(&pa->pt, __func__)) {
return NULL;
}
@@ -342,7 +342,7 @@ static void *qpa_thread_in (void *arg)
to_grab -= chunk;
}
- if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) {
+ if (audio_pt_lock(&pa->pt, __func__)) {
return NULL;
}
@@ -352,7 +352,7 @@ static void *qpa_thread_in (void *arg)
}
exit:
- audio_pt_unlock (&pa->pt, AUDIO_FUNC);
+ audio_pt_unlock(&pa->pt, __func__);
return NULL;
}
@@ -361,7 +361,7 @@ static int qpa_run_in (HWVoiceIn *hw)
int live, incr, dead;
PAVoiceIn *pa = (PAVoiceIn *) hw;
- if (audio_pt_lock (&pa->pt, AUDIO_FUNC)) {
+ if (audio_pt_lock(&pa->pt, __func__)) {
return 0;
}
@@ -372,10 +372,10 @@ static int qpa_run_in (HWVoiceIn *hw)
pa->dead = dead - incr;
hw->wpos = pa->wpos;
if (pa->dead > 0) {
- audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC);
+ audio_pt_unlock_and_signal(&pa->pt, __func__);
}
else {
- audio_pt_unlock (&pa->pt, AUDIO_FUNC);
+ audio_pt_unlock(&pa->pt, __func__);
}
return incr;
}
@@ -579,7 +579,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as,
audio_pcm_init_info (&hw->info, &obt_as);
hw->samples = g->conf.samples;
- pa->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift);
+ pa->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift);
pa->rpos = hw->rpos;
if (!pa->pcm_buf) {
dolog ("Could not allocate buffer (%d bytes)\n",
@@ -587,7 +587,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as,
goto fail2;
}
- if (audio_pt_init (&pa->pt, qpa_thread_out, hw, AUDIO_CAP, AUDIO_FUNC)) {
+ if (audio_pt_init(&pa->pt, qpa_thread_out, hw, AUDIO_CAP, __func__)) {
goto fail3;
}
@@ -636,7 +636,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
audio_pcm_init_info (&hw->info, &obt_as);
hw->samples = g->conf.samples;
- pa->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift);
+ pa->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift);
pa->wpos = hw->wpos;
if (!pa->pcm_buf) {
dolog ("Could not allocate buffer (%d bytes)\n",
@@ -644,7 +644,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
goto fail2;
}
- if (audio_pt_init (&pa->pt, qpa_thread_in, hw, AUDIO_CAP, AUDIO_FUNC)) {
+ if (audio_pt_init(&pa->pt, qpa_thread_in, hw, AUDIO_CAP, __func__)) {
goto fail3;
}
@@ -667,17 +667,17 @@ static void qpa_fini_out (HWVoiceOut *hw)
void *ret;
PAVoiceOut *pa = (PAVoiceOut *) hw;
- audio_pt_lock (&pa->pt, AUDIO_FUNC);
+ audio_pt_lock(&pa->pt, __func__);
pa->done = 1;
- audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC);
- audio_pt_join (&pa->pt, &ret, AUDIO_FUNC);
+ audio_pt_unlock_and_signal(&pa->pt, __func__);
+ audio_pt_join(&pa->pt, &ret, __func__);
if (pa->stream) {
pa_stream_unref (pa->stream);
pa->stream = NULL;
}
- audio_pt_fini (&pa->pt, AUDIO_FUNC);
+ audio_pt_fini(&pa->pt, __func__);
g_free (pa->pcm_buf);
pa->pcm_buf = NULL;
}
@@ -687,17 +687,17 @@ static void qpa_fini_in (HWVoiceIn *hw)
void *ret;
PAVoiceIn *pa = (PAVoiceIn *) hw;
- audio_pt_lock (&pa->pt, AUDIO_FUNC);
+ audio_pt_lock(&pa->pt, __func__);
pa->done = 1;
- audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC);
- audio_pt_join (&pa->pt, &ret, AUDIO_FUNC);
+ audio_pt_unlock_and_signal(&pa->pt, __func__);
+ audio_pt_join(&pa->pt, &ret, __func__);
if (pa->stream) {
pa_stream_unref (pa->stream);
pa->stream = NULL;
}
- audio_pt_fini (&pa->pt, AUDIO_FUNC);
+ audio_pt_fini(&pa->pt, __func__);
g_free (pa->pcm_buf);
pa->pcm_buf = NULL;
}
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index e8d91d22af..e92135bd2f 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -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;
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index 341eec3121..068a595732 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -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);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 04/47] tests: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (2 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 03/47] audio: Replace AUDIO_FUNC with __func__ Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 05/47] hw/arm: " Alistair Francis
` (42 subsequent siblings)
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Michael S. Tsirkin,
Igor Mammedov, Dr. David Alan Gilbert, Gerd Hoffmann, qemu-block
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 of the error_report()'s were manually kept as fprintf(stderr, ) to
maintain standalone test cases.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-block@nongnu.org
---
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/stress.c | 36 +++++++++++++++++-----------------
tests/postcopy-test.c | 8 ++++----
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(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index abc6707ef2..485d258b17 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -618,7 +618,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)
@@ -785,7 +785,7 @@ tests/postcopy-test$(EXESUF): tests/postcopy-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)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 999121bb7c..0a0c7a459a 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -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();
}
}
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 564da45f65..0955c72a74 100644
--- a/tests/bios-tables-test.c
+++ 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"
@@ -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);
diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c
index e9d05c87d1..75fb9742ce 100644
--- a/tests/i440fx-test.c
+++ 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"
@@ -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;
diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index 1ca7f456b5..dffe625444 100644
--- a/tests/libqos/ahci.c
+++ 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"
@@ -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();
}
diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c
index 6226546c28..e125d885ef 100644
--- a/tests/libqos/libqos.c
+++ b/tests/libqos/libqos.c
@@ -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);
diff --git a/tests/libqos/malloc.c b/tests/libqos/malloc.c
index b8eff5f495..e81e0bb8f2 100644
--- a/tests/libqos/malloc.c
+++ 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"
@@ -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();
}
}
diff --git a/tests/libqtest.c b/tests/libqtest.c
index cbd709470b..b7c488444e 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -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);
}
@@ -312,7 +313,7 @@ static GString *qtest_recv_line(QTestState *s)
}
if (len == -1 || len == 0) {
- fprintf(stderr, "Broken pipe\n");
+ error_report("Broken pipe");
exit(1);
}
@@ -397,7 +398,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);
}
@@ -423,7 +424,7 @@ QDict *qmp_fd_receive(int fd)
}
if (len == -1 || len == 0) {
- fprintf(stderr, "Broken pipe\n");
+ error_report("Broken pipe");
exit(1);
}
@@ -880,7 +881,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);
}
diff --git a/tests/migration/stress.c b/tests/migration/stress.c
index cf8ce8b16d..49e1ff4555 100644
--- a/tests/migration/stress.c
+++ b/tests/migration/stress.c
@@ -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();
}
}
diff --git a/tests/postcopy-test.c b/tests/postcopy-test.c
index 8142f2ab90..32bb11ba82 100644
--- a/tests/postcopy-test.c
+++ b/tests/postcopy-test.c
@@ -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);
@@ -333,9 +333,9 @@ static void check_guests_ram(void)
*/
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;
}
diff --git a/tests/qemu-iotests/socket_scm_helper.c b/tests/qemu-iotests/socket_scm_helper.c
index eb76d31aa9..7785da953a 100644
--- a/tests/qemu-iotests/socket_scm_helper.c
+++ b/tests/qemu-iotests/socket_scm_helper.c
@@ -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;
}
}
diff --git a/tests/rcutorture.c b/tests/rcutorture.c
index 4002ecf123..21d2c76d0b 100644
--- a/tests/rcutorture.c
+++ 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"
@@ -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);
}
diff --git a/tests/tcg/linux-test.c b/tests/tcg/linux-test.c
index 5070d31446..76c9059073 100644
--- a/tests/tcg/linux-test.c
+++ 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("");
va_end(ap);
exit(1);
}
diff --git a/tests/tcg/runcom.c b/tests/tcg/runcom.c
index d60342bfc6..7acf0239c8 100644
--- a/tests/tcg/runcom.c
+++ b/tests/tcg/runcom.c
@@ -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);
}
diff --git a/tests/tcg/test-i386-fprem.c b/tests/tcg/test-i386-fprem.c
index 1a71623204..7c3d37d07a 100644
--- a/tests/tcg/test-i386-fprem.c
+++ b/tests/tcg/test-i386-fprem.c
@@ -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)
diff --git a/tests/tcg/test_path.c b/tests/tcg/test_path.c
index 1c29bce263..d543bb76ef 100644
--- a/tests/tcg/test_path.c
+++ 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;
}
return 0;
}
diff --git a/tests/test-hmp.c b/tests/test-hmp.c
index 5677fbf775..ff86220814 100644
--- a/tests/test-hmp.c
+++ b/tests/test-hmp.c
@@ -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);
diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c
index 1514d7ec97..00a03de370 100644
--- a/tests/test-rcu-list.c
+++ 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"
@@ -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);
}
diff --git a/tests/usb-hcd-ehci-test.c b/tests/usb-hcd-ehci-test.c
index 944eb1c088..1e7ef842e5 100644
--- a/tests/usb-hcd-ehci-test.c
+++ 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
g_assert((value & mask) == (expect & mask));
diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c
index f922cc75ae..c70a453cef 100644
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@ -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) {
@@ -293,7 +293,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;
}
@@ -363,7 +363,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");
}
}
@@ -460,7 +460,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;
@@ -561,14 +561,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;
@@ -589,13 +589,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);
}
@@ -713,15 +713,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;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 05/47] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (3 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 04/47] tests: Replace fprintf(stderr, "*\n" with error_report() Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-09-30 2:46 ` [Qemu-devel] [Qemu-arm] " Philippe Mathieu-Daudé
2017-10-16 11:41 ` [Qemu-devel] " Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 06/47] hw/block: " Alistair Francis
` (41 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, qemu-arm
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 <alistair.francis@xilinx.com>
Cc: qemu-arm@nongnu.org
---
V2:
- Split hw patch into individual directories
hw/arm/armv7m.c | 2 +-
hw/arm/boot.c | 34 +++++++++++++++++-----------------
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, 76 insertions(+), 69 deletions(-)
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index bb2dfc942b..56770a7048 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -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);
}
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index c2720c8046..5b2d17f08a 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -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("qemu: 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,7 +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",
+ error_report("qemu: could not load kernel '%s'",
info->kernel_filename);
exit(1);
}
@@ -976,7 +976,7 @@ 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",
+ error_report("qemu: could not load initrd '%s'",
info->initrd_filename);
exit(1);
}
@@ -1021,9 +1021,9 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data)
} else {
fixupcontext[FIXUP_ARGPTR] = info->loader_start + KERNEL_ARGS_ADDR;
if (info->ram_size >= (1ULL << 32)) {
- fprintf(stderr, "qemu: RAM size must be less than 4GB to boot"
- " Linux kernel using ATAGS (try passing a device tree"
- " using -dtb)\n");
+ error_report("qemu: RAM size must be less than 4GB to boot"
+ " Linux kernel using ATAGS (try passing a device tree"
+ " using -dtb)");
exit(1);
}
}
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index bba9e9f57a..8bd34956b7 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -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("qemu: 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("qemu: Error registering flash memory.");
exit(1);
}
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index d07972a966..5c454c7109 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -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("qemu: Error registering flash memory.");
exit(1);
}
}
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index b648770882..06127a873d 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -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);
}
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 64f2ee8356..c6d19387fc 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -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);
}
@@ -3989,7 +3990,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("qemu: missing SecureDigital device");
exit(1);
}
s->mmc = omap_mmc_init(0xfffb7800, system_memory,
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index 758a26f3d8..e7afcc822a 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -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("qemu: missing SecureDigital device");
exit(1);
}
s->mmc = omap2_mmc_init(omap_l4tao(s->l4, 9),
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index 9a14270795..6eb56ae744 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -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("qemu: 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("qemu: 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);
}
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 285f43709d..7f3637041a 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -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);
}
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index db860c238e..ffcb83d1a3 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -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("qemu: 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("qemu: missing SecureDigital device");
exit(1);
}
s->mmc = pxa2xx_mmci_init(address_space, 0x41100000,
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index de7c0fc4a6..f6f295b363 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -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;
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index a55b1a369c..a069c95f1c 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -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]);
}
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index 418792cd02..f0ae069172 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -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("qemu: Error registering flash memory.");
}
versatile_binfo.ram_size = machine->ram_size;
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index efb5a29475..508629dfe9 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -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);
}
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 60561c7b7c..5048439799 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -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("qemu: Error registering flash memory.");
exit(1);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 06/47] hw/block: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (4 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 05/47] hw/arm: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 07/47] hw/bt: " Alistair Francis
` (40 subsequent siblings)
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, qemu-block
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 <alistair.francis@xilinx.com>
Cc: qemu-block@nongnu.org
---
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(-)
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index 5556f0e64e..69dfd49191 100644
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -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);
}
diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index 08c63adc9a..cca63e3a16 100644
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -600,7 +600,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);
}
@@ -667,7 +667,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;
}
@@ -712,7 +712,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;
@@ -763,7 +763,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);
}
}
diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c
index 1d9f7ee000..d274c9aafe 100644
--- a/hw/block/tc58128.c
+++ b/hw/block/tc58128.c
@@ -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);
}
}
}
@@ -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");
+ 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");
+ 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");
+ 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");
+ 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();
}
}
@@ -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);
break;
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++];
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 07/47] hw/bt: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (5 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 06/47] hw/block: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-10-01 14:06 ` Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 08/47] hw/char: " Alistair Francis
` (39 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/bt/core.c | 15 ++++++++-------
hw/bt/hci-csr.c | 17 +++++++++--------
hw/bt/hci.c | 30 +++++++++++++++---------------
hw/bt/hid.c | 2 +-
hw/bt/l2cap.c | 47 ++++++++++++++++++++++++-----------------------
hw/bt/sdp.c | 7 ++++---
6 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/hw/bt/core.c b/hw/bt/core.c
index c1806b71a3..a6e9bf2a3e 100644
--- a/hw/bt/core.c
+++ b/hw/bt/core.c
@@ -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,24 @@ 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,7 +114,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", __func__,
+ error_report("%s: bad bt device \"%s\"", __func__,
dev->lmp_name ?: "(null)");
exit(-1);
}
diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index ac067b81f6..6a171a54b7 100644
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -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,8 +169,8 @@ 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__,
+ 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]);
}
@@ -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;
}
diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index df05f07887..ac9394daf0 100644
--- a/hw/bt/hci.c
+++ b/hw/bt/hci.c
@@ -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,7 +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",
+ error_report("%s: HCI event params too long (%ib)",
__func__, len);
exit(-1);
}
@@ -589,7 +590,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", __func__,
+ error_report("%s: bad inquiry mode %02x", __func__,
hci->lm.inquiry_mode);
exit(-1);
}
@@ -1971,7 +1972,7 @@ static void bt_submit_hci(struct HCIInfo *info,
break;
short_hci:
- fprintf(stderr, "%s: HCI packet too short (%iB)\n",
+ error_report("%s: HCI packet too short (%iB)",
__func__, length);
bt_hci_event_status(hci, HCI_INVALID_PARAMETERS);
break;
@@ -1991,7 +1992,7 @@ 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",
+ error_report("%s: can't take ACL packets %i bytes long",
__func__, len);
return;
}
@@ -2029,7 +2030,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",
+ error_report("%s: ACL packet too short (%iB)",
__func__, length);
return;
}
@@ -2041,15 +2042,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",
+ fprintf(stderr, "%s: ACL packet too short (%iB < %iB)",
__func__, length, datalen);
return;
}
@@ -2060,7 +2061,7 @@ 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",
+ error_report("%s: Bad handle %03x in Active Slave Broadcast",
__func__, handle);
/* TODO: signal an error */
return;
@@ -2073,7 +2074,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 +2106,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 +2223,7 @@ struct HCIInfo *hci_init(const char *str)
return bt_new_hci(vlan);
}
- fprintf(stderr, "qemu: Unknown bluetooth HCI `%s'.\n", str);
+ error_report("qemu: Unknown bluetooth HCI `%s'.", str);
return 0;
}
diff --git a/hw/bt/hid.c b/hw/bt/hid.c
index 09d17322e4..056291f9b5 100644
--- a/hw/bt/hid.c
+++ b/hw/bt/hid.c
@@ -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__);
}
diff --git a/hw/bt/l2cap.c b/hw/bt/l2cap.c
index 3e53dd082d..9cf27f0df6 100644
--- a/hw/bt/l2cap.c
+++ b/hw/bt/l2cap.c
@@ -18,6 +18,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "qemu/bswap.h"
@@ -467,8 +468,8 @@ 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", __func__, source_cid);
+ error_report("%s: Ignoring a Disconnection Request with the "
+ "invalid SCID %04x.", __func__, source_cid);
return;
}
@@ -790,7 +791,7 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id,
#if 0
/* 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",
+ error_report("%s: out of sequence command packet ignored.",
__func__);
return;
}
@@ -813,9 +814,9 @@ 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", __func__, id,
- le16_to_cpu(((l2cap_cmd_rej *) params)->reason));
+ error_report("%s: stray Command Reject (%02x, %04x) "
+ "packet, ignoring.", __func__, id,
+ le16_to_cpu(((l2cap_cmd_rej *) params)->reason));
break;
case L2CAP_CONN_REQ:
@@ -836,8 +837,8 @@ 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", __func__, id);
+ error_report("%s: unexpected Connection Response (%02x) "
+ "packet, ignoring.", __func__, id);
break;
case L2CAP_CONF_REQ:
@@ -865,8 +866,8 @@ static void l2cap_command(struct l2cap_instance_s *l2cap, int code, int id,
le16_to_cpu(((l2cap_conf_rsp *) params)->scid),
((l2cap_conf_rsp *) params)->data,
len - L2CAP_CONF_RSP_SIZE(0)))
- fprintf(stderr, "%s: unexpected Configure Response (%02x) "
- "packet, ignoring.\n", __func__, id);
+ error_report("%s: unexpected Configure Response (%02x) "
+ "packet, ignoring.", __func__, id);
break;
case L2CAP_DISCONN_REQ:
@@ -887,8 +888,8 @@ 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", __func__, id);
+ error_report("%s: unexpected Disconnection Response (%02x) "
+ "packet, ignoring.", __func__, id);
break;
case L2CAP_ECHO_REQ:
@@ -897,8 +898,8 @@ 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", __func__, id);
+ error_report("%s: unexpected Echo Response (%02x) "
+ "packet, ignoring.", __func__, id);
break;
case L2CAP_INFO_REQ:
@@ -917,8 +918,8 @@ 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", __func__, id);
+ error_report("%s: unexpected Information Response (%02x) "
+ "packet, ignoring.", __func__, id);
break;
default:
@@ -1066,8 +1067,8 @@ static void l2cap_frame_in(struct l2cap_instance_s *l2cap,
uint16_t len = le16_to_cpu(frame->len);
if (unlikely(cid >= L2CAP_CID_MAX || !l2cap->cid[cid])) {
- fprintf(stderr, "%s: frame addressed to a non-existent L2CAP "
- "channel %04x received.\n", __func__, cid);
+ error_report("%s: frame addressed to a non-existent L2CAP "
+ "channel %04x received.", __func__, cid);
return;
}
@@ -1128,9 +1129,9 @@ static uint8_t *l2cap_bframe_out(struct bt_l2cap_conn_params_s *parm, int len)
struct l2cap_chan_s *chan = (struct l2cap_chan_s *) parm;
if (len > chan->params.remote_mtu) {
- fprintf(stderr, "%s: B-Frame for CID %04x longer than %i octets.\n",
- __func__,
- chan->remote_cid, chan->params.remote_mtu);
+ error_report("%s: B-Frame for CID %04x longer than %i octets.",
+ __func__,
+ chan->remote_cid, chan->params.remote_mtu);
exit(-1);
}
@@ -1353,8 +1354,8 @@ void bt_l2cap_psm_register(struct bt_l2cap_device_s *dev, int psm, int min_mtu,
struct bt_l2cap_psm_s *new_psm = l2cap_psm(dev, psm);
if (new_psm) {
- fprintf(stderr, "%s: PSM %04x already registered for device `%s'.\n",
- __func__, psm, dev->device.lmp_name);
+ error_report("%s: PSM %04x already registered for device `%s'.",
+ __func__, psm, dev->device.lmp_name);
exit(-1);
}
diff --git a/hw/bt/sdp.c b/hw/bt/sdp.c
index 7c0d38b504..f4aba9d74f 100644
--- a/hw/bt/sdp.c
+++ b/hw/bt/sdp.c
@@ -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;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 08/47] hw/char: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (6 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 07/47] hw/bt: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-10-01 14:09 ` Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 09/47] hw/core: " Alistair Francis
` (38 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, Paolo Bonzini
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 <alistair.francis@xilinx.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
V2:
- Split hw patch into individual directories
hw/char/exynos4210_uart.c | 6 +++---
hw/char/mcf_uart.c | 5 +++--
hw/char/sh_serial.c | 9 +++++----
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 3957e78abf..a388f01a23 100644
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -296,7 +296,7 @@ static void exynos4210_uart_update_irq(Exynos4210UartState *s)
qemu_irq_raise(s->irq);
#if DEBUG_IRQ
- fprintf(stderr, "UART%d: IRQ has been raised: %08x\n",
+ error_report("UART%d: IRQ has been raised: %08x",
s->channel, s->reg[I_(UINTP)]);
#endif
@@ -388,7 +388,7 @@ static void exynos4210_uart_write(void *opaque, hwaddr offset,
* qemu_chr_fe_write and background I/O callbacks */
qemu_chr_fe_write_all(&s->chr, &ch, 1);
#if DEBUG_Tx_DATA
- fprintf(stderr, "%c", ch);
+ error_report("%c", ch);
#endif
s->reg[I_(UTRSTAT)] |= UTRSTAT_TRANSMITTER_EMPTY |
UTRSTAT_Tx_BUFFER_EMPTY;
@@ -400,7 +400,7 @@ static void exynos4210_uart_write(void *opaque, hwaddr offset,
case UINTP:
s->reg[I_(UINTP)] &= ~val;
s->reg[I_(UINTSP)] &= ~val;
- PRINT_DEBUG("UART%d: UINTP [%04x] have been cleared: %08x\n",
+ PRINT_DEBUG("UART%d: UINTP [%04x] have been cleared: %08x",
s->channel, offset, s->reg[I_(UINTP)]);
exynos4210_uart_update_irq(s);
break;
diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index 56fa402b58..14cb051be9 100644
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -6,6 +6,7 @@
* This code is licensed under the GPL
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.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");
+ error_report("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");
+ error_report("mcf_uart: Bad RX command");
break;
}
}
diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 835b5378a0..7bb3f3c70b 100644
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -25,6 +25,7 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "chardev/char-fe.h"
@@ -190,8 +191,8 @@ static void sh_serial_write(void *opaque, hwaddr offs,
}
}
- fprintf(stderr, "sh_serial: unsupported write to 0x%02"
- HWADDR_PRIx "\n", offs);
+ error_report("sh_serial: unsupported write to 0x%02"
+ HWADDR_PRIx "", offs);
abort();
}
@@ -290,8 +291,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);
+ error_report("sh_serial: unsupported read from 0x%02"
+ HWADDR_PRIx "", offs);
abort();
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 09/47] hw/core: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (7 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 08/47] hw/char: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-10-01 1:56 ` Philippe Mathieu-Daudé
2017-10-01 14:11 ` Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 10/47] hw/cris: " Alistair Francis
` (37 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Michael S. Tsirkin, Paolo Bonzini
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 <alistair.francis@xilinx.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
V2:
- Split hw patch into individual directories
hw/core/loader.c | 31 ++++++++++++++++---------------
hw/core/ptimer.c | 7 ++++---
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 4593061445..95bdcbbe36 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -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,7 +83,7 @@ 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",
+ error_report("file %-20s: get size error: %s",
filename, strerror(errno));
close(fd);
return -1;
@@ -623,7 +624,7 @@ 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,
+ 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,7 +764,7 @@ 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",
+ 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,7 +910,7 @@ 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",
+ error_report("Could not open option rom '%s': %s",
rom->path, strerror(errno));
goto err;
}
@@ -921,7 +922,7 @@ 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",
+ error_report("rom: file %-20s: get size error: %s",
rom->name, strerror(errno));
goto err;
}
@@ -931,7 +932,7 @@ 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",
+ error_report("rom: file %-20s: read error: rc=%d (expected %zd)",
rom->name, rc, rom->datasize);
goto err;
}
@@ -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;
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index 7221c68a98..514e177de2 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -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;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 10/47] hw/cris: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (8 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 09/47] hw/core: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-10-01 14:13 ` Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 11/47] hw/display: " Alistair Francis
` (36 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>
---
V2:
- Split hw patch into individual directories
hw/cris/axis_dev88.c | 3 ++-
hw/cris/boot.c | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 5eb552bce2..d121836b69 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
@@ -349,7 +350,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);
}
}
diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index f896ed7f86..f199a13a82 100644
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -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,14 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
}
if (image_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
+ error_report("qemu: 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);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 11/47] hw/display: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (9 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 10/47] hw/cris: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 12/47] hw/dma: " Alistair Francis
` (35 subsequent siblings)
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
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(-)
diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
index 291abe6fca..0d12e078c4 100644
--- a/hw/display/blizzard.c
+++ b/hw/display/blizzard.c
@@ -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;
}
}
diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c
index 601f178fdd..52d6e753d3 100644
--- a/hw/display/omap_dss.c
+++ b/hw/display/omap_dss.c
@@ -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;
}
diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index 8c7dcc6f0a..b8b7903d36 100644
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -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)
diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c
index b83f80753a..ae3a365849 100644
--- a/hw/display/pxa2xx_lcd.c
+++ b/hw/display/pxa2xx_lcd.c
@@ -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);
}
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index e7ac4f8789..0cd07028a4 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -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:
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index d92fe05f1a..1d67c48109 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -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;
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index 79f161740a..8b708a858b 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -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);
}
diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c
index 8c106a662d..88bc1c84a6 100644
--- a/hw/display/virtio-gpu-3d.c
+++ b/hw/display/virtio-gpu-3d.c
@@ -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,
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 4a64b41259..44d425e1f6 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -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();
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 12/47] hw/dma: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (10 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 11/47] hw/display: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-10-01 1:55 ` Philippe Mathieu-Daudé
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 13/47] hw/gpio: " Alistair Francis
` (34 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/dma/omap_dma.c | 26 ++++++++++++++------------
hw/dma/soc_dma.c | 37 +++++++++++++++++++------------------
2 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c
index abd18c67ea..5d7fe06d98 100644
--- a/hw/dma/omap_dma.c
+++ b/hw/dma/omap_dma.c
@@ -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;
diff --git a/hw/dma/soc_dma.c b/hw/dma/soc_dma.c
index 9bb499bf9c..7339a3ec95 100644
--- a/hw/dma/soc_dma.c
+++ b/hw/dma/soc_dma.c
@@ -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,11 @@ 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);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 13/47] hw/gpio: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (11 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 12/47] hw/dma: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 14/47] hw/i2c: " Alistair Francis
` (33 subsequent siblings)
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/gpio/omap_gpio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 08472193b5..57aa2e54f5 100644
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -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;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 14/47] hw/i2c: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (12 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 13/47] hw/gpio: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-10-01 1:52 ` Philippe Mathieu-Daudé
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 16/47] hw/ide: " Alistair Francis
` (32 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/i2c/omap_i2c.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index 26e3e5ebf6..c89664f342 100644
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -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: I^2C 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:
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 16/47] hw/ide: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (13 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 14/47] hw/i2c: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 17/47] hw/input: " Alistair Francis
` (31 subsequent siblings)
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, qemu-block
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 <alistair.francis@xilinx.com>
Cc: qemu-block@nongnu.org
---
V2:
- Split hw patch into individual directories
hw/ide/ahci.c | 6 +++---
hw/ide/core.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index c25e293d88..2ed015285a 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -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;
}
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 5f1cd3b91f..0ea34f62ba 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2762,7 +2762,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",
+ error_report("%s: invalid end_transfer_func for DRQ_STAT",
__func__);
s->end_transfer_fn_idx = 2;
} else {
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 17/47] hw/input: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (14 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 16/47] hw/ide: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-10-16 11:43 ` Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 18/47] hw/intc: " Alistair Francis
` (30 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Michael S. Tsirkin, Gerd Hoffmann
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 <alistair.francis@xilinx.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
---
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(-)
diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
index d39953126b..caeeda47f2 100644
--- a/hw/input/lm832x.c
+++ b/hw/input/lm832x.c
@@ -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;
}
}
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index c479f827b6..ff4f03e4c3 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -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("qemu: unsupported keyboard cmd=0x%02x", (int)val);
break;
}
}
diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c
index 93db9ed25b..0a594c30fc 100644
--- a/hw/input/pxa2xx_keypad.c
+++ b/hw/input/pxa2xx_keypad.c
@@ -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);
}
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index 7990954b6c..f5057e8eeb 100644
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -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;
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index 1cad57f644..65c7569723 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -396,8 +396,8 @@ static uint16_t tsc2102_data_register_read(TSC210xState *s, int reg)
default:
#ifdef TSC_VERBOSE
- fprintf(stderr, "tsc2102_data_register_read: "
- "no such register: 0x%02x\n", reg);
+ error_report("tsc2102_data_register_read: "
+ "no such register: 0x%02x", reg);
#endif
return 0xffff;
}
@@ -447,8 +447,8 @@ static uint16_t tsc2102_control_register_read(
default:
bad_reg:
#ifdef TSC_VERBOSE
- fprintf(stderr, "tsc2102_control_register_read: "
- "no such register: 0x%02x\n", reg);
+ error_report("tsc2102_control_register_read: "
+ "no such register: 0x%02x", reg);
#endif
return 0xffff;
}
@@ -528,8 +528,8 @@ static uint16_t tsc2102_audio_register_read(TSC210xState *s, int reg)
default:
#ifdef TSC_VERBOSE
- fprintf(stderr, "tsc2102_audio_register_read: "
- "no such register: 0x%02x\n", reg);
+ error_report("tsc2102_audio_register_read: "
+ "no such register: 0x%02x", reg);
#endif
return 0xffff;
}
@@ -553,8 +553,8 @@ static void tsc2102_data_register_write(
default:
#ifdef TSC_VERBOSE
- fprintf(stderr, "tsc2102_data_register_write: "
- "no such register: 0x%02x\n", reg);
+ error_report("tsc2102_data_register_write: "
+ "no such register: 0x%02x", reg);
#endif
}
}
@@ -606,8 +606,8 @@ static void tsc2102_control_register_write(
tsc210x_reset(s);
#ifdef TSC_VERBOSE
} else {
- fprintf(stderr, "tsc2102_control_register_write: "
- "wrong value written into RESET\n");
+ error_report("tsc2102_control_register_write: "
+ "wrong value written into RESET");
#endif
}
return;
@@ -616,8 +616,8 @@ static void tsc2102_control_register_write(
s->timing = value & 0x3f;
#ifdef TSC_VERBOSE
if (value & ~0x3f)
- fprintf(stderr, "tsc2102_control_register_write: "
- "wrong value written into CONFIG\n");
+ error_report("tsc2102_control_register_write: "
+ "wrong value written into CONFIG");
#endif
return;
@@ -637,8 +637,8 @@ static void tsc2102_control_register_write(
default:
bad_reg:
#ifdef TSC_VERBOSE
- fprintf(stderr, "tsc2102_control_register_write: "
- "no such register: 0x%02x\n", reg);
+ error_report("tsc2102_control_register_write: "
+ "no such register: 0x%02x", reg);
#endif
}
}
@@ -651,8 +651,8 @@ static void tsc2102_audio_register_write(
s->audio_ctrl1 = value & 0x0f3f;
#ifdef TSC_VERBOSE
if ((value & ~0x0f3f) || ((value & 7) != ((value >> 3) & 7)))
- fprintf(stderr, "tsc2102_audio_register_write: "
- "wrong value written into Audio 1\n");
+ error_report("tsc2102_audio_register_write: "
+ "wrong value written into Audio 1");
#endif
tsc2102_audio_rate_update(s);
tsc2102_audio_output_update(s);
@@ -661,8 +661,8 @@ static void tsc2102_audio_register_write(
case 0x01:
#ifdef TSC_VERBOSE
if (value != 0xff00)
- fprintf(stderr, "tsc2102_audio_register_write: "
- "wrong value written into reg 0x01\n");
+ error_report("tsc2102_audio_register_write: "
+ "wrong value written into reg 0x01");
#endif
return;
@@ -674,8 +674,8 @@ static void tsc2102_audio_register_write(
case 0x03:
#ifdef TSC_VERBOSE
if (value != 0x8b00)
- fprintf(stderr, "tsc2102_audio_register_write: "
- "wrong value written into reg 0x03\n");
+ error_report("tsc2102_audio_register_write: "
+ "wrong value written into reg 0x03");
#endif
return;
@@ -683,8 +683,8 @@ static void tsc2102_audio_register_write(
s->audio_ctrl2 = value & 0xf7f2;
#ifdef TSC_VERBOSE
if (value & ~0xf7fd)
- fprintf(stderr, "tsc2102_audio_register_write: "
- "wrong value written into Audio 2\n");
+ error_report("tsc2102_audio_register_write: "
+ "wrong value written into Audio 2");
#endif
return;
@@ -695,8 +695,8 @@ static void tsc2102_audio_register_write(
s->dac_power = value & 0x9543;
#ifdef TSC_VERBOSE
if ((value & ~0x9543) != 0x2aa0)
- fprintf(stderr, "tsc2102_audio_register_write: "
- "wrong value written into Power\n");
+ error_report("tsc2102_audio_register_write: "
+ "wrong value written into Power");
#endif
tsc2102_audio_rate_update(s);
tsc2102_audio_output_update(s);
@@ -707,8 +707,8 @@ static void tsc2102_audio_register_write(
s->audio_ctrl3 |= value & 0xf800;
#ifdef TSC_VERBOSE
if (value & ~0xf8c7)
- fprintf(stderr, "tsc2102_audio_register_write: "
- "wrong value written into Audio 3\n");
+ error_report("tsc2102_audio_register_write: "
+ "wrong value written into Audio 3");
#endif
tsc2102_audio_output_update(s);
return;
@@ -740,8 +740,8 @@ static void tsc2102_audio_register_write(
s->pll[0] = value & 0xfffc;
#ifdef TSC_VERBOSE
if (value & ~0xfffc)
- fprintf(stderr, "tsc2102_audio_register_write: "
- "wrong value written into PLL 1\n");
+ error_report("tsc2102_audio_register_write: "
+ "wrong value written into PLL 1");
#endif
return;
@@ -749,8 +749,8 @@ static void tsc2102_audio_register_write(
s->pll[1] = value & 0xfffc;
#ifdef TSC_VERBOSE
if (value & ~0xfffc)
- fprintf(stderr, "tsc2102_audio_register_write: "
- "wrong value written into PLL 2\n");
+ error_report("tsc2102_audio_register_write: "
+ "wrong value written into PLL 2");
#endif
return;
@@ -758,15 +758,15 @@ static void tsc2102_audio_register_write(
s->softstep = !(value & 0x4000);
#ifdef TSC_VERBOSE
if (value & ~0x4000)
- fprintf(stderr, "tsc2102_audio_register_write: "
- "wrong value written into Audio 4\n");
+ error_report("tsc2102_audio_register_write: "
+ "wrong value written into Audio 4");
#endif
return;
default:
#ifdef TSC_VERBOSE
- fprintf(stderr, "tsc2102_audio_register_write: "
- "no such register: 0x%02x\n", reg);
+ error_report("tsc2102_audio_register_write: "
+ "no such register: 0x%02x", reg);
#endif
}
}
@@ -847,7 +847,7 @@ static uint16_t tsc210x_read(TSC210xState *s)
uint16_t ret = 0x0000;
if (!s->command)
- fprintf(stderr, "tsc210x_read: SPI underrun!\n");
+ error_report("tsc210x_read: SPI underrun!");
switch (s->page) {
case TSC_DATA_REGISTERS_PAGE:
@@ -886,7 +886,7 @@ static void tsc210x_write(TSC210xState *s, uint16_t value)
s->state = true;
} else {
if (s->command)
- fprintf(stderr, "tsc210x_write: SPI overrun!\n");
+ error_report("tsc210x_write: SPI overrun!");
else
switch (s->page) {
case TSC_DATA_REGISTERS_PAGE:
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index 4d3afc1b14..bf1ed7b18e 100644
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -208,8 +208,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;
@@ -222,9 +222,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;
@@ -310,8 +310,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;
}
}
diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c
index 0e42f0d02c..fb5fa0a280 100644
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -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();
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 18/47] hw/intc: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (15 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 17/47] hw/input: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-10-04 7:34 ` Cornelia Huck
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 19/47] hw/ipmi: " Alistair Francis
` (29 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Peter Maydell,
Christian Borntraeger, Cornelia Huck, Alexander Graf
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 <alistair.francis@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Alexander Graf <agraf@suse.de>
---
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(-)
diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index ae095d08a3..a5478d3e20 100644
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -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();
}
diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index 6844c1aa83..7fc239715a 100644
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -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 */
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 10d6e871fb..7b1cafcc50 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -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;
diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index fa83420254..60c784ae86 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -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);
}
}
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index d208cb81c4..e710bfdcda 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -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");
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 19/47] hw/ipmi: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (16 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 18/47] hw/intc: " Alistair Francis
@ 2017-09-30 0:15 ` Alistair Francis
2017-10-01 1:50 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 20/47] hw/isa: " Alistair Francis
` (28 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:15 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/ipmi/ipmi.c | 1 +
hw/ipmi/ipmi_bmc_extern.c | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
index b27babd504..81c62920de 100644
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "hw/hw.h"
#include "hw/ipmi/ipmi.h"
#include "sysemu/sysemu.h"
diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index abab3bba4f..8c0535d3dd 100644
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -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();
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 20/47] hw/isa: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (17 preceding siblings ...)
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 19/47] hw/ipmi: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-01 1:48 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 21/47] hw/lm32: " Alistair Francis
` (27 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/isa/isa-bus.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 348e0eab9d..0f2e426d02 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -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:
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 21/47] hw/lm32: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (18 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 20/47] hw/isa: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-01 1:48 ` Philippe Mathieu-Daudé
2017-10-16 11:45 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 22/47] hw/m68k: " Alistair Francis
` (26 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, Michael Walle
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 <alistair.francis@xilinx.com>
Cc: Michael Walle <michael@walle.cc>
---
V2:
- Split hw patch into individual directories
hw/lm32/lm32_boards.c | 5 +++--
hw/lm32/milkymist.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index b0bb3ef58a..d739acf476 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -18,6 +18,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
@@ -152,7 +153,7 @@ static void lm32_evr_init(MachineState *machine)
}
if (kernel_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
+ error_report("qemu: could not load kernel '%s'",
kernel_filename);
exit(1);
}
@@ -250,7 +251,7 @@ static void lm32_uclinux_init(MachineState *machine)
}
if (kernel_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
+ error_report("qemu: could not load kernel '%s'",
kernel_filename);
exit(1);
}
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 4db4d2d533..caa6cf4e0f 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -18,6 +18,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
@@ -149,7 +150,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",
+ error_report("qemu: could not load Milkymist One bios '%s'",
bios_name);
exit(1);
}
@@ -188,7 +189,7 @@ milkymist_init(MachineState *machine)
}
if (kernel_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
+ error_report("qemu: could not load kernel '%s'",
kernel_filename);
exit(1);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 22/47] hw/m68k: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (19 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 21/47] hw/lm32: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-09-30 6:42 ` Thomas Huth
2017-10-16 11:25 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 23/47] hw/microblaze: " Alistair Francis
` (25 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
Thomas Huth <huth@tuxfamily.org>
---
V2:
- Split hw patch into individual directories
hw/m68k/an5206.c | 4 ++--
hw/m68k/mcf5206.c | 3 ++-
hw/m68k/mcf5208.c | 7 ++++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index 9002c460e5..bdab620a02 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -66,7 +66,7 @@ static void an5206_init(MachineState *machine)
if (qtest_enabled()) {
return;
}
- fprintf(stderr, "Kernel image must be specified\n");
+ error_report("Kernel image must be specified");
exit(1);
}
@@ -83,7 +83,7 @@ static void an5206_init(MachineState *machine)
entry = KERNEL_LOAD_ADDR;
}
if (kernel_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);
+ error_report("qemu: could not load kernel '%s'", kernel_filename);
exit(1);
}
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index b81901fdfd..fbf3f0f074 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -6,6 +6,7 @@
* This code is licensed under the GPL
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qemu-common.h"
#include "cpu.h"
#include "hw/hw.h"
@@ -220,7 +221,7 @@ static void m5206_mbar_update(m5206_mbar_state *s)
break;
default:
/* Unknown vector. */
- fprintf(stderr, "Unhandled vector for IRQ %d\n", irq);
+ error_report("Unhandled vector for IRQ %d", irq);
vector = 0xf;
break;
}
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index b9dde75106..2fb5037b72 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -6,6 +6,7 @@
* This code is licensed under the GPL
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
@@ -257,7 +258,7 @@ static void mcf5208evb_init(MachineState *machine)
mcf5208_sys_init(address_space_mem, pic);
if (nb_nics > 1) {
- fprintf(stderr, "Too many NICs\n");
+ error_report("Too many NICs");
exit(1);
}
if (nd_table[0].used) {
@@ -292,7 +293,7 @@ static void mcf5208evb_init(MachineState *machine)
if (qtest_enabled()) {
return;
}
- fprintf(stderr, "Kernel image must be specified\n");
+ error_report("Kernel image must be specified");
exit(1);
}
@@ -309,7 +310,7 @@ static void mcf5208evb_init(MachineState *machine)
entry = 0x40000000;
}
if (kernel_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);
+ error_report("qemu: could not load kernel '%s'", kernel_filename);
exit(1);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 23/47] hw/microblaze: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (20 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 22/47] hw/m68k: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-09-30 2:43 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 24/47] hw/mips: " Alistair Francis
` (24 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, Edgar E. Iglesias
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 <alistair.francis@xilinx.com>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
---
V2:
- Split hw patch into individual directories
hw/microblaze/boot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 457a08a2fe..31466050de 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -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");
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 24/47] hw/mips: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (21 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 23/47] hw/microblaze: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-09-30 2:36 ` Philippe Mathieu-Daudé
2017-10-16 11:46 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 25/47] hw/misc: " Alistair Francis
` (23 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Paul Burton,
Aurelien Jarno, Yongbok Kim, Hervé Poussineau
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 <alistair.francis@xilinx.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Yongbok Kim <yongbok.kim@imgtec.com>
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
---
V2:
- Split hw patch into individual directories
hw/mips/boston.c | 4 ++--
hw/mips/mips_fulong2e.c | 4 ++--
hw/mips/mips_jazz.c | 4 ++--
hw/mips/mips_malta.c | 4 ++--
hw/mips/mips_mipssim.c | 4 ++--
hw/mips/mips_r4k.c | 6 +++---
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 776ee283e1..ee82968ea7 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -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;
}
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 75318680e1..34710a466c 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -143,7 +143,7 @@ static int64_t load_kernel (CPUMIPSState *env)
initrd_offset, ram_size - initrd_offset);
}
if (initrd_size == (target_ulong) -1) {
- fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
+ error_report("qemu: could not load initial ram disk '%s'",
loaderparams.initrd_filename);
exit(1);
}
@@ -342,7 +342,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);
}
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 7e6626dc88..6c91a940be 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -271,10 +271,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("qemu: Supported NICs: dp83932");
exit(1);
} else {
- fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd->model);
+ error_report("qemu: Unsupported NIC: %s", nd->model);
exit(1);
}
}
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 2adb9bcf89..d457adfa69 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -856,8 +856,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("qemu: could not load initial ram disk '%s'",
+ loaderparams.initrd_filename);
exit(1);
}
}
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index a092072e2a..a3d9406610 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -101,8 +101,8 @@ static int64_t load_kernel(void)
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("qemu: could not load initial ram disk '%s'",
+ loaderparams.initrd_filename);
exit(1);
}
}
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 1272d4ef9d..e54ce918a7 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -121,8 +121,8 @@ static int64_t load_kernel(void)
ram_size - initrd_offset);
}
if (initrd_size == (target_ulong) -1) {
- fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
- loaderparams.initrd_filename);
+ error_report("qemu: could not load initial ram disk '%s'",
+ loaderparams.initrd_filename);
exit(1);
}
}
@@ -246,7 +246,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("qemu: Error registering flash memory.");
}
} else if (!qtest_enabled()) {
/* not fatal */
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 25/47] hw/misc: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (22 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 24/47] hw/mips: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-01 1:47 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 26/47] hw/moxie: " Alistair Francis
` (22 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
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(-)
diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c
index 3e8ad8cd73..21b8e49b6c 100644
--- a/hw/misc/a9scu.c
+++ b/hw/misc/a9scu.c
@@ -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;
}
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 84f9e4c612..e3b30e90ea 100644
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -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];
diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c
index 96fc057b4e..47d9c10aeb 100644
--- a/hw/misc/omap_l4.c
+++ b/hw/misc/omap_l4.c
@@ -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);
}
diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c
index 7b38c5568c..3dcabc1e00 100644
--- a/hw/misc/omap_sdrc.c
+++ b/hw/misc/omap_sdrc.c
@@ -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);
diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c
index 165500223f..55369bd180 100644
--- a/hw/misc/vmport.c
+++ b/hw/misc/vmport.c
@@ -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;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 26/47] hw/moxie: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (23 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 25/47] hw/misc: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-01 1:46 ` Philippe Mathieu-Daudé
2017-10-16 11:47 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 27/47] hw/net: " Alistair Francis
` (21 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, Anthony Green
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 <alistair.francis@xilinx.com>
Cc: Anthony Green <green@moxielogic.com>
---
V2:
- Split hw patch into individual directories
hw/moxie/moxiesim.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 5ea8dd3a93..5916f86c68 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -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,7 +62,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params)
0, 0);
if (kernel_size <= 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
+ error_report("qemu: could not load kernel '%s'",
loader_params->kernel_filename);
exit(1);
}
@@ -85,8 +86,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params)
ram_size);
}
if (initrd_size == (target_ulong)-1) {
- fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
- loader_params->initrd_filename);
+ error_report("qemu: could not load initial ram disk '%s'",
+ loader_params->initrd_filename);
exit(1);
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 27/47] hw/net: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (24 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 26/47] hw/moxie: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-01 1:46 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 28/47] hw/nios2: " Alistair Francis
` (20 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Alexander Graf, Jason Wang,
Michael S. Tsirkin
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 <alistair.francis@xilinx.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: Jason Wang <jasowang@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
---
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(-)
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index 9da1932970..965effa314 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -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 */
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 654455355f..5f2b5fe046 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -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;
}
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index 3b16dcf5a1..ae40fd6e6e 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -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;
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index e037db63a3..37d0cce560 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -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);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 28/47] hw/nios2: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (25 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 27/47] hw/net: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-09-30 2:39 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 29/47] hw/nvram: " Alistair Francis
` (19 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, Chris Wulff, Marek Vasut
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 <alistair.francis@xilinx.com>
Cc: Chris Wulff <crwulff@gmail.com>
Cc: Marek Vasut <marex@denx.de>
---
V2:
- Split hw patch into individual directories
hw/nios2/boot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index 2b31f5b844..c896e8007b 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -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");
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 29/47] hw/nvram: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (26 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 28/47] hw/nios2: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-09-30 6:50 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 30/47] hw/openrisc: " Alistair Francis
` (18 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/nvram/eeprom93xx.c | 5 +++--
hw/nvram/fw_cfg.c | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c
index 2fd0e3c29f..5cad031eba 100644
--- a/hw/nvram/eeprom93xx.c
+++ b/hw/nvram/eeprom93xx.c
@@ -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;
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index e3bd626b8c..cf9a816c0e 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -515,8 +515,8 @@ static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size,
static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
- fprintf(stderr, "uint32_as_uint16 is only used for backward compatibility.\n");
- fprintf(stderr, "This functions shouldn't be called.\n");
+ error_report("uint32_as_uint16 is only used for backward compatibility.");
+ error_report("This functions shouldn't be called.");
return 0;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 30/47] hw/openrisc: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (27 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 29/47] hw/nvram: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-09-30 19:05 ` Stafford Horne
2017-10-16 11:50 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 31/47] hw/pci*: " Alistair Francis
` (17 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, Jia Liu, Stafford Horne
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 <alistair.francis@xilinx.com>
Cc: Jia Liu <proljc@gmail.com>
Cc: Stafford Horne <shorne@gmail.com>
---
V2:
- Split hw patch into individual directories
hw/openrisc/openrisc_sim.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 86bf2849c4..44a6d115dd 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -19,6 +19,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
@@ -87,7 +88,7 @@ static void cpu_openrisc_load_kernel(ram_addr_t ram_size,
}
if (kernel_size < 0) {
- fprintf(stderr, "QEMU: couldn't load the kernel '%s'\n",
+ error_report("QEMU: couldn't load the kernel '%s'",
kernel_filename);
exit(1);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 31/47] hw/pci*: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (28 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 30/47] hw/openrisc: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-01 1:43 ` Philippe Mathieu-Daudé
2017-10-01 8:11 ` Marcel Apfelbaum
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 32/47] hw/ppc: " Alistair Francis
` (16 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Michael S. Tsirkin,
Marcel Apfelbaum
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 <alistair.francis@xilinx.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
---
V2:
- Split hw patch into individual directories
hw/pci-host/bonito.c | 6 +++---
hw/pci/pci.c | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 1767d2af61..48fef86c05 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -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);
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 1e6fb88eba..1c8395d319 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -515,7 +515,7 @@ 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",
+ error_report("irq state %d: must be 0 or 1.",
irq_state[i]);
return -EINVAL;
}
@@ -678,7 +678,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;
}
@@ -694,7 +694,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;
}
@@ -1118,8 +1118,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);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 32/47] hw/ppc: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (29 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 31/47] hw/pci*: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-04 6:11 ` David Gibson
2017-10-16 11:53 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 33/47] hw/s390x: " Alistair Francis
` (15 subsequent siblings)
46 siblings, 2 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, qemu-ppc
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 <alistair.francis@xilinx.com>
Cc: qemu-ppc@nongnu.org
---
V2:
- Split hw patch into individual directories
hw/ppc/e500.c | 20 ++++++++++----------
hw/ppc/mac_newworld.c | 2 +-
hw/ppc/mac_oldworld.c | 2 +-
hw/ppc/mpc8544_guts.c | 5 +++--
hw/ppc/ppc405_boards.c | 8 ++++----
hw/ppc/ppc440_bamboo.c | 19 ++++++++++---------
hw/ppc/ppc4xx_pci.c | 3 ++-
hw/ppc/prep.c | 4 ++--
hw/ppc/virtex_ml507.c | 4 ++--
9 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index db0e49ab8f..8a5350161f 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -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();
}
@@ -821,7 +821,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);
}
@@ -967,7 +967,7 @@ 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",
+ error_report("qemu: could not load kernel '%s'",
machine->kernel_filename);
exit(1);
}
@@ -982,8 +982,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("qemu: could not load initial ram disk '%s'",
+ machine->initrd_filename);
exit(1);
}
@@ -1024,7 +1024,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("qemu: could not load firmware '%s'", filename);
exit(1);
}
}
@@ -1037,7 +1037,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);
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 6d0ace20ca..fa54056bc3 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -278,7 +278,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);
}
}
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index bc7c8b7bd7..4d75113533 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -221,7 +221,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);
}
}
diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
index ce1254b5d4..3a2c49e3fd 100644
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@ -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;
}
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index e92db2c66a..0a31a1c116 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -324,7 +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",
+ error_report("qemu: could not load kernel '%s'",
kernel_filename);
exit(1);
}
@@ -336,8 +336,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("qemu: could not load initial ram disk '%s'",
+ initrd_filename);
exit(1);
}
} else {
@@ -607,7 +607,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",
+ error_report("qemu: could not load kernel '%s'",
kernel_filename);
exit(1);
}
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index f92d47f28d..77b74dfe9e 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -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
@@ -190,7 +191,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);
}
@@ -224,7 +225,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);
}
@@ -265,7 +266,7 @@ static void bamboo_init(MachineState *machine)
}
/* XXX try again as binary */
if (success < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
+ error_report("qemu: could not load kernel '%s'",
kernel_filename);
exit(1);
}
@@ -277,7 +278,7 @@ 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",
+ error_report("qemu: could not load ram disk '%s' at %x",
initrd_filename, RAMDISK_ADDR);
exit(1);
}
@@ -287,7 +288,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);
}
}
diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 6953f8b9ac..0b91d22253 100644
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -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);
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 94138a4e8c..7551d53fa5 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -576,7 +576,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);
}
}
@@ -597,7 +597,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);
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index ed9b406fd3..7641737f81 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -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;
}
@@ -219,7 +219,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);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 33/47] hw/s390x: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (30 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 32/47] hw/ppc: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-16 11:55 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 34/47] hw/scsi: " Alistair Francis
` (14 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/s390x/virtio-ccw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 62d69aa30b..e5b3cc0005 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -468,7 +468,7 @@ 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",
+ error_report("Guest bug: features[%i]=%x (expected 0)",
features.index, features.features);
/* XXX: do a unit check here? */
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 34/47] hw/scsi: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (31 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 33/47] hw/s390x: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 35/47] hw/sd: " Alistair Francis
` (13 subsequent siblings)
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Paolo Bonzini,
David Gibson, Alexander Graf
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 <alistair.francis@xilinx.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Alexander Graf <agraf@suse.de>
---
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(-)
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index a67ee074d9..925cebb134 100644
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -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) {
diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index 360db53ac8..8c4eabcf3d 100644
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -32,6 +32,7 @@
* - Maybe do autosense (PAPR seems to mandate it, linux doesn't care)
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qemu-common.h"
#include "cpu.h"
#include "hw/hw.h"
@@ -179,7 +180,7 @@ static int vscsi_send_iu(VSCSIState *s, vscsi_req *req,
rc = spapr_vio_dma_write(&s->vdev, req->crq.s.IU_data_ptr,
&req->iu, length);
if (rc) {
- fprintf(stderr, "vscsi_send_iu: DMA write failure !\n");
+ error_report("vscsi_send_iu: DMA write failure !");
}
req->crq.s.valid = 0x80;
@@ -197,7 +198,7 @@ static int vscsi_send_iu(VSCSIState *s, vscsi_req *req,
rc1 = spapr_vio_send_crq(&s->vdev, req->crq.raw);
if (rc1) {
- fprintf(stderr, "vscsi_send_iu: Error sending response\n");
+ error_report("vscsi_send_iu: Error sending response");
return rc1;
}
@@ -330,7 +331,7 @@ static int vscsi_fetch_desc(VSCSIState *s, struct vscsi_req *req,
break;
}
default:
- fprintf(stderr, "VSCSI: Unknown format %x\n", req->dma_fmt);
+ error_report("VSCSI: Unknown format %x", req->dma_fmt);
return -1;
}
@@ -518,7 +519,7 @@ static void vscsi_transfer_data(SCSIRequest *sreq, uint32_t len)
trace_spapr_vscsi_transfer_data(sreq->tag, len, req);
if (req == NULL) {
- fprintf(stderr, "VSCSI: Can't find request for tag 0x%x\n", sreq->tag);
+ error_report("VSCSI: Can't find request for tag 0x%x", sreq->tag);
return;
}
@@ -527,7 +528,7 @@ static void vscsi_transfer_data(SCSIRequest *sreq, uint32_t len)
rc = vscsi_srp_transfer_data(s, req, req->writing, buf, len);
}
if (rc < 0) {
- fprintf(stderr, "VSCSI: RDMA error rc=%d!\n", rc);
+ error_report("VSCSI: RDMA error rc=%d!", rc);
req->dma_error = true;
scsi_req_cancel(req->sreq);
return;
@@ -547,7 +548,7 @@ static void vscsi_command_complete(SCSIRequest *sreq, uint32_t status, size_t re
trace_spapr_vscsi_command_complete(sreq->tag, status, req);
if (req == NULL) {
- fprintf(stderr, "VSCSI: Can't find request for tag 0x%x\n", sreq->tag);
+ error_report("VSCSI: Can't find request for tag 0x%x", sreq->tag);
return;
}
@@ -639,7 +640,7 @@ static void *vscsi_load_request(QEMUFile *f, SCSIRequest *sreq)
memset(req, 0, sizeof(*req));
rc = vmstate_load_state(f, &vmstate_spapr_vscsi_req, req, 1);
if (rc) {
- fprintf(stderr, "VSCSI: failed loading request tag#%u\n", sreq->tag);
+ error_report("VSCSI: failed loading request tag#%u", sreq->tag);
return NULL;
}
assert(req->active);
@@ -827,7 +828,7 @@ static int vscsi_process_tsk_mgmt(VSCSIState *s, vscsi_req *req)
uint64_t tag = iu->srp.rsp.tag;
uint8_t sol_not = iu->srp.cmd.sol_not;
- fprintf(stderr, "vscsi_process_tsk_mgmt %02x\n",
+ error_report("vscsi_process_tsk_mgmt %02x",
iu->srp.tsk_mgmt.tsk_mgmt_func);
d = vscsi_device_find(&s->bus, be64_to_cpu(req->iu.srp.tsk_mgmt.lun), &lun);
@@ -932,10 +933,10 @@ static int vscsi_handle_srp_req(VSCSIState *s, vscsi_req *req)
case SRP_CRED_RSP:
case SRP_AER_REQ:
case SRP_AER_RSP:
- fprintf(stderr, "VSCSI: Unsupported opcode %02x\n", opcode);
+ error_report("VSCSI: Unsupported opcode %02x", opcode);
break;
default:
- fprintf(stderr, "VSCSI: Unknown type %02x\n", opcode);
+ error_report("VSCSI: Unknown type %02x", opcode);
}
return done;
@@ -953,7 +954,7 @@ static int vscsi_send_adapter_info(VSCSIState *s, vscsi_req *req)
rc = spapr_vio_dma_read(&s->vdev, be64_to_cpu(sinfo->buffer),
&info, be16_to_cpu(sinfo->common.length));
if (rc) {
- fprintf(stderr, "vscsi_send_adapter_info: DMA read failure !\n");
+ error_report("vscsi_send_adapter_info: DMA read failure !");
}
#endif
memset(&info, 0, sizeof(info));
@@ -967,7 +968,7 @@ static int vscsi_send_adapter_info(VSCSIState *s, vscsi_req *req)
rc = spapr_vio_dma_write(&s->vdev, be64_to_cpu(sinfo->buffer),
&info, be16_to_cpu(sinfo->common.length));
if (rc) {
- fprintf(stderr, "vscsi_send_adapter_info: DMA write failure !\n");
+ error_report("vscsi_send_adapter_info: DMA write failure !");
}
sinfo->common.status = rc ? cpu_to_be32(1) : 0;
@@ -987,7 +988,7 @@ static int vscsi_send_capabilities(VSCSIState *s, vscsi_req *req)
req_len = len = be16_to_cpu(vcap->common.length);
buffer = be64_to_cpu(vcap->buffer);
if (len > sizeof(cap)) {
- fprintf(stderr, "vscsi_send_capabilities: capabilities size mismatch !\n");
+ error_report("vscsi_send_capabilities: capabilities size mismatch !");
/*
* Just read and populate the structure that is known.
@@ -997,7 +998,7 @@ static int vscsi_send_capabilities(VSCSIState *s, vscsi_req *req)
}
rc = spapr_vio_dma_read(&s->vdev, buffer, &cap, len);
if (rc) {
- fprintf(stderr, "vscsi_send_capabilities: DMA read failure !\n");
+ error_report("vscsi_send_capabilities: DMA read failure !");
}
/*
@@ -1013,7 +1014,7 @@ static int vscsi_send_capabilities(VSCSIState *s, vscsi_req *req)
rc = spapr_vio_dma_write(&s->vdev, buffer, &cap, len);
if (rc) {
- fprintf(stderr, "vscsi_send_capabilities: DMA write failure !\n");
+ error_report("vscsi_send_capabilities: DMA write failure !");
}
if (req_len > len) {
/*
@@ -1034,11 +1035,11 @@ static int vscsi_handle_mad_req(VSCSIState *s, vscsi_req *req)
switch (be32_to_cpu(mad->empty_iu.common.type)) {
case VIOSRP_EMPTY_IU_TYPE:
- fprintf(stderr, "Unsupported EMPTY MAD IU\n");
+ error_report("Unsupported EMPTY MAD IU");
retlen = sizeof(mad->empty_iu);
break;
case VIOSRP_ERROR_LOG_TYPE:
- fprintf(stderr, "Unsupported ERROR LOG MAD IU\n");
+ error_report("Unsupported ERROR LOG MAD IU");
retlen = sizeof(mad->error_log);
break;
case VIOSRP_ADAPTER_INFO_TYPE:
@@ -1053,7 +1054,7 @@ static int vscsi_handle_mad_req(VSCSIState *s, vscsi_req *req)
request_handled = true;
break;
default:
- fprintf(stderr, "VSCSI: Unknown MAD type %02x\n",
+ error_report("VSCSI: Unknown MAD type %02x",
be32_to_cpu(mad->empty_iu.common.type));
/*
* PAPR+ says that "The length field is set to the length
@@ -1078,7 +1079,7 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq *crq)
req = vscsi_get_req(s);
if (req == NULL) {
- fprintf(stderr, "VSCSI: Failed to get a request !\n");
+ error_report("VSCSI: Failed to get a request !");
return;
}
@@ -1088,7 +1089,7 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq *crq)
* of the structure.
*/
if (crq->s.IU_length > sizeof(union viosrp_iu)) {
- fprintf(stderr, "VSCSI: SRP IU too long (%d bytes) !\n",
+ error_report("VSCSI: SRP IU too long (%d bytes) !",
crq->s.IU_length);
vscsi_put_req(req);
return;
@@ -1097,7 +1098,7 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq *crq)
/* XXX Handle failure differently ? */
if (spapr_vio_dma_read(&s->vdev, crq->s.IU_data_ptr, &req->iu,
crq->s.IU_length)) {
- fprintf(stderr, "vscsi_got_payload: DMA read failure !\n");
+ error_report("vscsi_got_payload: DMA read failure !");
vscsi_put_req(req);
return;
}
@@ -1158,16 +1159,16 @@ static int vscsi_do_crq(struct VIOsPAPRDevice *dev, uint8_t *crq_data)
case VIOSRP_AIX_FORMAT:
case VIOSRP_LINUX_FORMAT:
case VIOSRP_INLINE_FORMAT:
- fprintf(stderr, "vscsi_do_srq: Unsupported payload format %02x\n",
+ error_report("vscsi_do_srq: Unsupported payload format %02x",
crq.s.format);
break;
default:
- fprintf(stderr, "vscsi_do_srq: Unknown payload format %02x\n",
+ error_report("vscsi_do_srq: Unknown payload format %02x",
crq.s.format);
}
break;
default:
- fprintf(stderr, "vscsi_do_crq: unknown CRQ %02x %02x ...\n",
+ error_report("vscsi_do_crq: unknown CRQ %02x %02x ...",
crq.raw[0], crq.raw[1]);
};
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
index add4b3f4a4..e047361310 100644
--- a/hw/scsi/virtio-scsi-dataplane.c
+++ b/hw/scsi/virtio-scsi-dataplane.c
@@ -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;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 35/47] hw/sd: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (32 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 34/47] hw/scsi: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-01 1:41 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 36/47] hw/sh4: " Alistair Francis
` (12 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/sd/pl181.c | 5 +++--
hw/sd/sd.c | 14 +++++++-------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
index 55c8098ecd..2b878a0c5e 100644
--- a/hw/sd/pl181.c
+++ b/hw/sd/pl181.c
@@ -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];
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index ba47bff4db..e467d74fc8 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -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:
@@ -1565,10 +1565,10 @@ send_response:
int i;
DPRINTF("Response:");
for (i = 0; i < rsplen; i++)
- fprintf(stderr, " %02x", response[i]);
- fprintf(stderr, " state %d\n", sd->state);
+ error_report(" %02x", response[i]);
+ error_report(" state %d", sd->state);
} else {
- DPRINTF("No response %d\n", sd->state);
+ DPRINTF("No response %d", sd->state);
}
#endif
@@ -1580,14 +1580,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");
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 36/47] hw/sh4: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (33 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 35/47] hw/sd: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-16 11:56 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 37/47] hw/sparc*: " Alistair Francis
` (11 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Magnus Damm, Aurelien Jarno
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 <alistair.francis@xilinx.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
---
V2:
- Split hw patch into individual directories
hw/sh4/r2d.c | 9 ++++----
hw/sh4/sh7750.c | 64 +++++++++++++++++++++++++++++----------------------------
2 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 16b9ed2db2..a010f559e2 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -24,6 +24,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
@@ -319,8 +320,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("qemu: could not load kernel '%s'", kernel_filename);
+ exit(1);
}
/* initialization which should be done by firmware */
@@ -339,8 +340,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("qemu: could not load initrd '%s'", initrd_filename);
+ exit(1);
}
/* initialization which should be done by firmware */
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index 166e4bd947..64ffc4c1d2 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -23,6 +23,7 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sysemu/sysemu.h"
@@ -147,9 +148,9 @@ static void porta_changed(SH7750State * s, uint16_t prev)
int i, r = 0;
#if 0
- fprintf(stderr, "porta changed from 0x%04x to 0x%04x\n",
+ error_report("porta changed from 0x%04x to 0x%04x",
prev, porta_lines(s));
- fprintf(stderr, "pdtra=0x%04x, pctra=0x%08x\n", s->pdtra, s->pctra);
+ error_report("pdtra=0x%04x, pctra=0x%08x", s->pdtra, s->pctra);
#endif
currenta = porta_lines(s);
if (currenta == prev)
@@ -200,13 +201,13 @@ static void portb_changed(SH7750State * s, uint16_t prev)
static void error_access(const char *kind, hwaddr addr)
{
- fprintf(stderr, "%s to %s (0x" TARGET_FMT_plx ") not supported\n",
+ error_report("%s to %s (0x" TARGET_FMT_plx ") not supported",
kind, regname(addr), addr);
}
static void ignore_access(const char *kind, hwaddr addr)
{
- fprintf(stderr, "%s to %s (0x" TARGET_FMT_plx ") ignored\n",
+ error_report("%s to %s (0x" TARGET_FMT_plx ") ignored",
kind, regname(addr), addr);
}
@@ -326,47 +327,48 @@ static void sh7750_mem_writew(void *opaque, hwaddr addr,
uint16_t temp;
switch (addr) {
- /* SDRAM controller */
+ /* SDRAM controller */
case SH7750_BCR2_A7:
s->bcr2 = mem_value;
return;
case SH7750_BCR3_A7:
- if(!has_bcr3_and_bcr4(s))
- error_access("word write", addr);
- s->bcr3 = mem_value;
- return;
+ if (!has_bcr3_and_bcr4(s)) {
+ error_access("word write", addr);
+ }
+ s->bcr3 = mem_value;
+ return;
case SH7750_PCR_A7:
- s->pcr = mem_value;
- return;
+ s->pcr = mem_value;
+ return;
case SH7750_RTCNT_A7:
case SH7750_RTCOR_A7:
case SH7750_RTCSR_A7:
- ignore_access("word write", addr);
- return;
- /* IO ports */
+ ignore_access("word write", addr);
+ return;
+ /* IO ports */
case SH7750_PDTRA_A7:
- temp = porta_lines(s);
- s->pdtra = mem_value;
- porta_changed(s, temp);
- return;
+ temp = porta_lines(s);
+ s->pdtra = mem_value;
+ porta_changed(s, temp);
+ return;
case SH7750_PDTRB_A7:
- temp = portb_lines(s);
- s->pdtrb = mem_value;
- portb_changed(s, temp);
- return;
+ temp = portb_lines(s);
+ s->pdtrb = mem_value;
+ portb_changed(s, temp);
+ return;
case SH7750_RFCR_A7:
- fprintf(stderr, "Write access to refresh count register\n");
- s->rfcr = mem_value;
- return;
+ error_report("Write access to refresh count register");
+ s->rfcr = mem_value;
+ return;
case SH7750_GPIOIC_A7:
- s->gpioic = mem_value;
- if (mem_value != 0) {
- fprintf(stderr, "I/O interrupts not implemented\n");
+ s->gpioic = mem_value;
+ if (mem_value != 0) {
+ error_report("I/O interrupts not implemented");
abort();
- }
- return;
+ }
+ return;
default:
- error_access("word write", addr);
+ error_access("word write", addr);
abort();
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 37/47] hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (34 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 36/47] hw/sh4: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-09-30 2:40 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 38/47] hw/ssi: " Alistair Francis
` (10 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Fabien Chouteau,
Mark Cave-Ayland, Artyom Tarasenko
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 <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
---
V2:
- Split hw patch into individual directories
hw/sparc/leon3.c | 9 +++++----
hw/sparc/sun4m.c | 8 ++++----
hw/sparc64/niagara.c | 2 +-
hw/sparc64/sun4u.c | 9 +++++----
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index ec2816bf94..d434edec92 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -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"
@@ -172,7 +173,7 @@ 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",
+ error_report("qemu: could not load prom '%s': file too big",
filename);
exit(1);
}
@@ -180,11 +181,11 @@ static void leon3_generic_hw_init(MachineState *machine)
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("qemu: 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);
@@ -197,7 +198,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",
+ error_report("qemu: could not load kernel '%s'",
kernel_filename);
exit(1);
}
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index e1bdd4828d..7a2812aaa4 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -261,7 +261,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",
+ error_report("qemu: could not load kernel '%s'",
kernel_filename);
exit(1);
}
@@ -273,8 +273,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("qemu: could not load initial ram disk '%s'",
+ initrd_filename);
exit(1);
}
}
@@ -688,7 +688,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("qemu: could not load prom '%s'", bios_name);
exit(1);
}
}
diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index 9a8d6109d4..60799220f3 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -153,7 +153,7 @@ 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",
+ error_report("qemu: could not load ram disk '%s'",
blk_bs(blk)->filename);
exit(1);
}
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index c3280aaf38..070d9b94f9 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -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"
@@ -165,7 +166,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",
+ error_report("qemu: could not load kernel '%s'",
kernel_filename);
exit(1);
}
@@ -178,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("qemu: could not load initial ram disk '%s'",
+ initrd_filename);
exit(1);
}
}
@@ -322,7 +323,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("qemu: could not load prom '%s'", bios_name);
exit(1);
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 38/47] hw/ssi: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (35 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 37/47] hw/sparc*: " Alistair Francis
@ 2017-09-30 0:16 ` Alistair Francis
2017-10-01 1:38 ` Philippe Mathieu-Daudé
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 39/47] hw/timer: " Alistair Francis
` (9 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:16 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/ssi/omap_spi.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/ssi/omap_spi.c b/hw/ssi/omap_spi.c
index 34163e5646..98242d1e8b 100644
--- a/hw/ssi/omap_spi.c
+++ b/hw/ssi/omap_spi.c
@@ -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;
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 39/47] hw/timer: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (36 preceding siblings ...)
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 38/47] hw/ssi: " Alistair Francis
@ 2017-09-30 0:17 ` Alistair Francis
2017-10-01 1:37 ` Philippe Mathieu-Daudé
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 40/47] hw/usb: " Alistair Francis
` (8 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:17 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
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(-)
diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c
index ae2dc99832..0f064241d3 100644
--- a/hw/timer/omap_gptimer.c
+++ b/hw/timer/omap_gptimer.c
@@ -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 */
diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c
index ef116c636c..18880884c6 100644
--- a/hw/timer/twl92230.c
+++ b/hw/timer/twl92230.c
@@ -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);
diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index 59439c05be..a80bba846b 100644
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -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)
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 40/47] hw/usb: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (37 preceding siblings ...)
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 39/47] hw/timer: " Alistair Francis
@ 2017-09-30 0:17 ` Alistair Francis
2017-10-01 1:36 ` Philippe Mathieu-Daudé
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 41/47] hw/watchdog: " Alistair Francis
` (7 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:17 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru, Gerd Hoffmann
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 <alistair.francis@xilinx.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
---
V2:
- Split hw patch into individual directories
hw/usb/core.c | 15 ++++++++-------
hw/usb/desc.c | 4 ++--
hw/usb/dev-audio.c | 29 +++++++++++++++--------------
hw/usb/dev-bluetooth.c | 4 ++--
hw/usb/dev-mtp.c | 9 +++++----
hw/usb/dev-network.c | 20 ++++++++++----------
hw/usb/hcd-ehci.c | 32 ++++++++++++++++----------------
hw/usb/hcd-musb.c | 4 ++--
hw/usb/hcd-xhci.c | 3 ++-
hw/usb/host-legacy.c | 2 +-
10 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/hw/usb/core.c b/hw/usb/core.c
index 241ae66b15..9ffdef055c 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -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)
diff --git a/hw/usb/desc.c b/hw/usb/desc.c
index 85c15addc5..afae910f8e 100644
--- a/hw/usb/desc.c
+++ b/hw/usb/desc.c
@@ -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,7 +688,7 @@ int usb_desc_get_descriptor(USBDevice *dev, USBPacket *p,
break;
default:
- fprintf(stderr, "%s: %d unknown type %d (len %zd)\n", __func__,
+ error_report("%s: %d unknown type %d (len %zd)", __func__,
dev->addr, type, len);
break;
}
diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index 343345235c..43fc20469a 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -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,7 +497,7 @@ 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",
+ 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,
@@ -514,8 +515,8 @@ 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",
+ error_report("usb-audio: control transaction: "
+ "request 0x%04x value 0x%04x index 0x%04x length 0x%04x",
request, value, index, length);
}
@@ -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,8 +558,8 @@ 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",
+ 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;
@@ -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,7 +596,7 @@ 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",
+ error_report("usb-audio: output overrun (%zd bytes)",
p->iov.size - p->actual_length);
}
}
@@ -611,8 +612,8 @@ 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",
+ 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);
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 0bbceaea0b..dfef258dca 100644
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -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;
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 94c2e94f10..7e1782b8fc 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -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__);
+ error_report("%s", __func__);
}
static void usb_mtp_handle_data(USBDevice *dev, USBPacket *p)
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 85fc81bf43..9dd4af5e34 100644
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -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;
@@ -1084,9 +1084,9 @@ static void usb_net_handle_control(USBDevice *dev, USBPacket *p,
for (i = 0; i < length; i++) {
if (!(i & 15))
fprintf(stderr, "\n%04x:", i);
- fprintf(stderr, " %02x", data[i]);
+ error_report(" %02x", data[i]);
}
- fprintf(stderr, "\n\n");
+ fprintf(stderr, "\n");
}
#endif
ret = rndis_parse(s, data, length);
@@ -1111,17 +1111,17 @@ static void usb_net_handle_control(USBDevice *dev, USBPacket *p,
for (i = 0; i < p->actual_length; i++) {
if (!(i & 15))
fprintf(stderr, "\n%04x:", i);
- fprintf(stderr, " %02x", data[i]);
+ error_report(" %02x", data[i]);
}
- fprintf(stderr, "\n\n");
+ fprintf(stderr, "\n");
}
#endif
break;
default:
fail:
- fprintf(stderr, "usbnet: failed control transaction: "
- "request 0x%x value 0x%x index 0x%x length 0x%x\n",
+ 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);
}
}
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 0134232627..e405b882fb 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -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();
}
}
diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c
index d70a91a58c..4729926124 100644
--- a/hw/usb/hcd-musb.c
+++ b/hw/usb/hcd-musb.c
@@ -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
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index d75c085d94..6cc1be09a2 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -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
diff --git a/hw/usb/host-legacy.c b/hw/usb/host-legacy.c
index 3b57e21b52..f0c81e5309 100644
--- a/hw/usb/host-legacy.c
+++ b/hw/usb/host-legacy.c
@@ -86,7 +86,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;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 41/47] hw/watchdog: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (38 preceding siblings ...)
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 40/47] hw/usb: " Alistair Francis
@ 2017-09-30 0:17 ` Alistair Francis
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 42/47] hw/xen*: " Alistair Francis
` (6 subsequent siblings)
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:17 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
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 <alistair.francis@xilinx.com>
---
V2:
- Split hw patch into individual directories
hw/watchdog/watchdog.c | 9 +++++----
hw/watchdog/wdt_i6300esb.c | 8 +++++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c
index 0c5c9cde1c..76ae5d2fe5 100644
--- a/hw/watchdog/watchdog.c
+++ b/hw/watchdog/watchdog.c
@@ -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"
@@ -51,7 +52,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",
+ error_report("\t%s\t%s",
model->wdt_name, model->wdt_description);
}
return 2;
@@ -67,9 +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",
+ error_report("\t%s\t%s",
model->wdt_name, model->wdt_description);
}
return 1;
@@ -133,7 +134,7 @@ void watchdog_perform_action(void)
case WDT_DEBUG:
qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_DEBUG, &error_abort);
- fprintf(stderr, "watchdog: timer fired\n");
+ error_report("watchdog: timer fired");
break;
case WDT_NONE:
diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c
index 49b3cd188a..f596f70a3b 100644
--- a/hw/watchdog/wdt_i6300esb.c
+++ b/hw/watchdog/wdt_i6300esb.c
@@ -20,7 +20,7 @@
*/
#include "qemu/osdep.h"
-
+#include "qemu/error-report.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "sysemu/watchdog.h"
@@ -186,10 +186,12 @@ 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");
+ error_report("i6300esb_timer_expired: I would send APIC 1 INT 10"
+ "here if I knew how (XXX)");
break;
case INT_TYPE_SMI:
- fprintf(stderr, "i6300esb_timer_expired: I would send SMI here if I knew how (XXX)\n");
+ error_report("i6300esb_timer_expired: I would send SMI here if I"
+ "knew how (XXX)");
break;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 42/47] hw/xen*: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (39 preceding siblings ...)
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 41/47] hw/watchdog: " Alistair Francis
@ 2017-09-30 0:17 ` Alistair Francis
2017-10-10 15:13 ` Anthony PERARD
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 43/47] util: " Alistair Francis
` (5 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:17 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Stefano Stabellini, Anthony Perard
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 <alistair.francis@xilinx.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
---
V2:
- Split hw patch into individual directories
hw/xen/xen-common.c | 11 ++++++-----
hw/xen/xen_pt.c | 4 ++--
hw/xenpv/xen_domainbuild.c | 24 ++++++++++++------------
hw/xenpv/xen_machine_pv.c | 9 +++++----
4 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c
index 632a938dcc..42ada2ac05 100644
--- a/hw/xen/xen-common.c
+++ b/hw/xen/xen-common.c
@@ -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);
}
}
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index 375efa68f6..e86d380d02 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -73,7 +73,7 @@ void xen_pt_log(const PCIDevice *d, const char *f, ...)
va_start(ap, f);
if (d) {
- fprintf(stderr, "[%02x:%02x.%d] ", pci_bus_num(d->bus),
+ error_report("[%02x:%02x.%d] ", pci_bus_num(d->bus),
PCI_SLOT(d->devfn), PCI_FUNC(d->devfn));
}
vfprintf(stderr, f, ap);
@@ -87,7 +87,7 @@ static int xen_pt_pci_config_access_check(PCIDevice *d, uint32_t addr, int len)
/* check offset range */
if (addr > 0xFF) {
XEN_PT_ERR(d, "Failed to access register with offset exceeding 0xFF. "
- "(addr: 0x%02x, len: %d)\n", addr, len);
+ "(addr: 0x%02x, len: %d)", addr, len);
return -1;
}
diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c
index 027f76fad1..f5514ffec2 100644
--- a/hw/xenpv/xen_domainbuild.c
+++ b/hw/xenpv/xen_domainbuild.c
@@ -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;
}
diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
index 69a52a9f93..44d67b87c4 100644
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -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;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 43/47] util: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (40 preceding siblings ...)
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 42/47] hw/xen*: " Alistair Francis
@ 2017-09-30 0:17 ` Alistair Francis
2017-09-30 2:43 ` Philippe Mathieu-Daudé
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 44/47] ui: " Alistair Francis
` (4 subsequent siblings)
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:17 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Kevin Wolf, Paolo Bonzini,
Stefan Weil, qemu-block
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}' \
{} +
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Stefan Weil <sw@weilnetz.de>
Cc: qemu-block@nongnu.org
---
util/aio-posix.c | 5 +++--
util/coroutine-sigaltstack.c | 2 +-
util/error.c | 2 +-
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, 31 insertions(+), 22 deletions(-)
diff --git a/util/aio-posix.c b/util/aio-posix.c
index 2d51239ec6..fe4772b4a9 100644
--- a/util/aio-posix.c
+++ b/util/aio-posix.c
@@ -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"
@@ -696,8 +697,8 @@ void aio_context_setup(AioContext *ctx)
{
/* TODO remove this in final patch submission */
if (getenv("QEMU_AIO_POLL_MAX_NS")) {
- fprintf(stderr, "The QEMU_AIO_POLL_MAX_NS environment variable has "
- "been replaced with -object iothread,poll-max-ns=NUM\n");
+ error_report("The QEMU_AIO_POLL_MAX_NS environment variable has "
+ "been replaced with -object iothread,poll-max-ns=NUM");
exit(1);
}
diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
index f6fc49a0e5..96a01c2c88 100644
--- a/util/coroutine-sigaltstack.c
+++ b/util/coroutine-sigaltstack.c
@@ -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();
}
}
diff --git a/util/error.c b/util/error.c
index 3efdd69162..e423368ca0 100644
--- a/util/error.c
+++ b/util/error.c
@@ -32,7 +32,7 @@ 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",
+ error_report("Unexpected error in %s() at %s:%d:",
err->func, err->src, err->line);
error_report_err(err);
abort();
diff --git a/util/main-loop.c b/util/main-loop.c
index 7558eb5f53..d8369716b2 100644
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -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;
}
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 3ec029a9ea..11887aac69 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -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);
}
diff --git a/util/module.c b/util/module.c
index c90973721f..1153e3ebb0 100644
--- a/util/module.c
+++ b/util/module.c
@@ -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;
}
diff --git a/util/osdep.c b/util/osdep.c
index a479fedc4a..62d92c9560 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -425,7 +425,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
@@ -452,7 +452,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);
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 80086c549f..d840692dd7 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -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>
@@ -87,7 +88,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;
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 69a6286d50..2197a6a4fc 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -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;
diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c
index d6095c1d5a..1f7cce6706 100644
--- a/util/qemu-coroutine.c
+++ b/util/qemu-coroutine.c
@@ -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();
}
diff --git a/util/qemu-progress.c b/util/qemu-progress.c
index 3c2223c1a2..84598f0fbb 100644
--- a/util/qemu-progress.c
+++ b/util/qemu-progress.c
@@ -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;
}
}
diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c
index 7306475899..e7d1a68c73 100644
--- a/util/qemu-thread-posix.c
+++ b/util/qemu-thread-posix.c
@@ -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("qemu: 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("qemu: %s: %s", msg, strerror(err));
abort();
}
diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c
index 94f3491a87..46b5dac159 100644
--- a/util/qemu-thread-win32.c
+++ b/util/qemu-thread-win32.c
@@ -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("qemu: 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("qemu: %s: %s", msg, pstr);
LocalFree(pstr);
abort();
}
diff --git a/util/qemu-timer-common.c b/util/qemu-timer-common.c
index 06d084d364..ab7b702c4f 100644
--- a/util/qemu-timer-common.c
+++ b/util/qemu-timer-common.c
@@ -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;
diff --git a/util/qht.c b/util/qht.c
index ff4d2e6974..bfab5c7e5e 100644
--- a/util/qht.c
+++ b/util/qht.c
@@ -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;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 44/47] ui: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (41 preceding siblings ...)
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 43/47] util: " Alistair Francis
@ 2017-09-30 0:17 ` Alistair Francis
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 45/47] tcg: " Alistair Francis
` (3 subsequent siblings)
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:17 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Peter Maydell, Gerd Hoffmann
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}' \
{} +
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
---
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(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 93e56d0518..62c021c5d3 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -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];
@@ -908,7 +908,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);
}
@@ -917,7 +917,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];
diff --git a/ui/console.c b/ui/console.c
index b82c27960a..56d0ebcb50 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1417,7 +1417,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);
}
diff --git a/ui/curses.c b/ui/curses.c
index 03cefdf470..06784ec7f0 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -423,7 +423,7 @@ void curses_display_init(DisplayState *ds, int full_screen)
{
#ifndef _WIN32
if (!isatty(1)) {
- fprintf(stderr, "We need a terminal output\n");
+ error_report("We need a terminal output");
exit(1);
}
#endif
diff --git a/ui/cursor.c b/ui/cursor.c
index f3da0cee79..9d847031ec 100644
--- a/ui/cursor.c
+++ b/ui/cursor.c
@@ -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("|");
}
}
diff --git a/ui/gtk.c b/ui/gtk.c
index 5bd87c265a..99477ea6e6 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -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 {
@@ -2210,12 +2210,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 "
- "qemu-devel@nongnu.org\n", keycodes);
+ error_report("unknown keycodes `%s', please report to "
+ "qemu-devel@nongnu.org", keycodes);
}
if (desc) {
@@ -2239,7 +2239,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);
}
diff --git a/ui/input-linux.c b/ui/input-linux.c
index 9720333b2c..edc5273476 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -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) {
diff --git a/ui/keymaps.c b/ui/keymaps.c
index f9762d1497..41c5e42553 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -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); */
}
diff --git a/ui/sdl.c b/ui/sdl.c
index 7b71a9ac58..29db4c68ad 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -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 "
- "qemu-devel@nongnu.org\n", keycodes);
+ error_report("unknown keycodes `%s', please report to "
+ "qemu-devel@nongnu.org", 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);
}
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 53dd447fd2..f6700e70f5 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -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);
}
diff --git a/ui/sdl_zoom.c b/ui/sdl_zoom.c
index b96196bac5..bf73d1f1f9 100644
--- a/ui/sdl_zoom.c
+++ b/ui/sdl_zoom.c
@@ -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;
}
diff --git a/ui/shader.c b/ui/shader.c
index 1ffddbef3b..cecaa4876f 100644
--- a/ui/shader.c
+++ b/ui/shader.c
@@ -25,6 +25,7 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qemu-common.h"
#include "ui/shader.h"
@@ -85,9 +86,9 @@ 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;
}
@@ -110,7 +111,7 @@ 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;
}
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 346fff44f4..8cf126e7b0 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -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__,
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index f38aceb4da..7ac957057d 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -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;
}
diff --git a/ui/vnc-enc-zlib.c b/ui/vnc-enc-zlib.c
index 33e9df2f6a..437cfb1307 100644
--- a/ui/vnc-enc-zlib.c
+++ b/ui/vnc-enc-zlib.c
@@ -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;
}
diff --git a/ui/vnc-enc-zrle.c b/ui/vnc-enc-zrle.c
index fd63d4f688..a3af8a1c5d 100644
--- a/ui/vnc-enc-zrle.c
+++ b/ui/vnc-enc-zrle.c
@@ -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;
}
diff --git a/ui/vnc.c b/ui/vnc.c
index 0b5dbc62e4..2bad9ab971 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -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
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 45/47] tcg: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (42 preceding siblings ...)
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 44/47] ui: " Alistair Francis
@ 2017-09-30 0:17 ` Alistair Francis
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 46/47] target: Use qemu_log() instead of fprintf(stderr, ...) Alistair Francis
` (2 subsequent siblings)
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:17 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Paolo Bonzini,
Peter Crosthwaite, Richard Henderson, Stefan Weil
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}' \
{} +
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Stefan Weil <sw@weilnetz.de>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
---
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(-)
diff --git a/cpus.c b/cpus.c
index c9a624003a..784cee4848 100644
--- a/cpus.c
+++ b/cpus.c
@@ -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;
@@ -1525,7 +1525,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);
}
diff --git a/exec.c b/exec.c
index 7a80460725..f71b714b10 100644
--- a/exec.c
+++ b/exec.c
@@ -1045,7 +1045,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:
@@ -1658,7 +1658,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();
}
@@ -1688,8 +1688,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");
}
}
}
@@ -1725,7 +1725,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();
}
@@ -2153,8 +2153,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);
}
diff --git a/tcg/optimize.c b/tcg/optimize.c
index adfc56ce62..31b15b508d 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -96,8 +96,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();
}
}
@@ -110,8 +110,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();
}
}
diff --git a/tcg/tcg.c b/tcg/tcg.c
index dff9999bc6..2bbd20fc28 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -673,7 +673,7 @@ static void tcg_temp_free_internal(int idx)
#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
diff --git a/tcg/tcg.h b/tcg/tcg.h
index 25662c36d4..1ac0f817bc 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -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"
@@ -897,7 +898,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)
diff --git a/tcg/tci.c b/tcg/tci.c
index f39bfb95c0..10b88f7308 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -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)
diff --git a/tcg/tci/tcg-target.inc.c b/tcg/tci/tcg-target.inc.c
index 913c3802a3..2f4b56d3ba 100644
--- a/tcg/tci/tcg-target.inc.c
+++ b/tcg/tci/tcg-target.inc.c
@@ -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
diff --git a/vl.c b/vl.c
index 3fed457921..e4e8694fcc 100644
--- a/vl.c
+++ b/vl.c
@@ -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)) {
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 46/47] target: Use qemu_log() instead of fprintf(stderr, ...)
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (43 preceding siblings ...)
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 45/47] tcg: " Alistair Francis
@ 2017-09-30 0:17 ` Alistair Francis
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 47/47] target: Replace fprintf(stderr, "*\n" with error_report() Alistair Francis
[not found] ` <ade26715c9bde1fe921959823de08da582fce58f.1506730372.git.alistair.francis@xilinx.com>
46 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:17 UTC (permalink / raw)
To: qemu-devel; +Cc: alistair.francis, alistair23, armbru
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
---
target/cris/translate.c | 2 +-
target/ppc/translate.c | 22 +++++++++++-----------
target/sh4/translate.c | 4 ++--
target/unicore32/translate.c | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/target/cris/translate.c b/target/cris/translate.c
index 38a999e6f1..e04aa2ae2b 100644
--- a/target/cris/translate.c
+++ b/target/cris/translate.c
@@ -138,7 +138,7 @@ typedef struct DisasContext {
static void gen_BUG(DisasContext *dc, const char *file, int line)
{
- fprintf(stderr, "BUG: pc=%x %s %d\n", dc->pc, file, line);
+ qemu_log("BUG: pc=%x %s %d\n", dc->pc, file, line);
if (qemu_log_separate()) {
qemu_log("BUG: pc=%x %s %d\n", dc->pc, file, line);
}
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 606b605ba0..1a281d90a3 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -3943,11 +3943,11 @@ static inline void gen_op_mfspr(DisasContext *ctx)
* allowing userland application to read the PVR
*/
if (sprn != SPR_PVR) {
- fprintf(stderr, "Trying to read privileged spr %d (0x%03x) at "
- TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
+ qemu_log("Trying to read privileged spr %d (0x%03x) at "
+ TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
if (qemu_log_separate()) {
qemu_log("Trying to read privileged spr %d (0x%03x) at "
- TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
+ TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
}
}
gen_priv_exception(ctx, POWERPC_EXCP_PRIV_REG);
@@ -3960,8 +3960,8 @@ static inline void gen_op_mfspr(DisasContext *ctx)
return;
}
/* Not defined */
- fprintf(stderr, "Trying to read invalid spr %d (0x%03x) at "
- TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
+ qemu_log("Trying to read invalid spr %d (0x%03x) at "
+ TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
if (qemu_log_separate()) {
qemu_log("Trying to read invalid spr %d (0x%03x) at "
TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
@@ -4106,8 +4106,8 @@ static void gen_mtspr(DisasContext *ctx)
(*write_cb)(ctx, sprn, rS(ctx->opcode));
} else {
/* Privilege exception */
- fprintf(stderr, "Trying to write privileged spr %d (0x%03x) at "
- TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
+ qemu_log("Trying to write privileged spr %d (0x%03x) at "
+ TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
if (qemu_log_separate()) {
qemu_log("Trying to write privileged spr %d (0x%03x) at "
TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
@@ -4127,8 +4127,8 @@ static void gen_mtspr(DisasContext *ctx)
qemu_log("Trying to write invalid spr %d (0x%03x) at "
TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
}
- fprintf(stderr, "Trying to write invalid spr %d (0x%03x) at "
- TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
+ qemu_log("Trying to write invalid spr %d (0x%03x) at "
+ TARGET_FMT_lx "\n", sprn, sprn, ctx->nip - 4);
/* The behaviour depends on MSR:PR and SPR# bit 0x10,
@@ -7370,8 +7370,8 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
break;
}
if (tcg_check_temp_count()) {
- fprintf(stderr, "Opcode %02x %02x %02x %02x (%08x) leaked "
- "temporaries\n", opc1(ctx.opcode), opc2(ctx.opcode),
+ qemu_log("Opcode %02x %02x %02x %02x (%08x) leaked "
+ "temporaries\n", opc1(ctx.opcode), opc2(ctx.opcode),
opc3(ctx.opcode), opc4(ctx.opcode), ctx.opcode);
exit(1);
}
diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index 10191073b2..95d453fdfe 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -438,7 +438,7 @@ static void _decode_opc(DisasContext * ctx)
}
#if 0
- fprintf(stderr, "Translating opcode 0x%04x\n", ctx->opcode);
+ qemu_log("Translating opcode 0x%04x\n", ctx->opcode);
#endif
switch (ctx->opcode) {
@@ -1799,7 +1799,7 @@ static void _decode_opc(DisasContext * ctx)
break;
}
#if 0
- fprintf(stderr, "unknown instruction 0x%04x at pc 0x%08x\n",
+ qemu_log_mask(LOG_UNIMP, "unknown instruction 0x%04x at pc 0x%08x\n",
ctx->opcode, ctx->pc);
fflush(stderr);
#endif
diff --git a/target/unicore32/translate.c b/target/unicore32/translate.c
index 6c094d59d7..1bd7827ee8 100644
--- a/target/unicore32/translate.c
+++ b/target/unicore32/translate.c
@@ -1940,7 +1940,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
disas_uc32_insn(env, dc);
if (num_temps) {
- fprintf(stderr, "Internal resource leak before %08x\n", dc->pc);
+ qemu_log("Internal resource leak before %08x\n", dc->pc);
num_temps = 0;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* [Qemu-devel] [PATCH v2 47/47] target: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
` (44 preceding siblings ...)
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 46/47] target: Use qemu_log() instead of fprintf(stderr, ...) Alistair Francis
@ 2017-09-30 0:17 ` Alistair Francis
2017-10-04 7:41 ` Cornelia Huck
[not found] ` <ade26715c9bde1fe921959823de08da582fce58f.1506730372.git.alistair.francis@xilinx.com>
46 siblings, 1 reply; 101+ messages in thread
From: Alistair Francis @ 2017-09-30 0:17 UTC (permalink / raw)
To: qemu-devel
Cc: alistair.francis, alistair23, armbru, Edgar E. Iglesias,
Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Marcelo Tosatti, Michael Walle, Aurelien Jarno, Yongbok Kim,
Christian Borntraeger, Cornelia Huck, Guan Xuetao, qemu-arm,
qemu-ppc
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 <alistair.francis@xilinx.com>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Michael Walle <michael@walle.cc>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Yongbok Kim <yongbok.kim@imgtec.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: qemu-arm@nongnu.org
Cc: qemu-ppc@nongnu.org
---
target/arm/arm-powerctl.c | 5 +++--
target/arm/arm-semi.c | 3 ++-
target/arm/helper.c | 4 ++--
target/arm/kvm.c | 16 ++++++-------
target/arm/kvm32.c | 2 +-
target/arm/kvm64.c | 2 +-
target/arm/translate-a64.c | 4 ++--
target/arm/translate.c | 2 +-
target/cris/helper.c | 2 +-
target/i386/hax-all.c | 52 +++++++++++++++++++++----------------------
target/i386/hax-darwin.c | 26 +++++++++++-----------
target/i386/hax-mem.c | 4 ++--
target/i386/hax-windows.c | 42 +++++++++++++++++------------------
target/i386/kvm.c | 38 +++++++++++++++----------------
target/i386/misc_helper.c | 12 +++++-----
target/lm32/op_helper.c | 4 ++--
target/mips/mips-semi.c | 3 ++-
target/mips/translate.c | 2 +-
target/ppc/excp_helper.c | 4 ++--
target/ppc/kvm.c | 34 ++++++++++++++--------------
target/ppc/mmu-hash64.c | 2 +-
target/ppc/mmu_helper.c | 2 +-
target/ppc/translate_init.c | 53 ++++++++++++++++++++++----------------------
target/s390x/kvm.c | 20 ++++++++---------
target/s390x/misc_helper.c | 2 +-
target/unicore32/translate.c | 2 +-
26 files changed, 173 insertions(+), 169 deletions(-)
diff --git a/target/arm/arm-powerctl.c b/target/arm/arm-powerctl.c
index 25207cb850..2d56d5d579 100644
--- a/target/arm/arm-powerctl.c
+++ b/target/arm/arm-powerctl.c
@@ -9,6 +9,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "cpu.h"
#include "cpu-qom.h"
#include "internals.h"
@@ -24,7 +25,7 @@
#define DPRINTF(fmt, args...) \
do { \
if (DEBUG_ARM_POWERCTL) { \
- fprintf(stderr, "[ARM]%s: " fmt , __func__, ##args); \
+ error_report("[ARM]%s: " fmt , __func__, ##args); \
} \
} while (0)
@@ -32,7 +33,7 @@ CPUState *arm_get_cpu_by_id(uint64_t id)
{
CPUState *cpu;
- DPRINTF("cpu %" PRId64 "\n", id);
+ DPRINTF("cpu %" PRId64 "", id);
CPU_FOREACH(cpu) {
ARMCPU *armcpu = ARM_CPU(cpu);
diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c
index 7cac8734c7..f8f12102f1 100644
--- a/target/arm/arm-semi.c
+++ b/target/arm/arm-semi.c
@@ -19,6 +19,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "cpu.h"
#include "exec/semihost.h"
@@ -649,7 +650,7 @@ target_ulong do_arm_semihosting(CPUARMState *env)
}
/* fall through -- invalid for A32/T32 */
default:
- fprintf(stderr, "qemu: Unsupported SemiHosting SWI 0x%02x\n", nr);
+ error_report("qemu: Unsupported SemiHosting SWI 0x%02x", nr);
cpu_dump_state(cs, stderr, fprintf, 0);
abort();
}
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 8be78ea2f8..881afc3382 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -5460,9 +5460,9 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r,
ARMCPRegInfo *oldreg;
oldreg = g_hash_table_lookup(cpu->cp_regs, key);
if (oldreg && !(oldreg->type & ARM_CP_OVERRIDE)) {
- fprintf(stderr, "Register redefined: cp=%d %d bit "
+ error_report("Register redefined: cp=%d %d bit "
"crn=%d crm=%d opc1=%d opc2=%d, "
- "was %s, now %s\n", r2->cp, 32 + 32 * is64,
+ "was %s, now %s", r2->cp, 32 + 32 * is64,
r2->crn, r2->crm, r2->opc1, r2->opc2,
oldreg->name, r2->name);
g_assert_not_reached();
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 211a7bf7be..0165960405 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -139,7 +139,7 @@ static void kvm_arm_host_cpu_class_init(ObjectClass *oc, void *data)
* TCG CPUs.
*/
if (!kvm_arm_get_host_cpu_features(ahcc)) {
- fprintf(stderr, "Failed to retrieve host CPU features!\n");
+ error_report("Failed to retrieve host CPU features!");
abort();
}
}
@@ -256,7 +256,7 @@ static void kvm_arm_set_device_addr(KVMDevice *kd)
}
if (ret < 0) {
- fprintf(stderr, "Failed to set device address: %s\n",
+ error_report("Failed to set device address: %s",
strerror(-ret));
abort();
}
@@ -352,7 +352,7 @@ int kvm_arm_init_cpreg_list(ARMCPU *cpu)
case KVM_REG_SIZE_U64:
break;
default:
- fprintf(stderr, "Can't handle size of register in kernel list\n");
+ error_report("Can't handle size of register in kernel list");
ret = -EINVAL;
goto out;
}
@@ -383,7 +383,7 @@ int kvm_arm_init_cpreg_list(ARMCPU *cpu)
/* Shouldn't happen unless kernel is inconsistent about
* what registers exist.
*/
- fprintf(stderr, "Initial read of kernel register state failed\n");
+ error_report("Initial read of kernel register state failed");
ret = -EINVAL;
goto out;
}
@@ -478,11 +478,11 @@ void kvm_arm_reset_vcpu(ARMCPU *cpu)
*/
ret = kvm_arm_vcpu_init(CPU(cpu));
if (ret < 0) {
- fprintf(stderr, "kvm_arm_vcpu_init failed: %s\n", strerror(-ret));
+ error_report("kvm_arm_vcpu_init failed: %s", strerror(-ret));
abort();
}
if (!write_kvmstate_to_list(cpu)) {
- fprintf(stderr, "write_kvmstate_to_list failed\n");
+ error_report("write_kvmstate_to_list failed");
abort();
}
}
@@ -499,7 +499,7 @@ int kvm_arm_sync_mpstate_to_kvm(ARMCPU *cpu)
};
int ret = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MP_STATE, &mp_state);
if (ret) {
- fprintf(stderr, "%s: failed to set MP_STATE %d/%s\n",
+ error_report("%s: failed to set MP_STATE %d/%s",
__func__, ret, strerror(-ret));
return -1;
}
@@ -517,7 +517,7 @@ int kvm_arm_sync_mpstate_to_qemu(ARMCPU *cpu)
struct kvm_mp_state mp_state;
int ret = kvm_vcpu_ioctl(CPU(cpu), KVM_GET_MP_STATE, &mp_state);
if (ret) {
- fprintf(stderr, "%s: failed to get MP_STATE %d/%s\n",
+ error_report("%s: failed to get MP_STATE %d/%s",
__func__, ret, strerror(-ret));
abort();
}
diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c
index f925a21481..97d36a174d 100644
--- a/target/arm/kvm32.c
+++ b/target/arm/kvm32.c
@@ -191,7 +191,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
ARMCPU *cpu = ARM_CPU(cs);
if (cpu->kvm_target == QEMU_KVM_ARM_TARGET_NONE) {
- fprintf(stderr, "KVM is not supported for this guest CPU type\n");
+ error_report("KVM is not supported for this guest CPU type");
return -EINVAL;
}
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
index 6554c30007..b3e1484069 100644
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@ -502,7 +502,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
if (cpu->kvm_target == QEMU_KVM_ARM_TARGET_NONE ||
!object_dynamic_cast(OBJECT(cpu), TYPE_AARCH64_CPU)) {
- fprintf(stderr, "KVM is not supported for this guest CPU type\n");
+ error_report("KVM is not supported for this guest CPU type");
return -EINVAL;
}
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index 899ffb96fc..eac76a0747 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -505,8 +505,8 @@ static inline void assert_fp_access_checked(DisasContext *s)
{
#ifdef CONFIG_DEBUG_TCG
if (unlikely(!s->fp_access_checked || s->fp_excp_el)) {
- fprintf(stderr, "target-arm: FP access check missing for "
- "instruction 0x%08x\n", s->insn);
+ error_report("target-arm: FP access check missing for "
+ "instruction 0x%08x", s->insn);
abort();
}
#endif
diff --git a/target/arm/translate.c b/target/arm/translate.c
index ab1a12a1b8..d484381aef 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -857,7 +857,7 @@ void arm_test_cc(DisasCompare *cmp, int cc)
goto no_invert;
default:
- fprintf(stderr, "Bad condition code 0x%x\n", cc);
+ error_report("Bad condition code 0x%x", cc);
abort();
}
diff --git a/target/cris/helper.c b/target/cris/helper.c
index af78cca8b9..ba9ce538c3 100644
--- a/target/cris/helper.c
+++ b/target/cris/helper.c
@@ -282,7 +282,7 @@ hwaddr cris_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
if (!miss) {
phy = res.phy;
}
- D(fprintf(stderr, "%s %x -> %x\n", __func__, addr, phy));
+ D(error_report("%s %x -> %x", __func__, addr, phy));
return phy;
}
#endif
diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c
index 3ce6950296..b0462c8b4c 100644
--- a/target/i386/hax-all.c
+++ b/target/i386/hax-all.c
@@ -100,13 +100,13 @@ static int hax_get_capability(struct hax_state *hax)
}
if (!(cap->winfo & HAX_CAP_UG)) {
- fprintf(stderr, "UG mode is not supported by the hardware.\n");
+ error_report("UG mode is not supported by the hardware.");
return -ENOTSUP;
}
if (cap->wstatus & HAX_CAP_MEMQUOTA) {
if (cap->mem_quota < hax->mem_quota) {
- fprintf(stderr, "The VM memory needed exceeds the driver limit.\n");
+ error_report("The VM memory needed exceeds the driver limit.");
return -ENOSPC;
}
}
@@ -126,13 +126,13 @@ static int hax_version_support(struct hax_state *hax)
if (hax_min_version > version.cur_version) {
fprintf(stderr, "Incompatible HAX module version %d,",
version.cur_version);
- fprintf(stderr, "requires minimum version %d\n", hax_min_version);
+ error_report("requires minimum version %d", hax_min_version);
return 0;
}
if (hax_cur_version < version.compat_version) {
fprintf(stderr, "Incompatible QEMU HAX API version %x,",
hax_cur_version);
- fprintf(stderr, "requires minimum HAX API version %x\n",
+ error_report("requires minimum HAX API version %x",
version.compat_version);
return 0;
}
@@ -146,18 +146,18 @@ int hax_vcpu_create(int id)
int ret;
if (!hax_global.vm) {
- fprintf(stderr, "vcpu %x created failed, vm is null\n", id);
+ error_report("vcpu %x created failed, vm is null", id);
return -1;
}
if (hax_global.vm->vcpus[id]) {
- fprintf(stderr, "vcpu %x allocated already\n", id);
+ error_report("vcpu %x allocated already", id);
return 0;
}
vcpu = g_malloc(sizeof(struct hax_vcpu_state));
if (!vcpu) {
- fprintf(stderr, "Failed to alloc vcpu state\n");
+ error_report("Failed to alloc vcpu state");
return -ENOMEM;
}
@@ -165,14 +165,14 @@ int hax_vcpu_create(int id)
ret = hax_host_create_vcpu(hax_global.vm->fd, id);
if (ret) {
- fprintf(stderr, "Failed to create vcpu %x\n", id);
+ error_report("Failed to create vcpu %x", id);
goto error;
}
vcpu->vcpu_id = id;
vcpu->fd = hax_host_open_vcpu(hax_global.vm->id, id);
if (hax_invalid_fd(vcpu->fd)) {
- fprintf(stderr, "Failed to open the vcpu\n");
+ error_report("Failed to open the vcpu");
ret = -ENODEV;
goto error;
}
@@ -181,7 +181,7 @@ int hax_vcpu_create(int id)
ret = hax_host_setup_vcpu_channel(vcpu);
if (ret) {
- fprintf(stderr, "Invalid hax tunnel size\n");
+ error_report("Invalid hax tunnel size");
ret = -EINVAL;
goto error;
}
@@ -203,7 +203,7 @@ int hax_vcpu_destroy(CPUState *cpu)
struct hax_vcpu_state *vcpu = cpu->hax_vcpu;
if (!hax_global.vm) {
- fprintf(stderr, "vcpu %x destroy failed, vm is null\n", vcpu->vcpu_id);
+ error_report("vcpu %x destroy failed, vm is null", vcpu->vcpu_id);
return -1;
}
@@ -227,7 +227,7 @@ int hax_init_vcpu(CPUState *cpu)
ret = hax_vcpu_create(cpu->cpu_index);
if (ret < 0) {
- fprintf(stderr, "Failed to create HAX vcpu\n");
+ error_report("Failed to create HAX vcpu");
exit(-1);
}
@@ -258,13 +258,13 @@ struct hax_vm *hax_vm_create(struct hax_state *hax)
memset(vm, 0, sizeof(struct hax_vm));
ret = hax_host_create_vm(hax, &vm_id);
if (ret) {
- fprintf(stderr, "Failed to create vm %x\n", ret);
+ error_report("Failed to create vm %x", ret);
goto error;
}
vm->id = vm_id;
vm->fd = hax_host_open_vm(hax, vm_id);
if (hax_invalid_fd(vm->fd)) {
- fprintf(stderr, "Failed to open vm %d\n", vm_id);
+ error_report("Failed to open vm %d", vm_id);
goto error;
}
@@ -283,7 +283,7 @@ int hax_vm_destroy(struct hax_vm *vm)
for (i = 0; i < HAX_MAX_VCPU; i++)
if (vm->vcpus[i]) {
- fprintf(stderr, "VCPU should be cleaned before vm clean\n");
+ error_report("VCPU should be cleaned before vm clean");
return -1;
}
hax_close_fd(vm->fd);
@@ -335,7 +335,7 @@ static int hax_init(ram_addr_t ram_size)
hax->vm = hax_vm_create(hax);
if (!hax->vm) {
- fprintf(stderr, "Failed to create HAX VM\n");
+ error_report("Failed to create HAX VM");
ret = -EINVAL;
goto error;
}
@@ -364,7 +364,7 @@ static int hax_accel_init(MachineState *ms)
int ret = hax_init(ms->ram_size);
if (ret && (ret != -ENOSPC)) {
- fprintf(stderr, "No accelerator found.\n");
+ error_report("No accelerator found.");
} else {
fprintf(stdout, "HAX is %s and emulator runs in %s mode.\n",
!ret ? "working" : "not working",
@@ -526,7 +526,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)
}
if (hax_ret < 0) {
- fprintf(stderr, "vcpu run failed for vcpu %x\n", vcpu->vcpu_id);
+ error_report("vcpu run failed for vcpu %x", vcpu->vcpu_id);
abort();
}
switch (ht->_exit_status) {
@@ -546,7 +546,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)
ret = 1;
break;
case HAX_EXIT_UNKNOWN_VMEXIT:
- fprintf(stderr, "Unknown VMX exit %x from guest\n",
+ error_report("Unknown VMX exit %x from guest",
ht->_exit_reason);
qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
hax_vcpu_sync_state(env, 0);
@@ -569,16 +569,16 @@ static int hax_vcpu_hax_exec(CPUArchState *env)
break;
case HAX_EXIT_MMIO:
/* Should not happen on UG system */
- fprintf(stderr, "HAX: unsupported MMIO emulation\n");
+ error_report("HAX: unsupported MMIO emulation");
ret = -1;
break;
case HAX_EXIT_REAL:
/* Should not happen on UG system */
- fprintf(stderr, "HAX: unimplemented real mode emulation\n");
+ error_report("HAX: unimplemented real mode emulation");
ret = -1;
break;
default:
- fprintf(stderr, "Unknown exit %x from HAX\n", ht->_exit_status);
+ error_report("Unknown exit %x from HAX", ht->_exit_status);
qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
hax_vcpu_sync_state(env, 0);
cpu_dump_state(cpu, stderr, fprintf, 0);
@@ -662,7 +662,7 @@ int hax_smp_cpu_exec(CPUState *cpu)
fatal = hax_vcpu_hax_exec(env);
if (fatal) {
- fprintf(stderr, "Unsupported HAX vcpu return\n");
+ error_report("Unsupported HAX vcpu return");
abort();
}
}
@@ -1079,17 +1079,17 @@ static int hax_arch_set_registers(CPUArchState *env)
ret = hax_sync_vcpu_register(env, 1);
if (ret < 0) {
- fprintf(stderr, "Failed to sync vcpu reg\n");
+ error_report("Failed to sync vcpu reg");
return ret;
}
ret = hax_set_fpu(env);
if (ret < 0) {
- fprintf(stderr, "FPU failed\n");
+ error_report("FPU failed");
return ret;
}
ret = hax_set_msrs(env);
if (ret < 0) {
- fprintf(stderr, "MSR failed\n");
+ error_report("MSR failed");
return ret;
}
diff --git a/target/i386/hax-darwin.c b/target/i386/hax-darwin.c
index 1c5bbd0a2d..768521b6d0 100644
--- a/target/i386/hax-darwin.c
+++ b/target/i386/hax-darwin.c
@@ -24,7 +24,7 @@ hax_fd hax_mod_open(void)
{
int fd = open("/dev/HAX", O_RDWR);
if (fd == -1) {
- fprintf(stderr, "Failed to open the hax module\n");
+ error_report("Failed to open the hax module");
}
fcntl(fd, F_SETFD, FD_CLOEXEC);
@@ -38,7 +38,7 @@ int hax_populate_ram(uint64_t va, uint32_t size)
struct hax_alloc_ram_info info;
if (!hax_global.vm || !hax_global.vm->fd) {
- fprintf(stderr, "Allocate memory before vm create?\n");
+ error_report("Allocate memory before vm create?");
return -EINVAL;
}
@@ -46,7 +46,7 @@ int hax_populate_ram(uint64_t va, uint32_t size)
info.va = va;
ret = ioctl(hax_global.vm->fd, HAX_VM_IOCTL_ALLOC_RAM, &info);
if (ret < 0) {
- fprintf(stderr, "Failed to allocate %x memory\n", size);
+ error_report("Failed to allocate %x memory", size);
return ret;
}
return 0;
@@ -75,7 +75,7 @@ int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap)
ret = ioctl(hax->fd, HAX_IOCTL_CAPABILITY, cap);
if (ret == -1) {
- fprintf(stderr, "Failed to get HAX capability\n");
+ error_report("Failed to get HAX capability");
return -errno;
}
@@ -88,7 +88,7 @@ int hax_mod_version(struct hax_state *hax, struct hax_module_version *version)
ret = ioctl(hax->fd, HAX_IOCTL_VERSION, version);
if (ret == -1) {
- fprintf(stderr, "Failed to get HAX version\n");
+ error_report("Failed to get HAX version");
return -errno;
}
@@ -100,7 +100,7 @@ static char *hax_vm_devfs_string(int vm_id)
char *name;
if (vm_id > MAX_VM_ID) {
- fprintf(stderr, "Too big VM id\n");
+ error_report("Too big VM id");
return NULL;
}
@@ -119,7 +119,7 @@ static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id)
char *name;
if (vm_id > MAX_VM_ID || vcpu_id > MAX_VCPU_ID) {
- fprintf(stderr, "Too big vm id %x or vcpu id %x\n", vm_id, vcpu_id);
+ error_report("Too big vm id %x or vcpu id %x", vm_id, vcpu_id);
return NULL;
}
@@ -181,7 +181,7 @@ int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion)
ret = ioctl(vm_fd, HAX_VM_IOCTL_NOTIFY_QEMU_VERSION, qversion);
if (ret < 0) {
- fprintf(stderr, "Failed to notify qemu API version\n");
+ error_report("Failed to notify qemu API version");
return ret;
}
return 0;
@@ -196,7 +196,7 @@ int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid)
ret = ioctl(vm_fd, HAX_VM_IOCTL_VCPU_CREATE, &vcpuid);
if (ret < 0) {
- fprintf(stderr, "Failed to create vcpu %x\n", vcpuid);
+ error_report("Failed to create vcpu %x", vcpuid);
}
return ret;
@@ -209,14 +209,14 @@ hax_fd hax_host_open_vcpu(int vmid, int vcpuid)
devfs_path = hax_vcpu_devfs_string(vmid, vcpuid);
if (!devfs_path) {
- fprintf(stderr, "Failed to get the devfs\n");
+ error_report("Failed to get the devfs");
return -EINVAL;
}
fd = open(devfs_path, O_RDWR);
g_free(devfs_path);
if (fd < 0) {
- fprintf(stderr, "Failed to open the vcpu devfs\n");
+ error_report("Failed to open the vcpu devfs");
}
fcntl(fd, F_SETFD, FD_CLOEXEC);
return fd;
@@ -229,12 +229,12 @@ int hax_host_setup_vcpu_channel(struct hax_vcpu_state *vcpu)
ret = ioctl(vcpu->fd, HAX_VCPU_IOCTL_SETUP_TUNNEL, &info);
if (ret) {
- fprintf(stderr, "Failed to setup the hax tunnel\n");
+ error_report("Failed to setup the hax tunnel");
return ret;
}
if (!valid_hax_tunnel_size(info.size)) {
- fprintf(stderr, "Invalid hax tunnel size %x\n", info.size);
+ error_report("Invalid hax tunnel size %x", info.size);
ret = -EINVAL;
return ret;
}
diff --git a/target/i386/hax-mem.c b/target/i386/hax-mem.c
index 27a0d214f2..e1388bb003 100644
--- a/target/i386/hax-mem.c
+++ b/target/i386/hax-mem.c
@@ -247,8 +247,8 @@ static void hax_transaction_commit(MemoryListener *listener)
}
if (hax_set_ram(entry->start_pa, entry->size,
entry->host_va, entry->flags)) {
- fprintf(stderr, "%s: Failed mapping @0x%016" PRIx64 "+0x%"
- PRIx32 " flags %02x\n", __func__, entry->start_pa,
+ error_report("%s: Failed mapping @0x%016" PRIx64 "+0x%"
+ PRIx32 " flags %02x", __func__, entry->start_pa,
entry->size, entry->flags);
}
QTAILQ_REMOVE(&mappings, entry, entry);
diff --git a/target/i386/hax-windows.c b/target/i386/hax-windows.c
index 15a180b646..8d724d21ad 100644
--- a/target/i386/hax-windows.c
+++ b/target/i386/hax-windows.c
@@ -33,7 +33,7 @@ static int hax_open_device(hax_fd *fd)
0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (hDevice == INVALID_HANDLE_VALUE) {
- fprintf(stderr, "Failed to open the HAX device!\n");
+ error_report("Failed to open the HAX device!");
errNum = GetLastError();
if (errNum == ERROR_FILE_NOT_FOUND) {
return -1;
@@ -52,7 +52,7 @@ static int hax_open_device(hax_fd *fd)
ret = hax_open_device(&fd);
if (ret != 0) {
- fprintf(stderr, "Open HAX device failed\n");
+ error_report("Open HAX device failed");
}
return fd;
@@ -66,7 +66,7 @@ int hax_populate_ram(uint64_t va, uint32_t size)
DWORD dSize = 0;
if (!hax_global.vm || !hax_global.vm->fd) {
- fprintf(stderr, "Allocate memory before vm create?\n");
+ error_report("Allocate memory before vm create?");
return -EINVAL;
}
@@ -81,7 +81,7 @@ int hax_populate_ram(uint64_t va, uint32_t size)
(LPOVERLAPPED) NULL);
if (!ret) {
- fprintf(stderr, "Failed to allocate %x memory\n", size);
+ error_report("Failed to allocate %x memory", size);
return ret;
}
@@ -119,7 +119,7 @@ int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap)
DWORD err = 0;
if (hax_invalid_fd(hDevice)) {
- fprintf(stderr, "Invalid fd for hax device!\n");
+ error_report("Invalid fd for hax device!");
return -ENODEV;
}
@@ -129,9 +129,9 @@ int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap)
if (!ret) {
err = GetLastError();
if (err == ERROR_INSUFFICIENT_BUFFER || err == ERROR_MORE_DATA) {
- fprintf(stderr, "hax capability is too long to hold.\n");
+ error_report("hax capability is too long to hold.");
}
- fprintf(stderr, "Failed to get Hax capability:%luu\n", err);
+ error_report("Failed to get Hax capability:%luu", err);
return -EFAULT;
} else {
return 0;
@@ -146,7 +146,7 @@ int hax_mod_version(struct hax_state *hax, struct hax_module_version *version)
DWORD err = 0;
if (hax_invalid_fd(hDevice)) {
- fprintf(stderr, "Invalid fd for hax device!\n");
+ error_report("Invalid fd for hax device!");
return -ENODEV;
}
@@ -159,9 +159,9 @@ int hax_mod_version(struct hax_state *hax, struct hax_module_version *version)
if (!ret) {
err = GetLastError();
if (err == ERROR_INSUFFICIENT_BUFFER || err == ERROR_MORE_DATA) {
- fprintf(stderr, "hax module verion is too long to hold.\n");
+ error_report("hax module verion is too long to hold.");
}
- fprintf(stderr, "Failed to get Hax module version:%lu\n", err);
+ error_report("Failed to get Hax module version:%lu", err);
return -EFAULT;
} else {
return 0;
@@ -173,7 +173,7 @@ static char *hax_vm_devfs_string(int vm_id)
char *name;
if (vm_id > MAX_VM_ID) {
- fprintf(stderr, "Too big VM id\n");
+ error_report("Too big VM id");
return NULL;
}
@@ -192,7 +192,7 @@ static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id)
char *name;
if (vm_id > MAX_VM_ID || vcpu_id > MAX_VCPU_ID) {
- fprintf(stderr, "Too big vm id %x or vcpu id %x\n", vm_id, vcpu_id);
+ error_report("Too big vm id %x or vcpu id %x", vm_id, vcpu_id);
return NULL;
}
@@ -226,7 +226,7 @@ int hax_host_create_vm(struct hax_state *hax, int *vmid)
NULL, 0, &vm_id, sizeof(vm_id), &dSize,
(LPOVERLAPPED) NULL);
if (!ret) {
- fprintf(stderr, "Failed to create VM. Error code: %lu\n",
+ error_report("Failed to create VM. Error code: %lu",
GetLastError());
return -1;
}
@@ -241,7 +241,7 @@ hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id)
vm_name = hax_vm_devfs_string(vm_id);
if (!vm_name) {
- fprintf(stderr, "Failed to open VM. VM name is null\n");
+ error_report("Failed to open VM. VM name is null");
return INVALID_HANDLE_VALUE;
}
@@ -249,7 +249,7 @@ hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id)
GENERIC_READ | GENERIC_WRITE,
0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (hDeviceVM == INVALID_HANDLE_VALUE) {
- fprintf(stderr, "Open the vm device error:%s, ec:%lu\n",
+ error_report("Open the vm device error:%s, ec:%lu",
vm_name, GetLastError());
}
@@ -269,7 +269,7 @@ int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion)
qversion, sizeof(struct hax_qemu_version),
NULL, 0, &dSize, (LPOVERLAPPED) NULL);
if (!ret) {
- fprintf(stderr, "Failed to notify qemu API version\n");
+ error_report("Failed to notify qemu API version");
return -1;
}
return 0;
@@ -285,7 +285,7 @@ int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid)
&vcpuid, sizeof(vcpuid), NULL, 0, &dSize,
(LPOVERLAPPED) NULL);
if (!ret) {
- fprintf(stderr, "Failed to create vcpu %x\n", vcpuid);
+ error_report("Failed to create vcpu %x", vcpuid);
return -1;
}
@@ -299,7 +299,7 @@ hax_fd hax_host_open_vcpu(int vmid, int vcpuid)
devfs_path = hax_vcpu_devfs_string(vmid, vcpuid);
if (!devfs_path) {
- fprintf(stderr, "Failed to get the devfs\n");
+ error_report("Failed to get the devfs");
return INVALID_HANDLE_VALUE;
}
@@ -309,7 +309,7 @@ hax_fd hax_host_open_vcpu(int vmid, int vcpuid)
NULL);
if (hDeviceVCPU == INVALID_HANDLE_VALUE) {
- fprintf(stderr, "Failed to open the vcpu devfs\n");
+ error_report("Failed to open the vcpu devfs");
}
g_free(devfs_path);
return hDeviceVCPU;
@@ -327,12 +327,12 @@ int hax_host_setup_vcpu_channel(struct hax_vcpu_state *vcpu)
NULL, 0, &info, sizeof(info), &dSize,
(LPOVERLAPPED) NULL);
if (!ret) {
- fprintf(stderr, "Failed to setup the hax tunnel\n");
+ error_report("Failed to setup the hax tunnel");
return -1;
}
if (!valid_hax_tunnel_size(info.size)) {
- fprintf(stderr, "Invalid hax tunnel size %x\n", info.size);
+ error_report("Invalid hax tunnel size %x", info.size);
ret = -EINVAL;
return ret;
}
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index b1e32e95d3..d7cf10ae11 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -219,7 +219,7 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max)
g_free(cpuid);
return NULL;
} else {
- fprintf(stderr, "KVM_GET_SUPPORTED_CPUID failed: %s\n",
+ error_report("KVM_GET_SUPPORTED_CPUID failed: %s",
strerror(-r));
exit(1);
}
@@ -470,7 +470,7 @@ static void kvm_mce_inject(X86CPU *cpu, hwaddr paddr, int code)
static void hardware_memory_error(void)
{
- fprintf(stderr, "Hardware memory error!\n");
+ error_report("Hardware memory error!");
exit(1);
}
@@ -497,8 +497,8 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code, void *addr)
return;
}
- fprintf(stderr, "Hardware memory error for memory used by "
- "QEMU itself instead of guest system!\n");
+ error_report("Hardware memory error for memory used by "
+ "QEMU itself instead of guest system!");
}
if (code == BUS_MCEERR_AR) {
@@ -666,7 +666,7 @@ static int hyperv_handle_properties(CPUState *cs)
if (!has_msr_hv_synic ||
kvm_vcpu_enable_cap(cs, KVM_CAP_HYPERV_SYNIC, 0)) {
- fprintf(stderr, "Hyper-V SynIC is not supported by kernel\n");
+ error_report("Hyper-V SynIC is not supported by kernel");
return -ENOSYS;
}
@@ -678,7 +678,7 @@ static int hyperv_handle_properties(CPUState *cs)
}
if (cpu->hyperv_stimer) {
if (!has_msr_hv_stimer) {
- fprintf(stderr, "Hyper-V timers aren't supported by kernel\n");
+ error_report("Hyper-V timers aren't supported by kernel");
return -ENOSYS;
}
env->features[FEAT_HYPERV_EAX] |= HV_SYNTIMERS_AVAILABLE;
@@ -811,7 +811,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
for (i = 0; i <= limit; i++) {
if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
- fprintf(stderr, "unsupported level value: 0x%x\n", limit);
+ error_report("unsupported level value: 0x%x", limit);
abort();
}
c = &cpuid_data.entries[cpuid_i++];
@@ -829,8 +829,8 @@ int kvm_arch_init_vcpu(CPUState *cs)
for (j = 1; j < times; ++j) {
if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
- fprintf(stderr, "cpuid_data is full, no space for "
- "cpuid(eax:2):eax & 0xf = 0x%x\n", times);
+ error_report("cpuid_data is full, no space for "
+ "cpuid(eax:2):eax & 0xf = 0x%x", times);
abort();
}
c = &cpuid_data.entries[cpuid_i++];
@@ -862,8 +862,8 @@ int kvm_arch_init_vcpu(CPUState *cs)
continue;
}
if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
- fprintf(stderr, "cpuid_data is full, no space for "
- "cpuid(eax:0x%x,ecx:0x%x)\n", i, j);
+ error_report("cpuid_data is full, no space for "
+ "cpuid(eax:0x%x,ecx:0x%x)", i, j);
abort();
}
c = &cpuid_data.entries[cpuid_i++];
@@ -899,7 +899,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
for (i = 0x80000000; i <= limit; i++) {
if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
- fprintf(stderr, "unsupported xlevel value: 0x%x\n", limit);
+ error_report("unsupported xlevel value: 0x%x", limit);
abort();
}
c = &cpuid_data.entries[cpuid_i++];
@@ -915,7 +915,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
for (i = 0xC0000000; i <= limit; i++) {
if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
- fprintf(stderr, "unsupported xlevel2 value: 0x%x\n", limit);
+ error_report("unsupported xlevel2 value: 0x%x", limit);
abort();
}
c = &cpuid_data.entries[cpuid_i++];
@@ -1245,7 +1245,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
/* Tell fw_cfg to notify the BIOS to reserve the range. */
ret = e820_add_entry(identity_base, 0x4000, E820_RESERVED);
if (ret < 0) {
- fprintf(stderr, "e820_add_entry() table is full\n");
+ error_report("e820_add_entry() table is full");
return ret;
}
qemu_register_reset(kvm_unpoison_all, NULL);
@@ -2733,7 +2733,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run)
DPRINTF("injected NMI\n");
ret = kvm_vcpu_ioctl(cpu, KVM_NMI);
if (ret < 0) {
- fprintf(stderr, "KVM: injection failed, NMI lost (%s)\n",
+ error_report("KVM: injection failed, NMI lost (%s)",
strerror(-ret));
}
}
@@ -2744,7 +2744,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run)
DPRINTF("injected SMI\n");
ret = kvm_vcpu_ioctl(cpu, KVM_SMI);
if (ret < 0) {
- fprintf(stderr, "KVM: injection failed, SMI lost (%s)\n",
+ error_report("KVM: injection failed, SMI lost (%s)",
strerror(-ret));
}
}
@@ -3141,7 +3141,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
break;
case KVM_EXIT_FAIL_ENTRY:
code = run->fail_entry.hardware_entry_failure_reason;
- fprintf(stderr, "KVM: entry failed, hardware error 0x%" PRIx64 "\n",
+ error_report("KVM: entry failed, hardware error 0x%" PRIx64 "",
code);
if (host_supports_vmx() && code == VMX_INVALID_GUEST_STATE) {
fprintf(stderr,
@@ -3157,7 +3157,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
ret = -1;
break;
case KVM_EXIT_EXCEPTION:
- fprintf(stderr, "KVM: exception %d exit (error code 0x%x)\n",
+ error_report("KVM: exception %d exit (error code 0x%x)",
run->ex.exception, run->ex.error_code);
ret = -1;
break;
@@ -3175,7 +3175,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
ret = 0;
break;
default:
- fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason);
+ error_report("KVM: unknown exit reason %d", run->exit_reason);
ret = -1;
break;
}
diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c
index 628f64aad5..115e80217e 100644
--- a/target/i386/misc_helper.c
+++ b/target/i386/misc_helper.c
@@ -28,7 +28,7 @@
void helper_outb(CPUX86State *env, uint32_t port, uint32_t data)
{
#ifdef CONFIG_USER_ONLY
- fprintf(stderr, "outb: port=0x%04x, data=%02x\n", port, data);
+ error_report("outb: port=0x%04x, data=%02x", port, data);
#else
address_space_stb(&address_space_io, port, data,
cpu_get_mem_attrs(env), NULL);
@@ -38,7 +38,7 @@ void helper_outb(CPUX86State *env, uint32_t port, uint32_t data)
target_ulong helper_inb(CPUX86State *env, uint32_t port)
{
#ifdef CONFIG_USER_ONLY
- fprintf(stderr, "inb: port=0x%04x\n", port);
+ error_report("inb: port=0x%04x", port);
return 0;
#else
return address_space_ldub(&address_space_io, port,
@@ -49,7 +49,7 @@ target_ulong helper_inb(CPUX86State *env, uint32_t port)
void helper_outw(CPUX86State *env, uint32_t port, uint32_t data)
{
#ifdef CONFIG_USER_ONLY
- fprintf(stderr, "outw: port=0x%04x, data=%04x\n", port, data);
+ error_report("outw: port=0x%04x, data=%04x", port, data);
#else
address_space_stw(&address_space_io, port, data,
cpu_get_mem_attrs(env), NULL);
@@ -59,7 +59,7 @@ void helper_outw(CPUX86State *env, uint32_t port, uint32_t data)
target_ulong helper_inw(CPUX86State *env, uint32_t port)
{
#ifdef CONFIG_USER_ONLY
- fprintf(stderr, "inw: port=0x%04x\n", port);
+ error_report("inw: port=0x%04x", port);
return 0;
#else
return address_space_lduw(&address_space_io, port,
@@ -70,7 +70,7 @@ target_ulong helper_inw(CPUX86State *env, uint32_t port)
void helper_outl(CPUX86State *env, uint32_t port, uint32_t data)
{
#ifdef CONFIG_USER_ONLY
- fprintf(stderr, "outw: port=0x%04x, data=%08x\n", port, data);
+ error_report("outw: port=0x%04x, data=%08x", port, data);
#else
address_space_stl(&address_space_io, port, data,
cpu_get_mem_attrs(env), NULL);
@@ -80,7 +80,7 @@ void helper_outl(CPUX86State *env, uint32_t port, uint32_t data)
target_ulong helper_inl(CPUX86State *env, uint32_t port)
{
#ifdef CONFIG_USER_ONLY
- fprintf(stderr, "inl: port=0x%04x\n", port);
+ error_report("inl: port=0x%04x", port);
return 0;
#else
return address_space_ldl(&address_space_io, port,
diff --git a/target/lm32/op_helper.c b/target/lm32/op_helper.c
index 2177c8ad12..34bfc3fb3b 100644
--- a/target/lm32/op_helper.c
+++ b/target/lm32/op_helper.c
@@ -40,9 +40,9 @@ void HELPER(ill)(CPULM32State *env)
{
#ifndef CONFIG_USER_ONLY
CPUState *cs = CPU(lm32_env_get_cpu(env));
- fprintf(stderr, "VM paused due to illegal instruction. "
+ error_report("VM paused due to illegal instruction. "
"Connect a debugger or switch to the monitor console "
- "to find out more.\n");
+ "to find out more.");
vm_stop(RUN_STATE_PAUSED);
cs->halted = 1;
raise_exception(env, EXCP_HALTED);
diff --git a/target/mips/mips-semi.c b/target/mips/mips-semi.c
index a7aefbaefc..c1f35f8f5a 100644
--- a/target/mips/mips-semi.c
+++ b/target/mips/mips-semi.c
@@ -18,6 +18,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "cpu.h"
#include "qemu/log.h"
#include "exec/helper-proto.h"
@@ -366,7 +367,7 @@ void helper_do_semihosting(CPUMIPSState *env)
break;
#endif
default:
- fprintf(stderr, "Unknown UHI operation %d\n", op);
+ error_report("Unknown UHI operation %d", op);
abort();
}
uhi_done:
diff --git a/target/mips/translate.c b/target/mips/translate.c
index d16d879df7..32a5920259 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -10886,7 +10886,7 @@ static void gen_branch(DisasContext *ctx, int insn_bytes)
tcg_gen_lookup_and_goto_ptr(cpu_PC);
break;
default:
- fprintf(stderr, "unknown branch 0x%x\n", proc_hflags);
+ error_report("unknown branch 0x%x", proc_hflags);
abort();
}
}
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index e6009e70e5..a142e81a0f 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -200,8 +200,8 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp)
/* Machine check exception is not enabled.
* Enter checkstop state.
*/
- fprintf(stderr, "Machine check while not allowed. "
- "Entering checkstop state\n");
+ error_report("Machine check while not allowed. "
+ "Entering checkstop state");
if (qemu_log_separate()) {
qemu_log("Machine check while not allowed. "
"Entering checkstop state\n");
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 171d3d8040..33c49fe54c 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -159,8 +159,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
cap_ppc_pvr_compat = false;
if (!cap_interrupt_level) {
- fprintf(stderr, "KVM: Couldn't find level irq capability. Expect the "
- "VM to stall at times!\n");
+ error_report("KVM: Couldn't find level irq capability. Expect the "
+ "VM to stall at times!");
}
kvm_ppc_register_host_cpu_type();
@@ -188,7 +188,7 @@ static int kvm_arch_sync_sregs(PowerPCCPU *cpu)
return 0;
} else {
if (!cap_segstate) {
- fprintf(stderr, "kvm error: missing PVR setting capability\n");
+ error_report("kvm error: missing PVR setting capability");
return -ENOSYS;
}
}
@@ -237,7 +237,7 @@ static int kvm_booke206_tlb_init(PowerPCCPU *cpu)
ret = kvm_vcpu_enable_cap(cs, KVM_CAP_SW_TLB, 0, (uintptr_t)&cfg);
if (ret < 0) {
- fprintf(stderr, "%s: couldn't enable KVM_CAP_SW_TLB: %s\n",
+ error_report("%s: couldn't enable KVM_CAP_SW_TLB: %s",
__func__, strerror(-ret));
return ret;
}
@@ -552,7 +552,7 @@ static void kvmppc_hw_debug_points_init(CPUPPCState *cenv)
}
if ((max_hw_breakpoint + max_hw_watchpoint) > MAX_HW_BKPTS) {
- fprintf(stderr, "Error initializing h/w breakpoints\n");
+ error_report("Error initializing h/w breakpoints");
return;
}
}
@@ -623,7 +623,7 @@ static void kvm_sw_tlb_put(PowerPCCPU *cpu)
ret = kvm_vcpu_ioctl(cs, KVM_DIRTY_TLB, &dirty_tlb);
if (ret) {
- fprintf(stderr, "%s: KVM_DIRTY_TLB: %s\n",
+ error_report("%s: KVM_DIRTY_TLB: %s",
__func__, strerror(-ret));
}
@@ -1480,7 +1480,7 @@ static int kvmppc_handle_halt(PowerPCCPU *cpu)
static int kvmppc_handle_dcr_read(CPUPPCState *env, uint32_t dcrn, uint32_t *data)
{
if (ppc_dcr_read(env->dcr_env, dcrn, data) < 0)
- fprintf(stderr, "Read to unhandled DCR (0x%x)\n", dcrn);
+ error_report("Read to unhandled DCR (0x%x)", dcrn);
return 0;
}
@@ -1488,7 +1488,7 @@ static int kvmppc_handle_dcr_read(CPUPPCState *env, uint32_t dcrn, uint32_t *dat
static int kvmppc_handle_dcr_write(CPUPPCState *env, uint32_t dcrn, uint32_t data)
{
if (ppc_dcr_write(env->dcr_env, dcrn, data) < 0)
- fprintf(stderr, "Write to unhandled DCR (0x%x)\n", dcrn);
+ error_report("Write to unhandled DCR (0x%x)", dcrn);
return 0;
}
@@ -1799,7 +1799,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
break;
default:
- fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason);
+ error_report("KVM: unknown exit reason %d", run->exit_reason);
ret = -1;
break;
}
@@ -1863,7 +1863,7 @@ int kvmppc_booke_watchdog_enable(PowerPCCPU *cpu)
ret = kvm_vcpu_enable_cap(cs, KVM_CAP_PPC_BOOKE_WATCHDOG, 0);
if (ret < 0) {
- fprintf(stderr, "%s: couldn't enable KVM_CAP_PPC_BOOKE_WATCHDOG: %s\n",
+ error_report("%s: couldn't enable KVM_CAP_PPC_BOOKE_WATCHDOG: %s",
__func__, strerror(-ret));
return ret;
}
@@ -2198,7 +2198,7 @@ off_t kvmppc_alloc_rma(void **rma)
fd = kvm_vm_ioctl(kvm_state, KVM_ALLOCATE_RMA, &ret);
if (fd < 0) {
- fprintf(stderr, "KVM: Error on KVM_ALLOCATE_RMA: %s\n",
+ error_report("KVM: Error on KVM_ALLOCATE_RMA: %s",
strerror(errno));
return -1;
}
@@ -2207,7 +2207,7 @@ off_t kvmppc_alloc_rma(void **rma)
*rma = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
if (*rma == MAP_FAILED) {
- fprintf(stderr, "KVM: Error mapping RMA: %s\n", strerror(errno));
+ error_report("KVM: Error mapping RMA: %s", strerror(errno));
return -1;
};
@@ -2309,7 +2309,7 @@ void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t page_shift,
}
fd = kvm_vm_ioctl(kvm_state, KVM_CREATE_SPAPR_TCE, &args);
if (fd < 0) {
- fprintf(stderr, "KVM: Failed to create TCE table for liobn 0x%x\n",
+ error_report("KVM: Failed to create TCE table for liobn 0x%x",
liobn);
return NULL;
}
@@ -2322,7 +2322,7 @@ void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t page_shift,
table = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
if (table == MAP_FAILED) {
- fprintf(stderr, "KVM: Failed to map TCE table for liobn 0x%x\n",
+ error_report("KVM: Failed to map TCE table for liobn 0x%x",
liobn);
close(fd);
return NULL;
@@ -2590,7 +2590,7 @@ int kvmppc_save_htab(QEMUFile *f, int fd, size_t bufsize, int64_t max_ns)
do {
rc = read(fd, buf, bufsize);
if (rc < 0) {
- fprintf(stderr, "Error reading data from KVM HTAB fd: %s\n",
+ error_report("Error reading data from KVM HTAB fd: %s",
strerror(errno));
return rc;
} else if (rc) {
@@ -2635,13 +2635,13 @@ int kvmppc_load_htab_chunk(QEMUFile *f, int fd, uint32_t index,
rc = write(fd, buf, chunksize);
if (rc < 0) {
- fprintf(stderr, "Error writing KVM hash table: %s\n",
+ error_report("Error writing KVM hash table: %s",
strerror(errno));
return rc;
}
if (rc != chunksize) {
/* We should never get a short write on a single chunk */
- fprintf(stderr, "Short write, restoring KVM hash table\n");
+ error_report("Short write, restoring KVM hash table");
return -1;
}
return 0;
diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
index 14d34e512f..8713ed6682 100644
--- a/target/ppc/mmu-hash64.c
+++ b/target/ppc/mmu-hash64.c
@@ -377,7 +377,7 @@ static int ppc_hash64_amr_prot(PowerPCCPU *cpu, ppc_hash_pte64_t pte)
key = HPTE64_R_KEY(pte.pte1);
amrbits = (env->spr[SPR_AMR] >> 2*(31 - key)) & 0x3;
- /* fprintf(stderr, "AMR protection: key=%d AMR=0x%" PRIx64 "\n", key, */
+ /* error_report("AMR protection: key=%d AMR=0x%" PRIx64 "", key, */
/* env->spr[SPR_AMR]); */
/*
diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c
index 2a1f9902c9..cbf5187ff8 100644
--- a/target/ppc/mmu_helper.c
+++ b/target/ppc/mmu_helper.c
@@ -2600,7 +2600,7 @@ void helper_booke206_tlbwe(CPUPPCState *env)
if (((env->spr[SPR_BOOKE_MAS0] & MAS0_ATSEL) == MAS0_ATSEL_LRAT) &&
!msr_gs) {
/* XXX we don't support direct LRAT setting yet */
- fprintf(stderr, "cpu: don't support LRAT setting yet\n");
+ error_report("cpu: don't support LRAT setting yet");
return;
}
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index c6399a3a0d..e3e839a75e 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -1778,7 +1778,7 @@ static void gen_spr_BookE(CPUPPCState *env, uint64_t ivor_mask)
for (i = 0; i < 64; i++) {
if (ivor_mask & (1ULL << i)) {
if (ivor_sprn[i] == SPR_BOOKE_IVORxx) {
- fprintf(stderr, "ERROR: IVOR %d SPR is not defined\n", i);
+ error_report("ERROR: IVOR %d SPR is not defined", i);
exit(1);
}
spr_register(env, ivor_sprn[i], ivor_names[i],
@@ -9254,13 +9254,13 @@ static void init_ppc_proc(PowerPCCPU *cpu)
case POWERPC_FLAG_VRE:
break;
default:
- fprintf(stderr, "PowerPC MSR definition inconsistency\n"
- "Should define POWERPC_FLAG_SPE or POWERPC_FLAG_VRE\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should define POWERPC_FLAG_SPE or POWERPC_FLAG_VRE");
exit(1);
}
} else if (env->flags & (POWERPC_FLAG_SPE | POWERPC_FLAG_VRE)) {
- fprintf(stderr, "PowerPC MSR definition inconsistency\n"
- "Should not define POWERPC_FLAG_SPE nor POWERPC_FLAG_VRE\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should not define POWERPC_FLAG_SPE nor POWERPC_FLAG_VRE");
exit(1);
}
if (env->msr_mask & (1 << 17)) {
@@ -9269,13 +9269,13 @@ static void init_ppc_proc(PowerPCCPU *cpu)
case POWERPC_FLAG_CE:
break;
default:
- fprintf(stderr, "PowerPC MSR definition inconsistency\n"
- "Should define POWERPC_FLAG_TGPR or POWERPC_FLAG_CE\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should define POWERPC_FLAG_TGPR or POWERPC_FLAG_CE");
exit(1);
}
} else if (env->flags & (POWERPC_FLAG_TGPR | POWERPC_FLAG_CE)) {
- fprintf(stderr, "PowerPC MSR definition inconsistency\n"
- "Should not define POWERPC_FLAG_TGPR nor POWERPC_FLAG_CE\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should not define POWERPC_FLAG_TGPR nor POWERPC_FLAG_CE");
exit(1);
}
if (env->msr_mask & (1 << 10)) {
@@ -9286,16 +9286,16 @@ static void init_ppc_proc(PowerPCCPU *cpu)
case POWERPC_FLAG_UBLE:
break;
default:
- fprintf(stderr, "PowerPC MSR definition inconsistency\n"
- "Should define POWERPC_FLAG_SE or POWERPC_FLAG_DWE or "
- "POWERPC_FLAG_UBLE\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should define POWERPC_FLAG_SE or POWERPC_FLAG_DWE or "
+ "POWERPC_FLAG_UBLE");
exit(1);
}
} else if (env->flags & (POWERPC_FLAG_SE | POWERPC_FLAG_DWE |
POWERPC_FLAG_UBLE)) {
- fprintf(stderr, "PowerPC MSR definition inconsistency\n"
- "Should not define POWERPC_FLAG_SE nor POWERPC_FLAG_DWE nor "
- "POWERPC_FLAG_UBLE\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should not define POWERPC_FLAG_SE nor POWERPC_FLAG_DWE"
+ " nor POWERPC_FLAG_UBLE");
exit(1);
}
if (env->msr_mask & (1 << 9)) {
@@ -9304,13 +9304,13 @@ static void init_ppc_proc(PowerPCCPU *cpu)
case POWERPC_FLAG_DE:
break;
default:
- fprintf(stderr, "PowerPC MSR definition inconsistency\n"
- "Should define POWERPC_FLAG_BE or POWERPC_FLAG_DE\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should define POWERPC_FLAG_BE or POWERPC_FLAG_DE");
exit(1);
}
} else if (env->flags & (POWERPC_FLAG_BE | POWERPC_FLAG_DE)) {
- fprintf(stderr, "PowerPC MSR definition inconsistency\n"
- "Should not define POWERPC_FLAG_BE nor POWERPC_FLAG_DE\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should not define POWERPC_FLAG_BE nor POWERPC_FLAG_DE");
exit(1);
}
if (env->msr_mask & (1 << 2)) {
@@ -9319,18 +9319,19 @@ static void init_ppc_proc(PowerPCCPU *cpu)
case POWERPC_FLAG_PMM:
break;
default:
- fprintf(stderr, "PowerPC MSR definition inconsistency\n"
- "Should define POWERPC_FLAG_PX or POWERPC_FLAG_PMM\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should define POWERPC_FLAG_PX or POWERPC_FLAG_PMM");
exit(1);
}
} else if (env->flags & (POWERPC_FLAG_PX | POWERPC_FLAG_PMM)) {
- fprintf(stderr, "PowerPC MSR definition inconsistency\n"
- "Should not define POWERPC_FLAG_PX nor POWERPC_FLAG_PMM\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should not define POWERPC_FLAG_PX nor POWERPC_FLAG_PMM");
exit(1);
}
if ((env->flags & (POWERPC_FLAG_RTC_CLK | POWERPC_FLAG_BUS_CLK)) == 0) {
- fprintf(stderr, "PowerPC flags inconsistency\n"
- "Should define the time-base and decrementer clock source\n");
+ error_report("PowerPC MSR definition inconsistency "
+ "Should define the time-base and decrementer clock"
+ " source");
exit(1);
}
/* Allocate TLBs buffer when needed */
@@ -10534,7 +10535,7 @@ static void ppc_cpu_reset(CPUState *s)
#if !defined(TARGET_WORDS_BIGENDIAN)
msr |= (target_ulong)1 << MSR_LE; /* Little-endian user mode */
if (!((env->msr_mask >> MSR_LE) & 1)) {
- fprintf(stderr, "Selected CPU does not support little-endian.\n");
+ error_report("Selected CPU does not support little-endian.");
exit(1);
}
#endif
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index ebb75cafaa..6f7ebd1c98 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -967,13 +967,13 @@ static void inject_vcpu_irq_legacy(CPUState *cs, struct kvm_s390_irq *irq)
r = s390_kvm_irq_to_interrupt(irq, &kvmint);
if (r < 0) {
- fprintf(stderr, "%s called with bogus interrupt\n", __func__);
+ error_report("%s called with bogus interrupt", __func__);
exit(1);
}
r = kvm_vcpu_ioctl(cs, KVM_S390_INTERRUPT, &kvmint);
if (r < 0) {
- fprintf(stderr, "KVM failed to inject interrupt\n");
+ error_report("KVM failed to inject interrupt");
exit(1);
}
}
@@ -1002,13 +1002,13 @@ static void __kvm_s390_floating_interrupt(struct kvm_s390_irq *irq)
r = s390_kvm_irq_to_interrupt(irq, &kvmint);
if (r < 0) {
- fprintf(stderr, "%s called with bogus interrupt\n", __func__);
+ error_report("%s called with bogus interrupt", __func__);
exit(1);
}
r = kvm_vm_ioctl(kvm_state, KVM_S390_INTERRUPT, &kvmint);
if (r < 0) {
- fprintf(stderr, "KVM failed to inject interrupt\n");
+ error_report("KVM failed to inject interrupt");
exit(1);
}
}
@@ -1116,14 +1116,14 @@ static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
break;
case PRIV_B2_TSCH:
/* We should only get tsch via KVM_EXIT_S390_TSCH. */
- fprintf(stderr, "Spurious tsch intercept\n");
+ error_report("Spurious tsch intercept");
break;
case PRIV_B2_CHSC:
ioinst_handle_chsc(cpu, run->s390_sieic.ipb);
break;
case PRIV_B2_TPI:
/* This should have been handled by kvm already. */
- fprintf(stderr, "Spurious tpi intercept\n");
+ error_report("Spurious tpi intercept");
break;
case PRIV_B2_SCHM:
ioinst_handle_schm(cpu, env->regs[1], env->regs[2],
@@ -2050,15 +2050,15 @@ static int handle_intercept(S390CPU *cpu)
}
break;
case ICPT_SOFT_INTERCEPT:
- fprintf(stderr, "KVM unimplemented icpt SOFT\n");
+ error_report("KVM unimplemented icpt SOFT");
exit(1);
break;
case ICPT_IO:
- fprintf(stderr, "KVM unimplemented icpt IO\n");
+ error_report("KVM unimplemented icpt IO");
exit(1);
break;
default:
- fprintf(stderr, "Unknown intercept code: %d\n", icpt_code);
+ error_report("Unknown intercept code: %d", icpt_code);
exit(1);
break;
}
@@ -2215,7 +2215,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
ret = kvm_arch_handle_debug_exit(cpu);
break;
default:
- fprintf(stderr, "Unknown KVM exit: %d\n", run->exit_reason);
+ error_report("Unknown KVM exit: %d", run->exit_reason);
break;
}
qemu_mutex_unlock_iothread();
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index 293fc8428a..395872af45 100644
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -354,7 +354,7 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1,
#endif
default:
/* unknown sigp */
- fprintf(stderr, "XXX unknown sigp: 0x%" PRIx64 "\n", order_code);
+ error_report("XXX unknown sigp: 0x%" PRIx64 "", order_code);
cc = SIGP_CC_NOT_OPERATIONAL;
}
diff --git a/target/unicore32/translate.c b/target/unicore32/translate.c
index 1bd7827ee8..5b8a3b0094 100644
--- a/target/unicore32/translate.c
+++ b/target/unicore32/translate.c
@@ -515,7 +515,7 @@ static void gen_test_cc(int cc, TCGLabel *label)
tcg_gen_brcondi_i32(TCG_COND_LT, tmp, 0, label);
break;
default:
- fprintf(stderr, "Bad condition code 0x%x\n", cc);
+ error_report("Bad condition code 0x%x", cc);
abort();
}
dead_tmp(tmp);
--
2.11.0
^ permalink raw reply related [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 24/47] hw/mips: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 24/47] hw/mips: " Alistair Francis
@ 2017-09-30 2:36 ` Philippe Mathieu-Daudé
2017-10-16 11:46 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-09-30 2:36 UTC (permalink / raw)
To: Alistair Francis, qemu-devel
Cc: Paul Burton, armbru, Hervé Poussineau, Yongbok Kim,
alistair23, Aurelien Jarno
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Cc: Paul Burton <paul.burton@imgtec.com>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Cc: Yongbok Kim <yongbok.kim@imgtec.com>
> Cc: "Hervé Poussineau" <hpoussin@reactos.org>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/mips/boston.c | 4 ++--
> hw/mips/mips_fulong2e.c | 4 ++--
> hw/mips/mips_jazz.c | 4 ++--
> hw/mips/mips_malta.c | 4 ++--
> hw/mips/mips_mipssim.c | 4 ++--
> hw/mips/mips_r4k.c | 6 +++---
> 6 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/hw/mips/boston.c b/hw/mips/boston.c
> index 776ee283e1..ee82968ea7 100644
> --- a/hw/mips/boston.c
> +++ b/hw/mips/boston.c
> @@ -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;
> }
>
> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
> index 75318680e1..34710a466c 100644
> --- a/hw/mips/mips_fulong2e.c
> +++ b/hw/mips/mips_fulong2e.c
> @@ -143,7 +143,7 @@ static int64_t load_kernel (CPUMIPSState *env)
> initrd_offset, ram_size - initrd_offset);
> }
> if (initrd_size == (target_ulong) -1) {
> - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
> + error_report("qemu: could not load initial ram disk '%s'",
> loaderparams.initrd_filename);
> exit(1);
> }
> @@ -342,7 +342,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);
> }
>
> diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
> index 7e6626dc88..6c91a940be 100644
> --- a/hw/mips/mips_jazz.c
> +++ b/hw/mips/mips_jazz.c
> @@ -271,10 +271,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("qemu: Supported NICs: dp83932");
> exit(1);
> } else {
> - fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd->model);
> + error_report("qemu: Unsupported NIC: %s", nd->model);
> exit(1);
> }
> }
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index 2adb9bcf89..d457adfa69 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -856,8 +856,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("qemu: could not load initial ram disk '%s'",
> + loaderparams.initrd_filename);
> exit(1);
> }
> }
> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
> index a092072e2a..a3d9406610 100644
> --- a/hw/mips/mips_mipssim.c
> +++ b/hw/mips/mips_mipssim.c
> @@ -101,8 +101,8 @@ static int64_t load_kernel(void)
> 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("qemu: could not load initial ram disk '%s'",
> + loaderparams.initrd_filename);
> exit(1);
> }
> }
> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
> index 1272d4ef9d..e54ce918a7 100644
> --- a/hw/mips/mips_r4k.c
> +++ b/hw/mips/mips_r4k.c
> @@ -121,8 +121,8 @@ static int64_t load_kernel(void)
> ram_size - initrd_offset);
> }
> if (initrd_size == (target_ulong) -1) {
> - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
> - loaderparams.initrd_filename);
> + error_report("qemu: could not load initial ram disk '%s'",
> + loaderparams.initrd_filename);
> exit(1);
> }
> }
> @@ -246,7 +246,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("qemu: Error registering flash memory.");
> }
> } else if (!qtest_enabled()) {
> /* not fatal */
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 28/47] hw/nios2: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 28/47] hw/nios2: " Alistair Francis
@ 2017-09-30 2:39 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-09-30 2:39 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: Marek Vasut, alistair23, Chris Wulff, armbru
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Cc: Chris Wulff <crwulff@gmail.com>
> Cc: Marek Vasut <marex@denx.de>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/nios2/boot.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
> index 2b31f5b844..c896e8007b 100644
> --- a/hw/nios2/boot.c
> +++ b/hw/nios2/boot.c
> @@ -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");
> }
> }
>
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 37/47] hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 37/47] hw/sparc*: " Alistair Francis
@ 2017-09-30 2:40 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-09-30 2:40 UTC (permalink / raw)
To: Alistair Francis, qemu-devel
Cc: Mark Cave-Ayland, armbru, Fabien Chouteau, alistair23, Artyom Tarasenko
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Cc: Fabien Chouteau <chouteau@adacore.com>
> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Cc: Artyom Tarasenko <atar4qemu@gmail.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/sparc/leon3.c | 9 +++++----
> hw/sparc/sun4m.c | 8 ++++----
> hw/sparc64/niagara.c | 2 +-
> hw/sparc64/sun4u.c | 9 +++++----
> 4 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
> index ec2816bf94..d434edec92 100644
> --- a/hw/sparc/leon3.c
> +++ b/hw/sparc/leon3.c
> @@ -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"
> @@ -172,7 +173,7 @@ 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",
> + error_report("qemu: could not load prom '%s': file too big",
> filename);
> exit(1);
> }
> @@ -180,11 +181,11 @@ static void leon3_generic_hw_init(MachineState *machine)
> 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("qemu: 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);
> @@ -197,7 +198,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",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index e1bdd4828d..7a2812aaa4 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -261,7 +261,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",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
> @@ -273,8 +273,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("qemu: could not load initial ram disk '%s'",
> + initrd_filename);
> exit(1);
> }
> }
> @@ -688,7 +688,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("qemu: could not load prom '%s'", bios_name);
> exit(1);
> }
> }
> diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
> index 9a8d6109d4..60799220f3 100644
> --- a/hw/sparc64/niagara.c
> +++ b/hw/sparc64/niagara.c
> @@ -153,7 +153,7 @@ 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",
> + error_report("qemu: could not load ram disk '%s'",
> blk_bs(blk)->filename);
> exit(1);
> }
> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
> index c3280aaf38..070d9b94f9 100644
> --- a/hw/sparc64/sun4u.c
> +++ b/hw/sparc64/sun4u.c
> @@ -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"
> @@ -165,7 +166,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",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
> @@ -178,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("qemu: could not load initial ram disk '%s'",
> + initrd_filename);
> exit(1);
> }
> }
> @@ -322,7 +323,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("qemu: could not load prom '%s'", bios_name);
> exit(1);
> }
> }
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 43/47] util: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 43/47] util: " Alistair Francis
@ 2017-09-30 2:43 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-09-30 2:43 UTC (permalink / raw)
To: Alistair Francis, qemu-devel
Cc: Kevin Wolf, qemu-block, Stefan Weil, armbru, Paolo Bonzini, alistair23
On 09/29/2017 09:17 PM, Alistair Francis wrote:
> 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}' \
> {} +
>
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Stefan Weil <sw@weilnetz.de>
> Cc: qemu-block@nongnu.org
> ---
>
> util/aio-posix.c | 5 +++--
> util/coroutine-sigaltstack.c | 2 +-
> util/error.c | 2 +-
> 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, 31 insertions(+), 22 deletions(-)
>
> diff --git a/util/aio-posix.c b/util/aio-posix.c
> index 2d51239ec6..fe4772b4a9 100644
> --- a/util/aio-posix.c
> +++ b/util/aio-posix.c
> @@ -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"
> @@ -696,8 +697,8 @@ void aio_context_setup(AioContext *ctx)
> {
> /* TODO remove this in final patch submission */
> if (getenv("QEMU_AIO_POLL_MAX_NS")) {
> - fprintf(stderr, "The QEMU_AIO_POLL_MAX_NS environment variable has "
> - "been replaced with -object iothread,poll-max-ns=NUM\n");
> + error_report("The QEMU_AIO_POLL_MAX_NS environment variable has "
> + "been replaced with -object iothread,poll-max-ns=NUM");
> exit(1);
> }
>
> diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
> index f6fc49a0e5..96a01c2c88 100644
> --- a/util/coroutine-sigaltstack.c
> +++ b/util/coroutine-sigaltstack.c
> @@ -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();
> }
> }
> diff --git a/util/error.c b/util/error.c
> index 3efdd69162..e423368ca0 100644
> --- a/util/error.c
> +++ b/util/error.c
> @@ -32,7 +32,7 @@ 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",
> + error_report("Unexpected error in %s() at %s:%d:",
> err->func, err->src, err->line);
> error_report_err(err);
> abort();
> diff --git a/util/main-loop.c b/util/main-loop.c
> index 7558eb5f53..d8369716b2 100644
> --- a/util/main-loop.c
> +++ b/util/main-loop.c
> @@ -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;
> }
>
> diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
> index 3ec029a9ea..11887aac69 100644
> --- a/util/mmap-alloc.c
> +++ b/util/mmap-alloc.c
> @@ -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);
> }
> diff --git a/util/module.c b/util/module.c
> index c90973721f..1153e3ebb0 100644
> --- a/util/module.c
> +++ b/util/module.c
> @@ -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;
> }
>
> diff --git a/util/osdep.c b/util/osdep.c
> index a479fedc4a..62d92c9560 100644
> --- a/util/osdep.c
> +++ b/util/osdep.c
> @@ -425,7 +425,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
> @@ -452,7 +452,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);
> diff --git a/util/oslib-posix.c b/util/oslib-posix.c
> index 80086c549f..d840692dd7 100644
> --- a/util/oslib-posix.c
> +++ b/util/oslib-posix.c
> @@ -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>
> @@ -87,7 +88,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;
> diff --git a/util/oslib-win32.c b/util/oslib-win32.c
> index 69a6286d50..2197a6a4fc 100644
> --- a/util/oslib-win32.c
> +++ b/util/oslib-win32.c
> @@ -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;
> diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c
> index d6095c1d5a..1f7cce6706 100644
> --- a/util/qemu-coroutine.c
> +++ b/util/qemu-coroutine.c
> @@ -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();
> }
>
> diff --git a/util/qemu-progress.c b/util/qemu-progress.c
> index 3c2223c1a2..84598f0fbb 100644
> --- a/util/qemu-progress.c
> +++ b/util/qemu-progress.c
> @@ -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;
> }
> }
> diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c
> index 7306475899..e7d1a68c73 100644
> --- a/util/qemu-thread-posix.c
> +++ b/util/qemu-thread-posix.c
> @@ -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("qemu: 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("qemu: %s: %s", msg, strerror(err));
> abort();
> }
>
> diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c
> index 94f3491a87..46b5dac159 100644
> --- a/util/qemu-thread-win32.c
> +++ b/util/qemu-thread-win32.c
> @@ -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("qemu: 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("qemu: %s: %s", msg, pstr);
> LocalFree(pstr);
> abort();
> }
> diff --git a/util/qemu-timer-common.c b/util/qemu-timer-common.c
> index 06d084d364..ab7b702c4f 100644
> --- a/util/qemu-timer-common.c
> +++ b/util/qemu-timer-common.c
> @@ -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;
> diff --git a/util/qht.c b/util/qht.c
> index ff4d2e6974..bfab5c7e5e 100644
> --- a/util/qht.c
> +++ b/util/qht.c
> @@ -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;
> }
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 23/47] hw/microblaze: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 23/47] hw/microblaze: " Alistair Francis
@ 2017-09-30 2:43 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-09-30 2:43 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, Edgar E. Iglesias, armbru
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/microblaze/boot.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
> index 457a08a2fe..31466050de 100644
> --- a/hw/microblaze/boot.c
> +++ b/hw/microblaze/boot.c
> @@ -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");
> }
> }
>
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [Qemu-arm] [PATCH v2 05/47] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 05/47] hw/arm: " Alistair Francis
@ 2017-09-30 2:46 ` Philippe Mathieu-Daudé
2017-10-16 11:41 ` [Qemu-devel] " Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-09-30 2:46 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, qemu-arm, armbru
On 09/29/2017 09:15 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: qemu-arm@nongnu.org
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/arm/armv7m.c | 2 +-
> hw/arm/boot.c | 34 +++++++++++++++++-----------------
> 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, 76 insertions(+), 69 deletions(-)
>
> diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
> index bb2dfc942b..56770a7048 100644
> --- a/hw/arm/armv7m.c
> +++ b/hw/arm/armv7m.c
> @@ -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);
> }
>
> diff --git a/hw/arm/boot.c b/hw/arm/boot.c
> index c2720c8046..5b2d17f08a 100644
> --- a/hw/arm/boot.c
> +++ b/hw/arm/boot.c
> @@ -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");
Maybe we can drop the "qemu:"
> + error_report("qemu: 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,7 +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",
> + error_report("qemu: could not load kernel '%s'",
> info->kernel_filename);
> exit(1);
> }
> @@ -976,7 +976,7 @@ 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",
> + error_report("qemu: could not load initrd '%s'",
> info->initrd_filename);
> exit(1);
> }
> @@ -1021,9 +1021,9 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data)
> } else {
> fixupcontext[FIXUP_ARGPTR] = info->loader_start + KERNEL_ARGS_ADDR;
> if (info->ram_size >= (1ULL << 32)) {
> - fprintf(stderr, "qemu: RAM size must be less than 4GB to boot"
> - " Linux kernel using ATAGS (try passing a device tree"
> - " using -dtb)\n");
> + error_report("qemu: RAM size must be less than 4GB to boot"
> + " Linux kernel using ATAGS (try passing a device tree"
> + " using -dtb)");
> exit(1);
> }
> }
> diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
> index bba9e9f57a..8bd34956b7 100644
> --- a/hw/arm/gumstix.c
> +++ b/hw/arm/gumstix.c
> @@ -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("qemu: 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("qemu: Error registering flash memory.");
> exit(1);
> }
>
> diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
> index d07972a966..5c454c7109 100644
> --- a/hw/arm/mainstone.c
> +++ b/hw/arm/mainstone.c
> @@ -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("qemu: Error registering flash memory.");
> exit(1);
> }
> }
> diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
> index b648770882..06127a873d 100644
> --- a/hw/arm/musicpal.c
> +++ b/hw/arm/musicpal.c
> @@ -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);
> }
>
> diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
> index 64f2ee8356..c6d19387fc 100644
> --- a/hw/arm/omap1.c
> +++ b/hw/arm/omap1.c
> @@ -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);
> }
>
> @@ -3989,7 +3990,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("qemu: missing SecureDigital device");
anyway:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> exit(1);
> }
> s->mmc = omap_mmc_init(0xfffb7800, system_memory,
> diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
> index 758a26f3d8..e7afcc822a 100644
> --- a/hw/arm/omap2.c
> +++ b/hw/arm/omap2.c
> @@ -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("qemu: missing SecureDigital device");
> exit(1);
> }
> s->mmc = omap2_mmc_init(omap_l4tao(s->l4, 9),
> diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
> index 9a14270795..6eb56ae744 100644
> --- a/hw/arm/omap_sx1.c
> +++ b/hw/arm/omap_sx1.c
> @@ -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("qemu: 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("qemu: 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);
> }
>
> diff --git a/hw/arm/palm.c b/hw/arm/palm.c
> index 285f43709d..7f3637041a 100644
> --- a/hw/arm/palm.c
> +++ b/hw/arm/palm.c
> @@ -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);
> }
>
> diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
> index db860c238e..ffcb83d1a3 100644
> --- a/hw/arm/pxa2xx.c
> +++ b/hw/arm/pxa2xx.c
> @@ -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("qemu: 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("qemu: missing SecureDigital device");
> exit(1);
> }
> s->mmc = pxa2xx_mmci_init(address_space, 0x41100000,
> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
> index de7c0fc4a6..f6f295b363 100644
> --- a/hw/arm/stellaris.c
> +++ b/hw/arm/stellaris.c
> @@ -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;
> diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
> index a55b1a369c..a069c95f1c 100644
> --- a/hw/arm/tosa.c
> +++ b/hw/arm/tosa.c
> @@ -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]);
> }
>
> diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
> index 418792cd02..f0ae069172 100644
> --- a/hw/arm/versatilepb.c
> +++ b/hw/arm/versatilepb.c
> @@ -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("qemu: Error registering flash memory.");
> }
>
> versatile_binfo.ram_size = machine->ram_size;
> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
> index efb5a29475..508629dfe9 100644
> --- a/hw/arm/vexpress.c
> +++ b/hw/arm/vexpress.c
> @@ -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);
> }
>
> diff --git a/hw/arm/z2.c b/hw/arm/z2.c
> index 60561c7b7c..5048439799 100644
> --- a/hw/arm/z2.c
> +++ b/hw/arm/z2.c
> @@ -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("qemu: Error registering flash memory.");
> exit(1);
> }
>
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 02/47] Fixes after renaming __FUNCTION__ to __func__
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 02/47] Fixes after renaming __FUNCTION__ to __func__ Alistair Francis
@ 2017-09-30 6:31 ` Thomas Huth
2017-10-02 14:00 ` Eric Blake
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-09-30 6:31 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 30.09.2017 02:15, Alistair Francis wrote:
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> Cc: Eric Blake <eblake@redhat.com>
> ---
>
> hw/arm/omap1.c | 4 ++--
> hw/arm/omap2.c | 2 +-
> hw/block/onenand.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
> index 1388200191..64f2ee8356 100644
> --- a/hw/arm/omap1.c
> +++ b/hw/arm/omap1.c
> @@ -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;
> @@ -3336,7 +3336,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,
> s->mcr[0] = value & 0x03e1;
> if (value & 1) /* RMCM */
> printf("%s: Rx channel selection mode enable attempt\n",
> - __func__);
> + __func__);
That would now also fit into one line.
> return;
> case 0x1c: /* RCERA */
> s->rcer[0] = value & 0xffff;
> diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
> index b53878b8b9..758a26f3d8 100644
> --- a/hw/arm/omap2.c
> +++ b/hw/arm/omap2.c
> @@ -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",
> - __func__);
> + __func__);
You're changing the indentation here again in patch 5 when you replace
it with error_report ... so this hunk really seems like unnecessary code
churn - I'd suggest to drop it.
> }
>
> static void omap_prcm_dpll_update(struct omap_prcm_s *s)
> diff --git a/hw/block/onenand.c b/hw/block/onenand.c
> index 7542ef9634..08c63adc9a 100644
> --- a/hw/block/onenand.c
> +++ b/hw/block/onenand.c
> @@ -663,7 +663,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;
> }
>
>
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 03/47] audio: Replace AUDIO_FUNC with __func__
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 03/47] audio: Replace AUDIO_FUNC with __func__ Alistair Francis
@ 2017-09-30 6:35 ` Thomas Huth
2017-10-02 14:08 ` Eric Blake
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-09-30 6:35 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, Gerd Hoffmann, armbru
On 30.09.2017 02:15, Alistair Francis wrote:
> 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 repleace AUDIO_FUNC with
s/repleace/replace/
> __func__ instead.
>
> Checkpatch failures where manually fixed.
s/where/were/
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 22/47] hw/m68k: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 22/47] hw/m68k: " Alistair Francis
@ 2017-09-30 6:42 ` Thomas Huth
2017-10-16 11:25 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-09-30 6:42 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 30.09.2017 02:16, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Thomas Huth <huth@tuxfamily.org>
I guess the last line should have a "Cc:" prefix?
Anyway, patch looks fine to me, so:
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 29/47] hw/nvram: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 29/47] hw/nvram: " Alistair Francis
@ 2017-09-30 6:50 ` Thomas Huth
0 siblings, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-09-30 6:50 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 30.09.2017 02:16, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/nvram/eeprom93xx.c | 5 +++--
> hw/nvram/fw_cfg.c | 4 ++--
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c
> index 2fd0e3c29f..5cad031eba 100644
> --- a/hw/nvram/eeprom93xx.c
> +++ b/hw/nvram/eeprom93xx.c
> @@ -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;
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index e3bd626b8c..cf9a816c0e 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -515,8 +515,8 @@ static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size,
> static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field,
> QJSON *vmdesc)
> {
> - fprintf(stderr, "uint32_as_uint16 is only used for backward compatibility.\n");
> - fprintf(stderr, "This functions shouldn't be called.\n");
> + error_report("uint32_as_uint16 is only used for backward compatibility.");
> + error_report("This functions shouldn't be called.");
>
> return 0;
> }
>
Looking at that code, it sounds like we should rather drop the error
printing here and use g_assert_not_reached() instead?
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 30/47] hw/openrisc: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 30/47] hw/openrisc: " Alistair Francis
@ 2017-09-30 19:05 ` Stafford Horne
2017-10-16 11:50 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Stafford Horne @ 2017-09-30 19:05 UTC (permalink / raw)
To: Alistair Francis; +Cc: qemu-devel, alistair23, armbru, Jia Liu
Hi Alistair,
On Fri, Sep 29, 2017 at 05:16:30PM -0700, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: Jia Liu <proljc@gmail.com>
> Cc: Stafford Horne <shorne@gmail.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/openrisc/openrisc_sim.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
> index 86bf2849c4..44a6d115dd 100644
> --- a/hw/openrisc/openrisc_sim.c
> +++ b/hw/openrisc/openrisc_sim.c
> @@ -19,6 +19,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "qapi/error.h"
> #include "qemu-common.h"
> #include "cpu.h"
> @@ -87,7 +88,7 @@ static void cpu_openrisc_load_kernel(ram_addr_t ram_size,
> }
>
> if (kernel_size < 0) {
> - fprintf(stderr, "QEMU: couldn't load the kernel '%s'\n",
> + error_report("QEMU: couldn't load the kernel '%s'",
> kernel_filename);
> exit(1);
> }
Acked-by: Stafford Horne <shorne@gmail.com>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 40/47] hw/usb: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 40/47] hw/usb: " Alistair Francis
@ 2017-10-01 1:36 ` Philippe Mathieu-Daudé
2017-10-01 14:16 ` Thomas Huth
0 siblings, 1 reply; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:36 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, Gerd Hoffmann, armbru
On 09/29/2017 09:17 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/usb/core.c | 15 ++++++++-------
> hw/usb/desc.c | 4 ++--
> hw/usb/dev-audio.c | 29 +++++++++++++++--------------
> hw/usb/dev-bluetooth.c | 4 ++--
> hw/usb/dev-mtp.c | 9 +++++----
> hw/usb/dev-network.c | 20 ++++++++++----------
> hw/usb/hcd-ehci.c | 32 ++++++++++++++++----------------
> hw/usb/hcd-musb.c | 4 ++--
> hw/usb/hcd-xhci.c | 3 ++-
> hw/usb/host-legacy.c | 2 +-
> 10 files changed, 63 insertions(+), 59 deletions(-)
>
> diff --git a/hw/usb/core.c b/hw/usb/core.c
> index 241ae66b15..9ffdef055c 100644
> --- a/hw/usb/core.c
> +++ b/hw/usb/core.c
> @@ -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)
> diff --git a/hw/usb/desc.c b/hw/usb/desc.c
> index 85c15addc5..afae910f8e 100644
> --- a/hw/usb/desc.c
> +++ b/hw/usb/desc.c
> @@ -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,7 +688,7 @@ int usb_desc_get_descriptor(USBDevice *dev, USBPacket *p,
> break;
>
> default:
> - fprintf(stderr, "%s: %d unknown type %d (len %zd)\n", __func__,
> + error_report("%s: %d unknown type %d (len %zd)", __func__,
> dev->addr, type, len);
> break;
> }
> diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
> index 343345235c..43fc20469a 100644
> --- a/hw/usb/dev-audio.c
> +++ b/hw/usb/dev-audio.c
> @@ -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,7 +497,7 @@ 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",
> + 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,
> @@ -514,8 +515,8 @@ 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",
> + error_report("usb-audio: control transaction: "
> + "request 0x%04x value 0x%04x index 0x%04x length 0x%04x",
> request, value, index, length);
> }
>
> @@ -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,8 +558,8 @@ 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",
> + 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;
> @@ -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,7 +596,7 @@ 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",
> + error_report("usb-audio: output overrun (%zd bytes)",
> p->iov.size - p->actual_length);
> }
> }
> @@ -611,8 +612,8 @@ 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",
> + 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);
> diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
> index 0bbceaea0b..dfef258dca 100644
> --- a/hw/usb/dev-bluetooth.c
> +++ b/hw/usb/dev-bluetooth.c
> @@ -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;
> diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
> index 94c2e94f10..7e1782b8fc 100644
> --- a/hw/usb/dev-mtp.c
> +++ b/hw/usb/dev-mtp.c
> @@ -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__);
> + error_report("%s", __func__);
what about using tracepoint instead? this report is probably confusing
instead of being useful for the user imho.
> }
>
> static void usb_mtp_handle_data(USBDevice *dev, USBPacket *p)
> diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
> index 85fc81bf43..9dd4af5e34 100644
> --- a/hw/usb/dev-network.c
> +++ b/hw/usb/dev-network.c
> @@ -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;
> @@ -1084,9 +1084,9 @@ static void usb_net_handle_control(USBDevice *dev, USBPacket *p,
> for (i = 0; i < length; i++) {
> if (!(i & 15))
> fprintf(stderr, "\n%04x:", i);
> - fprintf(stderr, " %02x", data[i]);
> + error_report(" %02x", data[i]);
> }
> - fprintf(stderr, "\n\n");
> + fprintf(stderr, "\n");
eh?
> }
> #endif
> ret = rndis_parse(s, data, length);
> @@ -1111,17 +1111,17 @@ static void usb_net_handle_control(USBDevice *dev, USBPacket *p,
> for (i = 0; i < p->actual_length; i++) {
> if (!(i & 15))
> fprintf(stderr, "\n%04x:", i);
> - fprintf(stderr, " %02x", data[i]);
> + error_report(" %02x", data[i]);
> }
> - fprintf(stderr, "\n\n");
> + fprintf(stderr, "\n");
eh?
> }
> #endif
> break;
>
> default:
> fail:
> - fprintf(stderr, "usbnet: failed control transaction: "
> - "request 0x%x value 0x%x index 0x%x length 0x%x\n",
> + 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);
> }
> }
> diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
> index 0134232627..e405b882fb 100644
> --- a/hw/usb/hcd-ehci.c
> +++ b/hw/usb/hcd-ehci.c
> @@ -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();
> }
> }
> diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c
> index d70a91a58c..4729926124 100644
> --- a/hw/usb/hcd-musb.c
> +++ b/hw/usb/hcd-musb.c
> @@ -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
> diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
> index d75c085d94..6cc1be09a2 100644
> --- a/hw/usb/hcd-xhci.c
> +++ b/hw/usb/hcd-xhci.c
> @@ -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
> diff --git a/hw/usb/host-legacy.c b/hw/usb/host-legacy.c
> index 3b57e21b52..f0c81e5309 100644
> --- a/hw/usb/host-legacy.c
> +++ b/hw/usb/host-legacy.c
> @@ -86,7 +86,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;
> }
>
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 39/47] hw/timer: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 39/47] hw/timer: " Alistair Francis
@ 2017-10-01 1:37 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:37 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 09/29/2017 09:17 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> 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(-)
>
> diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c
> index ae2dc99832..0f064241d3 100644
> --- a/hw/timer/omap_gptimer.c
> +++ b/hw/timer/omap_gptimer.c
> @@ -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 */
> diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c
> index ef116c636c..18880884c6 100644
> --- a/hw/timer/twl92230.c
> +++ b/hw/timer/twl92230.c
> @@ -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);
> diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
> index 59439c05be..a80bba846b 100644
> --- a/hw/timer/xilinx_timer.c
> +++ b/hw/timer/xilinx_timer.c
> @@ -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)
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 38/47] hw/ssi: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 38/47] hw/ssi: " Alistair Francis
@ 2017-10-01 1:38 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:38 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/ssi/omap_spi.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ssi/omap_spi.c b/hw/ssi/omap_spi.c
> index 34163e5646..98242d1e8b 100644
> --- a/hw/ssi/omap_spi.c
> +++ b/hw/ssi/omap_spi.c
> @@ -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;
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 35/47] hw/sd: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 35/47] hw/sd: " Alistair Francis
@ 2017-10-01 1:41 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:41 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/sd/pl181.c | 5 +++--
> hw/sd/sd.c | 14 +++++++-------
> 2 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
> index 55c8098ecd..2b878a0c5e 100644
> --- a/hw/sd/pl181.c
> +++ b/hw/sd/pl181.c
> @@ -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];
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index ba47bff4db..e467d74fc8 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -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:
> @@ -1565,10 +1565,10 @@ send_response:
> int i;
> DPRINTF("Response:");
> for (i = 0; i < rsplen; i++)
please while here:
{
> - fprintf(stderr, " %02x", response[i]);
> + error_report(" %02x", response[i]);
}
> - fprintf(stderr, " state %d\n", sd->state);
> + error_report(" state %d", sd->state);
> } else {
> - DPRINTF("No response %d\n", sd->state);
> + DPRINTF("No response %d", sd->state);
hmm?
> }
> #endif
>
> @@ -1580,14 +1580,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");
> }
> }
>
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 31/47] hw/pci*: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 31/47] hw/pci*: " Alistair Francis
@ 2017-10-01 1:43 ` Philippe Mathieu-Daudé
2017-10-01 8:11 ` Marcel Apfelbaum
1 sibling, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:43 UTC (permalink / raw)
To: Alistair Francis, qemu-devel
Cc: Marcel Apfelbaum, alistair23, Michael S. Tsirkin, armbru
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Marcel Apfelbaum <marcel@redhat.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/pci-host/bonito.c | 6 +++---
> hw/pci/pci.c | 10 +++++-----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
> index 1767d2af61..48fef86c05 100644
> --- a/hw/pci-host/bonito.c
> +++ b/hw/pci-host/bonito.c
> @@ -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);
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 1e6fb88eba..1c8395d319 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -515,7 +515,7 @@ 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",
> + error_report("irq state %d: must be 0 or 1.",
Maybe drop the trailing dot?
Anyway:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> irq_state[i]);
> return -EINVAL;
> }
> @@ -678,7 +678,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;
> }
>
> @@ -694,7 +694,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;
> }
>
> @@ -1118,8 +1118,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);
> }
>
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 27/47] hw/net: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 27/47] hw/net: " Alistair Francis
@ 2017-10-01 1:46 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:46 UTC (permalink / raw)
To: Alistair Francis, qemu-devel
Cc: Michael S. Tsirkin, Jason Wang, Alexander Graf, armbru, alistair23
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: Alexander Graf <agraf@suse.de>
> Cc: Jason Wang <jasowang@redhat.com>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> ---
> 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(-)
>
> diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
> index 9da1932970..965effa314 100644
> --- a/hw/net/fsl_etsec/etsec.c
> +++ b/hw/net/fsl_etsec/etsec.c
> @@ -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 */
> diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
> index 654455355f..5f2b5fe046 100644
> --- a/hw/net/pcnet.c
> +++ b/hw/net/pcnet.c
> @@ -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.");
drop trailing dot to unify?
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> #endif
> size = 4092;
> }
> diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
> index 3b16dcf5a1..ae40fd6e6e 100644
> --- a/hw/net/smc91c111.c
> +++ b/hw/net/smc91c111.c
> @@ -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;
> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> index e037db63a3..37d0cce560 100644
> --- a/hw/net/vhost_net.c
> +++ b/hw/net/vhost_net.c
> @@ -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);
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 26/47] hw/moxie: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 26/47] hw/moxie: " Alistair Francis
@ 2017-10-01 1:46 ` Philippe Mathieu-Daudé
2017-10-16 11:47 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:46 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, Anthony Green, armbru
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Cc: Anthony Green <green@moxielogic.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/moxie/moxiesim.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
> index 5ea8dd3a93..5916f86c68 100644
> --- a/hw/moxie/moxiesim.c
> +++ b/hw/moxie/moxiesim.c
> @@ -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,7 +62,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params)
> 0, 0);
>
> if (kernel_size <= 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> + error_report("qemu: could not load kernel '%s'",
> loader_params->kernel_filename);
> exit(1);
> }
> @@ -85,8 +86,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params)
> ram_size);
> }
> if (initrd_size == (target_ulong)-1) {
> - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
> - loader_params->initrd_filename);
> + error_report("qemu: could not load initial ram disk '%s'",
> + loader_params->initrd_filename);
> exit(1);
> }
> }
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 25/47] hw/misc: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 25/47] hw/misc: " Alistair Francis
@ 2017-10-01 1:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:47 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> 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(-)
>
> diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c
> index 3e8ad8cd73..21b8e49b6c 100644
> --- a/hw/misc/a9scu.c
> +++ b/hw/misc/a9scu.c
> @@ -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;
> }
> diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
> index 84f9e4c612..e3b30e90ea 100644
> --- a/hw/misc/omap_gpmc.c
> +++ b/hw/misc/omap_gpmc.c
> @@ -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];
> diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c
> index 96fc057b4e..47d9c10aeb 100644
> --- a/hw/misc/omap_l4.c
> +++ b/hw/misc/omap_l4.c
> @@ -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);
> }
>
> diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c
> index 7b38c5568c..3dcabc1e00 100644
> --- a/hw/misc/omap_sdrc.c
> +++ b/hw/misc/omap_sdrc.c
> @@ -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);
> diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c
> index 165500223f..55369bd180 100644
> --- a/hw/misc/vmport.c
> +++ b/hw/misc/vmport.c
> @@ -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;
> }
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 21/47] hw/lm32: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 21/47] hw/lm32: " Alistair Francis
@ 2017-10-01 1:48 ` Philippe Mathieu-Daudé
2017-10-16 11:45 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:48 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, Michael Walle, armbru
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Cc: Michael Walle <michael@walle.cc>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/lm32/lm32_boards.c | 5 +++--
> hw/lm32/milkymist.c | 5 +++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
> index b0bb3ef58a..d739acf476 100644
> --- a/hw/lm32/lm32_boards.c
> +++ b/hw/lm32/lm32_boards.c
> @@ -18,6 +18,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "qemu-common.h"
> #include "cpu.h"
> #include "hw/sysbus.h"
> @@ -152,7 +153,7 @@ static void lm32_evr_init(MachineState *machine)
> }
>
> if (kernel_size < 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
> @@ -250,7 +251,7 @@ static void lm32_uclinux_init(MachineState *machine)
> }
>
> if (kernel_size < 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
> diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
> index 4db4d2d533..caa6cf4e0f 100644
> --- a/hw/lm32/milkymist.c
> +++ b/hw/lm32/milkymist.c
> @@ -18,6 +18,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "qemu-common.h"
> #include "cpu.h"
> #include "hw/sysbus.h"
> @@ -149,7 +150,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",
> + error_report("qemu: could not load Milkymist One bios '%s'",
> bios_name);
> exit(1);
> }
> @@ -188,7 +189,7 @@ milkymist_init(MachineState *machine)
> }
>
> if (kernel_size < 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 20/47] hw/isa: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 20/47] hw/isa: " Alistair Francis
@ 2017-10-01 1:48 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:48 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 09/29/2017 09:16 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/isa/isa-bus.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
> index 348e0eab9d..0f2e426d02 100644
> --- a/hw/isa/isa-bus.c
> +++ b/hw/isa/isa-bus.c
> @@ -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:
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 19/47] hw/ipmi: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 19/47] hw/ipmi: " Alistair Francis
@ 2017-10-01 1:50 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:50 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 09/29/2017 09:15 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/ipmi/ipmi.c | 1 +
> hw/ipmi/ipmi_bmc_extern.c | 5 +++--
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
> index b27babd504..81c62920de 100644
> --- a/hw/ipmi/ipmi.c
> +++ b/hw/ipmi/ipmi.c
> @@ -23,6 +23,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
Why?
> #include "hw/hw.h"
> #include "hw/ipmi/ipmi.h"
> #include "sysemu/sysemu.h"
> diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
> index abab3bba4f..8c0535d3dd 100644
> --- a/hw/ipmi/ipmi_bmc_extern.c
> +++ b/hw/ipmi/ipmi_bmc_extern.c
> @@ -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();
> }
>
For ipmi_bmc_extern.c:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 14/47] hw/i2c: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 14/47] hw/i2c: " Alistair Francis
@ 2017-10-01 1:52 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:52 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 09/29/2017 09:15 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/i2c/omap_i2c.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
> index 26e3e5ebf6..c89664f342 100644
> --- a/hw/i2c/omap_i2c.c
> +++ b/hw/i2c/omap_i2c.c
> @@ -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: I^2C slave mode not supported",
> + __func__);
Can you change by "i2c slave ..." instead?
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 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:
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 12/47] hw/dma: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 12/47] hw/dma: " Alistair Francis
@ 2017-10-01 1:55 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:55 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 09/29/2017 09:15 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/dma/omap_dma.c | 26 ++++++++++++++------------
> hw/dma/soc_dma.c | 37 +++++++++++++++++++------------------
> 2 files changed, 33 insertions(+), 30 deletions(-)
>
> diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c
> index abd18c67ea..5d7fe06d98 100644
> --- a/hw/dma/omap_dma.c
> +++ b/hw/dma/omap_dma.c
> @@ -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;
> diff --git a/hw/dma/soc_dma.c b/hw/dma/soc_dma.c
> index 9bb499bf9c..7339a3ec95 100644
> --- a/hw/dma/soc_dma.c
> +++ b/hw/dma/soc_dma.c
> @@ -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__,
Can you remove the ""?
> + 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 "",
Same here
> + __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__,
Again
> + virt_base, virt_base + size,
> + entry->addr, entry->addr + entry->u.mem.size);
> exit(-1);
> }
>
> @@ -334,11 +335,11 @@ 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__,
Again
> + virt_base, virt_base + size,
> + entry->addr);
> exit(-1);
> }
>
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 09/47] hw/core: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 09/47] hw/core: " Alistair Francis
@ 2017-10-01 1:56 ` Philippe Mathieu-Daudé
2017-10-01 14:11 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-01 1:56 UTC (permalink / raw)
To: Alistair Francis, qemu-devel
Cc: alistair23, Michael S. Tsirkin, armbru, Paolo Bonzini
On 09/29/2017 09:15 PM, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/core/loader.c | 31 ++++++++++++++++---------------
> hw/core/ptimer.c | 7 ++++---
> 2 files changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 4593061445..95bdcbbe36 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -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,7 +83,7 @@ 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",
> + error_report("file %-20s: get size error: %s",
> filename, strerror(errno));
> close(fd);
> return -1;
> @@ -623,7 +624,7 @@ 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,
> + 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,7 +764,7 @@ 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",
> + 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,7 +910,7 @@ 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",
> + error_report("Could not open option rom '%s': %s",
> rom->path, strerror(errno));
> goto err;
> }
> @@ -921,7 +922,7 @@ 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",
> + error_report("rom: file %-20s: get size error: %s",
> rom->name, strerror(errno));
> goto err;
> }
> @@ -931,7 +932,7 @@ 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",
> + error_report("rom: file %-20s: read error: rc=%d (expected %zd)",
> rom->name, rc, rom->datasize);
> goto err;
> }
> @@ -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;
> diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
> index 7221c68a98..514e177de2 100644
> --- a/hw/core/ptimer.c
> +++ b/hw/core/ptimer.c
> @@ -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;
> }
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 31/47] hw/pci*: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 31/47] hw/pci*: " Alistair Francis
2017-10-01 1:43 ` Philippe Mathieu-Daudé
@ 2017-10-01 8:11 ` Marcel Apfelbaum
2017-10-02 18:15 ` Alistair Francis
1 sibling, 1 reply; 101+ messages in thread
From: Marcel Apfelbaum @ 2017-10-01 8:11 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru, Michael S. Tsirkin
Hi,
On 30/09/2017 3:16, Alistair Francis wrote:
> 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.
>
We are using coccinelle with great results until now and
we save the scripts in scripts/coccinelle so we can run
them later/improve them.
For your task it should be a really easy script, but
since your work is already done maybe is not worth it.
Anyway, here is the equivalent coccinelle script:
@
expression list ARGS;
@@
- fprintf(stderr, ARGS);
+ error_report(ARGS);
To run:
Install coccinelle: dnf install coccinelle
Save the above as: <qemu_dir>/scripts/coccinelle/remove_fprintf.cocci
Run it to see the diff:
spatch --sp-file <qemu_dir>scripts/coccinelle/remove_fprintf.cocci
--dir <qemu_dir> --include-headers
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Thanks,
Marcel
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Marcel Apfelbaum <marcel@redhat.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/pci-host/bonito.c | 6 +++---
> hw/pci/pci.c | 10 +++++-----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
> index 1767d2af61..48fef86c05 100644
> --- a/hw/pci-host/bonito.c
> +++ b/hw/pci-host/bonito.c
> @@ -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);
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 1e6fb88eba..1c8395d319 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -515,7 +515,7 @@ 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",
> + error_report("irq state %d: must be 0 or 1.",
> irq_state[i]);
> return -EINVAL;
> }
> @@ -678,7 +678,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;
> }
>
> @@ -694,7 +694,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;
> }
>
> @@ -1118,8 +1118,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);
> }
>
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 07/47] hw/bt: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 07/47] hw/bt: " Alistair Francis
@ 2017-10-01 14:06 ` Thomas Huth
2017-10-17 18:32 ` Alistair Francis
0 siblings, 1 reply; 101+ messages in thread
From: Thomas Huth @ 2017-10-01 14:06 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 30.09.2017 02:15, Alistair Francis wrote:
> 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.
[...]
> diff --git a/hw/bt/core.c b/hw/bt/core.c
> index c1806b71a3..a6e9bf2a3e 100644
> --- a/hw/bt/core.c
> +++ b/hw/bt/core.c
> @@ -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,24 @@ 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__);
I think these lines should now also easily fit into one line only.
> 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,7 +114,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", __func__,
> + error_report("%s: bad bt device \"%s\"", __func__,
> dev->lmp_name ?: "(null)");
Bad indentation of the second line.
> exit(-1);
> }
> diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
> index ac067b81f6..6a171a54b7 100644
> --- a/hw/bt/hci-csr.c
> +++ b/hw/bt/hci-csr.c
> @@ -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,8 +169,8 @@ 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__,
> + 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]);
Bad indentation again.
> }
> @@ -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;
> }
>
> diff --git a/hw/bt/hci.c b/hw/bt/hci.c
> index df05f07887..ac9394daf0 100644
> --- a/hw/bt/hci.c
> +++ b/hw/bt/hci.c
> @@ -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,7 +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",
> + error_report("%s: HCI event params too long (%ib)",
> __func__, len);
Bad indentation again - or even better: Put it into one line only.
> exit(-1);
> }
> @@ -589,7 +590,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", __func__,
> + error_report("%s: bad inquiry mode %02x", __func__,
> hci->lm.inquiry_mode);
Bad indentation.
> exit(-1);
> }
> @@ -1971,7 +1972,7 @@ static void bt_submit_hci(struct HCIInfo *info,
> break;
>
> short_hci:
> - fprintf(stderr, "%s: HCI packet too short (%iB)\n",
> + error_report("%s: HCI packet too short (%iB)",
> __func__, length);
One line, please.
> bt_hci_event_status(hci, HCI_INVALID_PARAMETERS);
> break;
> @@ -1991,7 +1992,7 @@ 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",
> + error_report("%s: can't take ACL packets %i bytes long",
> __func__, len);
Fix indentation or put it on one line.
> return;
> }
> @@ -2029,7 +2030,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",
> + error_report("%s: ACL packet too short (%iB)",
> __func__, length);
One line.
> return;
> }
> @@ -2041,15 +2042,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);
One line.
> /* TODO: signal an error */
> return;
> }
> handle &= ~HCI_HANDLE_OFFSET;
>
> if (datalen > length) {
> - fprintf(stderr, "%s: ACL packet too short (%iB < %iB)\n",
> + fprintf(stderr, "%s: ACL packet too short (%iB < %iB)",
> __func__, length, datalen);
script failure?
> return;
> }
> @@ -2060,7 +2061,7 @@ 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",
> + error_report("%s: Bad handle %03x in Active Slave Broadcast",
> __func__, handle);
Indentation.
etc.
Please have a look at all the hunks in this patch before you submit it
again!
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 08/47] hw/char: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 08/47] hw/char: " Alistair Francis
@ 2017-10-01 14:09 ` Thomas Huth
0 siblings, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-01 14:09 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, Paolo Bonzini, armbru
On 30.09.2017 02:15, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/char/exynos4210_uart.c | 6 +++---
> hw/char/mcf_uart.c | 5 +++--
> hw/char/sh_serial.c | 9 +++++----
> 3 files changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
> index 3957e78abf..a388f01a23 100644
> --- a/hw/char/exynos4210_uart.c
> +++ b/hw/char/exynos4210_uart.c
> @@ -296,7 +296,7 @@ static void exynos4210_uart_update_irq(Exynos4210UartState *s)
> qemu_irq_raise(s->irq);
>
> #if DEBUG_IRQ
> - fprintf(stderr, "UART%d: IRQ has been raised: %08x\n",
> + error_report("UART%d: IRQ has been raised: %08x",
> s->channel, s->reg[I_(UINTP)]);
> #endif
>
> @@ -388,7 +388,7 @@ static void exynos4210_uart_write(void *opaque, hwaddr offset,
> * qemu_chr_fe_write and background I/O callbacks */
> qemu_chr_fe_write_all(&s->chr, &ch, 1);
> #if DEBUG_Tx_DATA
> - fprintf(stderr, "%c", ch);
> + error_report("%c", ch);
> #endif
> s->reg[I_(UTRSTAT)] |= UTRSTAT_TRANSMITTER_EMPTY |
> UTRSTAT_Tx_BUFFER_EMPTY;
> @@ -400,7 +400,7 @@ static void exynos4210_uart_write(void *opaque, hwaddr offset,
> case UINTP:
> s->reg[I_(UINTP)] &= ~val;
> s->reg[I_(UINTSP)] &= ~val;
> - PRINT_DEBUG("UART%d: UINTP [%04x] have been cleared: %08x\n",
> + PRINT_DEBUG("UART%d: UINTP [%04x] have been cleared: %08x",
> s->channel, offset, s->reg[I_(UINTP)]);
> exynos4210_uart_update_irq(s);
> break;
You didn't replace the PRINT_DEBUG macro, did you? So the last change
looks wrong. IMHO it's also sounds wrong to use error_report for all the
DEBUG sections in here, so I'd rather drop the changes to this file
completely.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 09/47] hw/core: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 09/47] hw/core: " Alistair Francis
2017-10-01 1:56 ` Philippe Mathieu-Daudé
@ 2017-10-01 14:11 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-01 14:11 UTC (permalink / raw)
To: Alistair Francis, qemu-devel
Cc: alistair23, Michael S. Tsirkin, armbru, Paolo Bonzini
On 30.09.2017 02:15, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/core/loader.c | 31 ++++++++++++++++---------------
> hw/core/ptimer.c | 7 ++++---
> 2 files changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 4593061445..95bdcbbe36 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -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,7 +83,7 @@ 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",
> + error_report("file %-20s: get size error: %s",
> filename, strerror(errno));
> close(fd);
> return -1;
> @@ -623,7 +624,7 @@ 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,
> + error_report("Wrong image type %d, expected %d", hdr->ih_type,
> image_type);
Looks like indentation is broken again in this patch. Please fix it first!
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 10/47] hw/cris: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 10/47] hw/cris: " Alistair Francis
@ 2017-10-01 14:13 ` Thomas Huth
2017-10-16 11:42 ` Thomas Huth
0 siblings, 1 reply; 101+ messages in thread
From: Thomas Huth @ 2017-10-01 14:13 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 30.09.2017 02:15, Alistair Francis wrote:
> 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.
[...]
> diff --git a/hw/cris/boot.c b/hw/cris/boot.c
> index f896ed7f86..f199a13a82 100644
> --- a/hw/cris/boot.c
> +++ b/hw/cris/boot.c
> @@ -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,14 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
> }
>
> if (image_size < 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> + error_report("qemu: could not load kernel '%s'",
> li->image_filename);
Put it on one line, please.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 40/47] hw/usb: Replace fprintf(stderr, "*\n" with error_report()
2017-10-01 1:36 ` Philippe Mathieu-Daudé
@ 2017-10-01 14:16 ` Thomas Huth
0 siblings, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-01 14:16 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Alistair Francis, qemu-devel
Cc: alistair23, Gerd Hoffmann, armbru
On 01.10.2017 03:36, Philippe Mathieu-Daudé wrote:
> On 09/29/2017 09:17 PM, Alistair Francis wrote:
>> 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.
[...]
>> diff --git a/hw/usb/desc.c b/hw/usb/desc.c
>> index 85c15addc5..afae910f8e 100644
>> --- a/hw/usb/desc.c
>> +++ b/hw/usb/desc.c
>> @@ -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,7 +688,7 @@ int usb_desc_get_descriptor(USBDevice *dev,
>> USBPacket *p,
>> break;
>> default:
>> - fprintf(stderr, "%s: %d unknown type %d (len %zd)\n", __func__,
>> + error_report("%s: %d unknown type %d (len %zd)", __func__,
>> dev->addr, type, len);
Bad indentation.
>> break;
>> }
>> diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
>> index 343345235c..43fc20469a 100644
>> --- a/hw/usb/dev-audio.c
>> +++ b/hw/usb/dev-audio.c
>> @@ -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,7 +497,7 @@ 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",
>> + error_report("usb-audio: mute %d, lvol %3d, rvol %3d",
>> s->out.mute, s->out.vol[0], s->out.vol[1]);
Bad indentation.
>> }
>> AUD_set_volume_out(s->out.voice, s->out.mute,
>> @@ -514,8 +515,8 @@ 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",
>> + error_report("usb-audio: control transaction: "
>> + "request 0x%04x value 0x%04x index 0x%04x length
>> 0x%04x",
>> request, value, index, length);
Bad indentation.
>> }
>> @@ -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,8 +558,8 @@ 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",
>> + error_report("usb-audio: failed control transaction: "
>> + "request 0x%04x value 0x%04x index 0x%04x length
>> 0x%04x",
>> request, value, index, length);
Bad indentation.
>> }
>> p->status = USB_RET_STALL;
>> @@ -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,7 +596,7 @@ 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",
>> + error_report("usb-audio: output overrun (%zd bytes)",
>> p->iov.size - p->actual_length);
Bad indentation.
>> }
>> }
>> @@ -611,8 +612,8 @@ 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",
>> + error_report("usb-audio: failed data transaction: "
>> + "pid 0x%x ep 0x%x len 0x%zx",
>> p->pid, p->ep->nr, p->iov.size);
Bad indentation.
>> }
>> }
[...]
>> @@ -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__);
>> + error_report("%s", __func__);
>
> what about using tracepoint instead? this report is probably confusing
> instead of being useful for the user imho.
A comment like "should never be called" rather sounds like we should be
using g_assert_not_reached() here instead.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 02/47] Fixes after renaming __FUNCTION__ to __func__
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 02/47] Fixes after renaming __FUNCTION__ to __func__ Alistair Francis
2017-09-30 6:31 ` Thomas Huth
@ 2017-10-02 14:00 ` Eric Blake
1 sibling, 0 replies; 101+ messages in thread
From: Eric Blake @ 2017-10-02 14:00 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
[-- Attachment #1: Type: text/plain, Size: 491 bytes --]
On 09/29/2017 07:15 PM, Alistair Francis wrote:
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> Cc: Eric Blake <eblake@redhat.com>
> ---
>
> hw/arm/omap1.c | 4 ++--
> hw/arm/omap2.c | 2 +-
> hw/block/onenand.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 03/47] audio: Replace AUDIO_FUNC with __func__
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 03/47] audio: Replace AUDIO_FUNC with __func__ Alistair Francis
2017-09-30 6:35 ` Thomas Huth
@ 2017-10-02 14:08 ` Eric Blake
1 sibling, 0 replies; 101+ messages in thread
From: Eric Blake @ 2017-10-02 14:08 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, Gerd Hoffmann, armbru
[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]
On 09/29/2017 07:15 PM, Alistair Francis wrote:
> 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 repleace AUDIO_FUNC with
> __func__ instead.
>
> Checkpatch failures where manually fixed.
>
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> ---
Module the typo fixes spotted by Thomas,
Reviewed-by: Eric Blake <eblake@redhat.com>
> +++ b/audio/audio.c
> @@ -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)) {
I wonder if it would be nicer to have audio_bug() as a macro that
supplies __func__ automatically; but it's not enough of a concern to
prevent this patch from going in as-is.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 01/47] Replace all occurances of __FUNCTION__ with __func__
2017-09-30 0:14 ` Alistair Francis
(?)
(?)
@ 2017-10-02 14:11 ` Stefan Hajnoczi
-1 siblings, 0 replies; 101+ messages in thread
From: Stefan Hajnoczi @ 2017-10-02 14:11 UTC (permalink / raw)
To: Alistair Francis
Cc: qemu-devel, alistair23, armbru, Gerd Hoffmann,
Andrzej Zaborowski, Stefano Stabellini, Anthony Perard,
John Snow, Aurelien Jarno, Yongbok Kim, Peter Crosthwaite,
Fam Zheng, Juan Quintela, Dr. David Alan Gilbert, qemu-arm,
qemu-block, xen-devel
On Fri, Sep 29, 2017 at 05:14:58PM -0700, Alistair Francis wrote:
> Replace 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 <alistair.francis@xilinx.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Andrzej Zaborowski <balrogg@gmail.com>
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: John Snow <jsnow@redhat.com>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Cc: Yongbok Kim <yongbok.kim@imgtec.com>
> Cc: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Fam Zheng <famz@redhat.com>
> Cc: Juan Quintela <quintela@redhat.com>
> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> Cc: qemu-arm@nongnu.org
> Cc: qemu-block@nongnu.org
> Cc: xen-devel@lists.xenproject.org
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
>
> audio/audio_int.h | 2 +-
> 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 ++--
> 65 files changed, 273 insertions(+), 273 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [PATCH v2 01/47] Replace all occurances of __FUNCTION__ with __func__
2017-09-30 0:14 ` Alistair Francis
(?)
@ 2017-10-02 14:11 ` Stefan Hajnoczi
-1 siblings, 0 replies; 101+ messages in thread
From: Stefan Hajnoczi @ 2017-10-02 14:11 UTC (permalink / raw)
To: Alistair Francis
Cc: Dr. David Alan Gilbert, Stefano Stabellini, Fam Zheng,
qemu-block, Peter Crosthwaite, John Snow, Juan Quintela,
qemu-devel, armbru, Yongbok Kim, qemu-arm, Gerd Hoffmann,
xen-devel, Anthony Perard, alistair23, Andrzej Zaborowski,
Aurelien Jarno
On Fri, Sep 29, 2017 at 05:14:58PM -0700, Alistair Francis wrote:
> Replace 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 <alistair.francis@xilinx.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Andrzej Zaborowski <balrogg@gmail.com>
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: John Snow <jsnow@redhat.com>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Cc: Yongbok Kim <yongbok.kim@imgtec.com>
> Cc: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Fam Zheng <famz@redhat.com>
> Cc: Juan Quintela <quintela@redhat.com>
> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> Cc: qemu-arm@nongnu.org
> Cc: qemu-block@nongnu.org
> Cc: xen-devel@lists.xenproject.org
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
>
> audio/audio_int.h | 2 +-
> 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 ++--
> 65 files changed, 273 insertions(+), 273 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 31/47] hw/pci*: Replace fprintf(stderr, "*\n" with error_report()
2017-10-01 8:11 ` Marcel Apfelbaum
@ 2017-10-02 18:15 ` Alistair Francis
0 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-10-02 18:15 UTC (permalink / raw)
To: Marcel Apfelbaum
Cc: Alistair Francis, qemu-devel@nongnu.org Developers,
Markus Armbruster, Michael S. Tsirkin
On Sun, Oct 1, 2017 at 1:11 AM, Marcel Apfelbaum <marcel@redhat.com> wrote:
> Hi,
>
>
> On 30/09/2017 3:16, Alistair Francis wrote:
>>
>> 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.
>>
>
> We are using coccinelle with great results until now and
> we save the scripts in scripts/coccinelle so we can run
> them later/improve them.
> For your task it should be a really easy script, but
> since your work is already done maybe is not worth it.
> Anyway, here is the equivalent coccinelle script:
>
> @
> expression list ARGS;
> @@
> - fprintf(stderr, ARGS);
> + error_report(ARGS);
>
> To run:
> Install coccinelle: dnf install coccinelle
> Save the above as: <qemu_dir>/scripts/coccinelle/remove_fprintf.cocci
> Run it to see the diff:
> spatch --sp-file <qemu_dir>scripts/coccinelle/remove_fprintf.cocci --dir
> <qemu_dir> --include-headers
Thanks,
I have already decided that coccinelle is the way to go here, this
ended up much more complex then I was hoping.
That's good to know we save the previous scripts.
Thanks,
Alistair
>
>
> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
>
> Thanks,
> Marcel
>
>
>> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>> Cc: Marcel Apfelbaum <marcel@redhat.com>
>> ---
>> V2:
>> - Split hw patch into individual directories
>>
>> hw/pci-host/bonito.c | 6 +++---
>> hw/pci/pci.c | 10 +++++-----
>> 2 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
>> index 1767d2af61..48fef86c05 100644
>> --- a/hw/pci-host/bonito.c
>> +++ b/hw/pci-host/bonito.c
>> @@ -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);
>> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
>> index 1e6fb88eba..1c8395d319 100644
>> --- a/hw/pci/pci.c
>> +++ b/hw/pci/pci.c
>> @@ -515,7 +515,7 @@ 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",
>> + error_report("irq state %d: must be 0 or 1.",
>> irq_state[i]);
>> return -EINVAL;
>> }
>> @@ -678,7 +678,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;
>> }
>> @@ -694,7 +694,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;
>> }
>> @@ -1118,8 +1118,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);
>> }
>>
>
>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 32/47] hw/ppc: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 32/47] hw/ppc: " Alistair Francis
@ 2017-10-04 6:11 ` David Gibson
2017-10-16 11:53 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: David Gibson @ 2017-10-04 6:11 UTC (permalink / raw)
To: Alistair Francis; +Cc: qemu-devel, alistair23, qemu-ppc, armbru
[-- Attachment #1: Type: text/plain, Size: 16638 bytes --]
On Fri, Sep 29, 2017 at 05:16:36PM -0700, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
> Cc: qemu-ppc@nongnu.org
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/ppc/e500.c | 20 ++++++++++----------
> hw/ppc/mac_newworld.c | 2 +-
> hw/ppc/mac_oldworld.c | 2 +-
> hw/ppc/mpc8544_guts.c | 5 +++--
> hw/ppc/ppc405_boards.c | 8 ++++----
> hw/ppc/ppc440_bamboo.c | 19 ++++++++++---------
> hw/ppc/ppc4xx_pci.c | 3 ++-
> hw/ppc/prep.c | 4 ++--
> hw/ppc/virtex_ml507.c | 4 ++--
> 9 files changed, 35 insertions(+), 32 deletions(-)
>
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index db0e49ab8f..8a5350161f 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -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();
> }
> @@ -821,7 +821,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);
> }
> @@ -967,7 +967,7 @@ 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",
> + error_report("qemu: could not load kernel '%s'",
> machine->kernel_filename);
> exit(1);
> }
> @@ -982,8 +982,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("qemu: could not load initial ram disk '%s'",
> + machine->initrd_filename);
> exit(1);
> }
>
> @@ -1024,7 +1024,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("qemu: could not load firmware '%s'", filename);
> exit(1);
> }
> }
> @@ -1037,7 +1037,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);
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 6d0ace20ca..fa54056bc3 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -278,7 +278,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);
> }
> }
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index bc7c8b7bd7..4d75113533 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -221,7 +221,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);
> }
> }
> diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
> index ce1254b5d4..3a2c49e3fd 100644
> --- a/hw/ppc/mpc8544_guts.c
> +++ b/hw/ppc/mpc8544_guts.c
> @@ -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;
> }
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index e92db2c66a..0a31a1c116 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -324,7 +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",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
> @@ -336,8 +336,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("qemu: could not load initial ram disk '%s'",
> + initrd_filename);
> exit(1);
> }
> } else {
> @@ -607,7 +607,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",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index f92d47f28d..77b74dfe9e 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -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
> @@ -190,7 +191,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);
> }
> @@ -224,7 +225,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);
> }
>
> @@ -265,7 +266,7 @@ static void bamboo_init(MachineState *machine)
> }
> /* XXX try again as binary */
> if (success < 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
> @@ -277,7 +278,7 @@ 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",
> + error_report("qemu: could not load ram disk '%s' at %x",
> initrd_filename, RAMDISK_ADDR);
> exit(1);
> }
> @@ -287,7 +288,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);
> }
> }
> diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
> index 6953f8b9ac..0b91d22253 100644
> --- a/hw/ppc/ppc4xx_pci.c
> +++ b/hw/ppc/ppc4xx_pci.c
> @@ -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);
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index 94138a4e8c..7551d53fa5 100644
> --- a/hw/ppc/prep.c
> +++ b/hw/ppc/prep.c
> @@ -576,7 +576,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);
> }
> }
> @@ -597,7 +597,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);
> diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
> index ed9b406fd3..7641737f81 100644
> --- a/hw/ppc/virtex_ml507.c
> +++ b/hw/ppc/virtex_ml507.c
> @@ -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;
> }
> @@ -219,7 +219,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);
> }
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 18/47] hw/intc: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 18/47] hw/intc: " Alistair Francis
@ 2017-10-04 7:34 ` Cornelia Huck
0 siblings, 0 replies; 101+ messages in thread
From: Cornelia Huck @ 2017-10-04 7:34 UTC (permalink / raw)
To: Alistair Francis
Cc: qemu-devel, alistair23, armbru, Peter Maydell,
Christian Borntraeger, Alexander Graf
On Fri, 29 Sep 2017 17:15:54 -0700
Alistair Francis <alistair.francis@xilinx.com> wrote:
> 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.
> diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
> index d208cb81c4..e710bfdcda 100644
> --- a/hw/intc/s390_flic_kvm.c
> +++ b/hw/intc/s390_flic_kvm.c
> @@ -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");
> }
> }
>
s390x part:
Acked-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 47/47] target: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 47/47] target: Replace fprintf(stderr, "*\n" with error_report() Alistair Francis
@ 2017-10-04 7:41 ` Cornelia Huck
0 siblings, 0 replies; 101+ messages in thread
From: Cornelia Huck @ 2017-10-04 7:41 UTC (permalink / raw)
To: Alistair Francis
Cc: qemu-devel, alistair23, armbru, Edgar E. Iglesias, Paolo Bonzini,
Richard Henderson, Eduardo Habkost, Marcelo Tosatti,
Michael Walle, Aurelien Jarno, Yongbok Kim,
Christian Borntraeger, Guan Xuetao, qemu-arm, qemu-ppc
On Fri, 29 Sep 2017 17:17:26 -0700
Alistair Francis <alistair.francis@xilinx.com> wrote:
> 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.
> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
> index ebb75cafaa..6f7ebd1c98 100644
> --- a/target/s390x/kvm.c
> +++ b/target/s390x/kvm.c
> @@ -967,13 +967,13 @@ static void inject_vcpu_irq_legacy(CPUState *cs, struct kvm_s390_irq *irq)
>
> r = s390_kvm_irq_to_interrupt(irq, &kvmint);
> if (r < 0) {
> - fprintf(stderr, "%s called with bogus interrupt\n", __func__);
> + error_report("%s called with bogus interrupt", __func__);
> exit(1);
> }
>
> r = kvm_vcpu_ioctl(cs, KVM_S390_INTERRUPT, &kvmint);
> if (r < 0) {
> - fprintf(stderr, "KVM failed to inject interrupt\n");
> + error_report("KVM failed to inject interrupt");
> exit(1);
> }
> }
> @@ -1002,13 +1002,13 @@ static void __kvm_s390_floating_interrupt(struct kvm_s390_irq *irq)
>
> r = s390_kvm_irq_to_interrupt(irq, &kvmint);
> if (r < 0) {
> - fprintf(stderr, "%s called with bogus interrupt\n", __func__);
> + error_report("%s called with bogus interrupt", __func__);
> exit(1);
> }
>
> r = kvm_vm_ioctl(kvm_state, KVM_S390_INTERRUPT, &kvmint);
> if (r < 0) {
> - fprintf(stderr, "KVM failed to inject interrupt\n");
> + error_report("KVM failed to inject interrupt");
> exit(1);
> }
> }
> @@ -1116,14 +1116,14 @@ static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
> break;
> case PRIV_B2_TSCH:
> /* We should only get tsch via KVM_EXIT_S390_TSCH. */
> - fprintf(stderr, "Spurious tsch intercept\n");
> + error_report("Spurious tsch intercept");
> break;
> case PRIV_B2_CHSC:
> ioinst_handle_chsc(cpu, run->s390_sieic.ipb);
> break;
> case PRIV_B2_TPI:
> /* This should have been handled by kvm already. */
> - fprintf(stderr, "Spurious tpi intercept\n");
> + error_report("Spurious tpi intercept");
> break;
> case PRIV_B2_SCHM:
> ioinst_handle_schm(cpu, env->regs[1], env->regs[2],
> @@ -2050,15 +2050,15 @@ static int handle_intercept(S390CPU *cpu)
> }
> break;
> case ICPT_SOFT_INTERCEPT:
> - fprintf(stderr, "KVM unimplemented icpt SOFT\n");
> + error_report("KVM unimplemented icpt SOFT");
> exit(1);
> break;
> case ICPT_IO:
> - fprintf(stderr, "KVM unimplemented icpt IO\n");
> + error_report("KVM unimplemented icpt IO");
> exit(1);
> break;
> default:
> - fprintf(stderr, "Unknown intercept code: %d\n", icpt_code);
> + error_report("Unknown intercept code: %d", icpt_code);
> exit(1);
> break;
> }
> @@ -2215,7 +2215,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
> ret = kvm_arch_handle_debug_exit(cpu);
> break;
> default:
> - fprintf(stderr, "Unknown KVM exit: %d\n", run->exit_reason);
> + error_report("Unknown KVM exit: %d", run->exit_reason);
> break;
> }
> qemu_mutex_unlock_iothread();
> diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
> index 293fc8428a..395872af45 100644
> --- a/target/s390x/misc_helper.c
> +++ b/target/s390x/misc_helper.c
> @@ -354,7 +354,7 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1,
> #endif
> default:
> /* unknown sigp */
> - fprintf(stderr, "XXX unknown sigp: 0x%" PRIx64 "\n", order_code);
> + error_report("XXX unknown sigp: 0x%" PRIx64 "", order_code);
> cc = SIGP_CC_NOT_OPERATIONAL;
> }
>
There might be some clashes with David's patches (haven't checked), but
that depends on what goes in first anyway. So, for the s390x parts:
Acked-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 15/47] hw/i386: Replace fprintf(stderr, "*\n" with error_report()
[not found] ` <ade26715c9bde1fe921959823de08da582fce58f.1506730372.git.alistair.francis@xilinx.com>
@ 2017-10-10 14:51 ` Anthony PERARD
0 siblings, 0 replies; 101+ messages in thread
From: Anthony PERARD @ 2017-10-10 14:51 UTC (permalink / raw)
To: Alistair Francis
Cc: qemu-devel, alistair23, armbru, Paolo Bonzini, Richard Henderson,
Eduardo Habkost, Michael S. Tsirkin, Stefano Stabellini
On Fri, Sep 29, 2017 at 05:15:46PM -0700, Alistair Francis wrote:
> 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.
[...]
> diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
> index d9ccd5d0d6..f8e3e0507b 100644
> --- a/hw/i386/xen/xen-hvm.c
> +++ b/hw/i386/xen/xen-hvm.c
> @@ -246,9 +246,10 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
>
> if (runstate_check(RUN_STATE_INMIGRATE)) {
> /* RAM already populated in Xen */
> - fprintf(stderr, "%s: do not alloc "RAM_ADDR_FMT
> - " bytes of ram at "RAM_ADDR_FMT" when runstate is INMIGRATE\n",
> - __func__, size, ram_addr);
> + error_report("%s: do not alloc "RAM_ADDR_FMT
> + " bytes of ram at "RAM_ADDR_FMT" when runstate is "
> + " INMIGRATE",
> + __func__, size, ram_addr);
> return;
> }
>
> @@ -444,8 +445,9 @@ static int xen_remove_from_physmap(XenIOState *state,
>
> rc = xen_xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn);
> if (rc) {
> - fprintf(stderr, "add_to_physmap MFN %"PRI_xen_pfn" to PFN %"
> - PRI_xen_pfn" failed: %d (errno: %d)\n", idx, gpfn, rc, errno);
> + error_report("add_to_physmap MFN %"PRI_xen_pfn" to PFN %"
> + PRI_xen_pfn" failed: %d (errno: %d)", idx,
> + gpfn, rc, errno);
> return -rc;
> }
> }
> @@ -1090,11 +1092,11 @@ static void cpu_handle_ioreq(void *opaque)
> req->data = copy.data;
>
> if (req->state != STATE_IOREQ_INPROCESS) {
> - fprintf(stderr, "Badness in I/O request ... not in service?!: "
> - "%x, ptr: %x, port: %"PRIx64", "
> - "data: %"PRIx64", count: %u, size: %u, type: %u\n",
> - req->state, req->data_is_ptr, req->addr,
> - req->data, req->count, req->size, req->type);
> + error_report("Badness in I/O request ... not in service?!: "
> + "%x, ptr: %x, port: %"PRIx64", "
> + "data: %"PRIx64", count: %u, size: %u, type: %u",
> + req->state, req->data_is_ptr, req->addr,
> + req->data, req->count, req->size, req->type);
> destroy_hvm_domain(false);
> return;
> }
> @@ -1397,16 +1399,16 @@ void destroy_hvm_domain(bool reboot)
>
> xc_handle = xc_interface_open(0, 0, 0);
> if (xc_handle == NULL) {
> - fprintf(stderr, "Cannot acquire xenctrl handle\n");
> + error_report("Cannot acquire xenctrl handle");
> } else {
> sts = xc_domain_shutdown(xc_handle, xen_domid,
> reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff);
> if (sts != 0) {
> - fprintf(stderr, "xc_domain_shutdown failed to issue %s, "
> - "sts %d, %s\n", reboot ? "reboot" : "poweroff",
> + error_report("xc_domain_shutdown failed to issue %s, "
> + "sts %d, %s", reboot ? "reboot" : "poweroff",
> sts, strerror(errno));
> } else {
> - fprintf(stderr, "Issued domain %d %s\n", xen_domid,
> + error_report("Issued domain %d %s", xen_domid,
> reboot ? "reboot" : "poweroff");
> }
> xc_interface_close(xc_handle);
> @@ -1425,7 +1427,7 @@ void xen_shutdown_fatal_error(const char *fmt, ...)
> va_start(ap, fmt);
> vfprintf(stderr, fmt, ap);
Here, we may want to replace vfprintf by error_vreport as well?
Or is it more complicated and needs its own patch to fix all call to
xen_shutdown_fatal_error?
> va_end(ap);
> - fprintf(stderr, "Will destroy the domain.\n");
> + error_report("Will destroy the domain.");
> /* destroy the domain */
> qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR);
> }
> diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c
> index baab93b614..4062af0900 100644
> --- a/hw/i386/xen/xen-mapcache.c
> +++ b/hw/i386/xen/xen-mapcache.c
> @@ -377,7 +377,7 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
> }
> }
> if (!found) {
> - fprintf(stderr, "%s, could not find %p\n", __func__, ptr);
> + error_report("%s, could not find %p", __func__, ptr);
> QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
> DPRINTF(" "TARGET_FMT_plx" -> %p is present\n", reventry->paddr_index,
> reventry->vaddr_req);
> @@ -477,9 +477,9 @@ void xen_invalidate_map_cache(void)
> if (!reventry->dma) {
> continue;
> }
> - fprintf(stderr, "Locked DMA mapping while invalidating mapcache!"
> - " "TARGET_FMT_plx" -> %p is present\n",
> - reventry->paddr_index, reventry->vaddr_req);
> + error_report("Locked DMA mapping while invalidating mapcache!"
> + " "TARGET_FMT_plx" -> %p is present",
> + reventry->paddr_index, reventry->vaddr_req);
> }
>
> for (i = 0; i < mapcache->nr_buckets; i++) {
> @@ -545,8 +545,8 @@ static uint8_t *xen_replace_cache_entry_unlocked(hwaddr old_phys_addr,
> address_index = new_phys_addr >> MCACHE_BUCKET_SHIFT;
> address_offset = new_phys_addr & (MCACHE_BUCKET_SIZE - 1);
>
> - fprintf(stderr, "Replacing a dummy mapcache entry for "TARGET_FMT_plx \
> - " with "TARGET_FMT_plx"\n", old_phys_addr, new_phys_addr);
> + error_report("Replacing a dummy mapcache entry for "TARGET_FMT_plx \
> + " with "TARGET_FMT_plx"", old_phys_addr, new_phys_addr);
>
> xen_remap_bucket(entry, entry->vaddr_base,
> cache_size, address_index, false);
> diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
> index 55769eba7e..0571871422 100644
> --- a/hw/i386/xen/xen_apic.c
> +++ b/hw/i386/xen/xen_apic.c
> @@ -10,6 +10,7 @@
> * later. See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "hw/i386/apic_internal.h"
> #include "hw/pci/msi.h"
> #include "hw/xen/xen.h"
> @@ -24,7 +25,7 @@ static void xen_apic_mem_write(void *opaque, hwaddr addr,
> uint64_t data, unsigned size)
> {
> if (size != sizeof(uint32_t)) {
> - fprintf(stderr, "Xen: APIC write data size = %d, invalid\n", size);
> + error_report("Xen: APIC write data size = %d, invalid", size);
> return;
> }
>
Despite my comment, for the Xen part:
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
--
Anthony PERARD
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 42/47] hw/xen*: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 42/47] hw/xen*: " Alistair Francis
@ 2017-10-10 15:13 ` Anthony PERARD
0 siblings, 0 replies; 101+ messages in thread
From: Anthony PERARD @ 2017-10-10 15:13 UTC (permalink / raw)
To: Alistair Francis; +Cc: qemu-devel, alistair23, armbru, Stefano Stabellini
On Fri, Sep 29, 2017 at 05:17:12PM -0700, Alistair Francis wrote:
> 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.
> diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c
> index 632a938dcc..42ada2ac05 100644
> --- a/hw/xen/xen-common.c
> +++ b/hw/xen/xen-common.c
> @@ -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);
> }
> }
> diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
> index 375efa68f6..e86d380d02 100644
> --- a/hw/xen/xen_pt.c
> +++ b/hw/xen/xen_pt.c
> @@ -73,7 +73,7 @@ void xen_pt_log(const PCIDevice *d, const char *f, ...)
>
> va_start(ap, f);
> if (d) {
> - fprintf(stderr, "[%02x:%02x.%d] ", pci_bus_num(d->bus),
> + error_report("[%02x:%02x.%d] ", pci_bus_num(d->bus),
This is only part of a line of a comment, this is going to be more
complecated that just calling error_repport, right?
> PCI_SLOT(d->devfn), PCI_FUNC(d->devfn));
> }
> vfprintf(stderr, f, ap);
The second part of the line is printed here.
> @@ -87,7 +87,7 @@ static int xen_pt_pci_config_access_check(PCIDevice *d, uint32_t addr, int len)
> /* check offset range */
> if (addr > 0xFF) {
> XEN_PT_ERR(d, "Failed to access register with offset exceeding 0xFF. "
> - "(addr: 0x%02x, len: %d)\n", addr, len);
> + "(addr: 0x%02x, len: %d)", addr, len);
If xen_pt_log is changed, there would be many more of the XEN_PT_ERR
call to change. (as well as XEN_PT_LOG and XEN_PT_WARN.)
> return -1;
> }
>
> diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c
> index 027f76fad1..f5514ffec2 100644
> --- a/hw/xenpv/xen_domainbuild.c
> +++ b/hw/xenpv/xen_domainbuild.c
> @@ -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;
> }
>
> diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
> index 69a52a9f93..44d67b87c4 100644
> --- a/hw/xenpv/xen_machine_pv.c
> +++ b/hw/xenpv/xen_machine_pv.c
> @@ -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;
> }
The rest of the patch looks good.
Thanks,
--
Anthony PERARD
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 22/47] hw/m68k: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 22/47] hw/m68k: " Alistair Francis
2017-09-30 6:42 ` Thomas Huth
@ 2017-10-16 11:25 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:25 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 30.09.2017 02:16, Alistair Francis wrote:
> 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.
[...]
> @@ -83,7 +83,7 @@ static void an5206_init(MachineState *machine)
> entry = KERNEL_LOAD_ADDR;
> }
> if (kernel_size < 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);
> + error_report("qemu: could not load kernel '%s'", kernel_filename);
I just noticed: The "qemu:" prefix should also be dropped when using
error_report() now. I can change that while applying the patch.
> exit(1);
> }
>
[...]
> diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
> index b9dde75106..2fb5037b72 100644
> --- a/hw/m68k/mcf5208.c
> +++ b/hw/m68k/mcf5208.c
> @@ -6,6 +6,7 @@
> * This code is licensed under the GPL
> */
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "qapi/error.h"
> #include "qemu-common.h"
> #include "cpu.h"
> @@ -257,7 +258,7 @@ static void mcf5208evb_init(MachineState *machine)
> mcf5208_sys_init(address_space_mem, pic);
>
> if (nb_nics > 1) {
> - fprintf(stderr, "Too many NICs\n");
> + error_report("Too many NICs");
> exit(1);
> }
> if (nd_table[0].used) {
> @@ -292,7 +293,7 @@ static void mcf5208evb_init(MachineState *machine)
> if (qtest_enabled()) {
> return;
> }
> - fprintf(stderr, "Kernel image must be specified\n");
> + error_report("Kernel image must be specified");
> exit(1);
> }
>
> @@ -309,7 +310,7 @@ static void mcf5208evb_init(MachineState *machine)
> entry = 0x40000000;
> }
> if (kernel_size < 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);
> + error_report("qemu: could not load kernel '%s'", kernel_filename);
> exit(1);
> }
dito.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 05/47] hw/arm: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 05/47] hw/arm: " Alistair Francis
2017-09-30 2:46 ` [Qemu-devel] [Qemu-arm] " Philippe Mathieu-Daudé
@ 2017-10-16 11:41 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:41 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, qemu-arm, armbru
On 30.09.2017 02:15, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: qemu-arm@nongnu.org
> ---
> V2:
> - Split hw patch into individual directories
[...]
> @@ -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("qemu: dtb file not compatible with RAM size > 4GB");
Please drop the "qemu:" prefix when using error_report() now
(here and also in all the other affected strings in this patch).
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 10/47] hw/cris: Replace fprintf(stderr, "*\n" with error_report()
2017-10-01 14:13 ` Thomas Huth
@ 2017-10-16 11:42 ` Thomas Huth
0 siblings, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:42 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru
On 01.10.2017 16:13, Thomas Huth wrote:
> On 30.09.2017 02:15, Alistair Francis wrote:
>> 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.
> [...]
>> diff --git a/hw/cris/boot.c b/hw/cris/boot.c
>> index f896ed7f86..f199a13a82 100644
>> --- a/hw/cris/boot.c
>> +++ b/hw/cris/boot.c
>> @@ -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,14 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
>> }
>>
>> if (image_size < 0) {
>> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
>> + error_report("qemu: could not load kernel '%s'",
>> li->image_filename);
>
> Put it on one line, please.
... and remove the "qemu:" prefix, please.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 17/47] hw/input: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 17/47] hw/input: " Alistair Francis
@ 2017-10-16 11:43 ` Thomas Huth
0 siblings, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:43 UTC (permalink / raw)
To: Alistair Francis, qemu-devel
Cc: alistair23, Michael S. Tsirkin, Gerd Hoffmann, armbru
On 30.09.2017 02:15, Alistair Francis wrote:
> 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.
[...]
> diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
> index c479f827b6..ff4f03e4c3 100644
> --- a/hw/input/pckbd.c
> +++ b/hw/input/pckbd.c
> @@ -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("qemu: unsupported keyboard cmd=0x%02x", (int)val);
> break;
Please drop the "qemu:" prefix from the string now here, too.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 21/47] hw/lm32: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 21/47] hw/lm32: " Alistair Francis
2017-10-01 1:48 ` Philippe Mathieu-Daudé
@ 2017-10-16 11:45 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:45 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, Michael Walle, armbru
On 30.09.2017 02:16, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: Michael Walle <michael@walle.cc>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/lm32/lm32_boards.c | 5 +++--
> hw/lm32/milkymist.c | 5 +++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
> index b0bb3ef58a..d739acf476 100644
> --- a/hw/lm32/lm32_boards.c
> +++ b/hw/lm32/lm32_boards.c
> @@ -18,6 +18,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "qemu-common.h"
> #include "cpu.h"
> #include "hw/sysbus.h"
> @@ -152,7 +153,7 @@ static void lm32_evr_init(MachineState *machine)
> }
>
> if (kernel_size < 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
> @@ -250,7 +251,7 @@ static void lm32_uclinux_init(MachineState *machine)
> }
>
> if (kernel_size < 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
> diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
> index 4db4d2d533..caa6cf4e0f 100644
> --- a/hw/lm32/milkymist.c
> +++ b/hw/lm32/milkymist.c
> @@ -18,6 +18,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "qemu-common.h"
> #include "cpu.h"
> #include "hw/sysbus.h"
> @@ -149,7 +150,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",
> + error_report("qemu: could not load Milkymist One bios '%s'",
> bios_name);
> exit(1);
> }
> @@ -188,7 +189,7 @@ milkymist_init(MachineState *machine)
> }
>
> if (kernel_size < 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> + error_report("qemu: could not load kernel '%s'",
> kernel_filename);
> exit(1);
> }
>
Please remove the "qemu:" prefixes here, too.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 24/47] hw/mips: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 24/47] hw/mips: " Alistair Francis
2017-09-30 2:36 ` Philippe Mathieu-Daudé
@ 2017-10-16 11:46 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:46 UTC (permalink / raw)
To: Alistair Francis, qemu-devel
Cc: Paul Burton, armbru, Hervé Poussineau, Yongbok Kim,
alistair23, Aurelien Jarno
On 30.09.2017 02:16, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: Paul Burton <paul.burton@imgtec.com>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Cc: Yongbok Kim <yongbok.kim@imgtec.com>
> Cc: "Hervé Poussineau" <hpoussin@reactos.org>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/mips/boston.c | 4 ++--
> hw/mips/mips_fulong2e.c | 4 ++--
> hw/mips/mips_jazz.c | 4 ++--
> hw/mips/mips_malta.c | 4 ++--
> hw/mips/mips_mipssim.c | 4 ++--
> hw/mips/mips_r4k.c | 6 +++---
> 6 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/hw/mips/boston.c b/hw/mips/boston.c
> index 776ee283e1..ee82968ea7 100644
> --- a/hw/mips/boston.c
> +++ b/hw/mips/boston.c
> @@ -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;
> }
>
> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
> index 75318680e1..34710a466c 100644
> --- a/hw/mips/mips_fulong2e.c
> +++ b/hw/mips/mips_fulong2e.c
> @@ -143,7 +143,7 @@ static int64_t load_kernel (CPUMIPSState *env)
> initrd_offset, ram_size - initrd_offset);
> }
> if (initrd_size == (target_ulong) -1) {
> - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
> + error_report("qemu: could not load initial ram disk '%s'",
> loaderparams.initrd_filename);
> exit(1);
> }
> @@ -342,7 +342,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);
> }
>
> diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
> index 7e6626dc88..6c91a940be 100644
> --- a/hw/mips/mips_jazz.c
> +++ b/hw/mips/mips_jazz.c
> @@ -271,10 +271,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("qemu: Supported NICs: dp83932");
> exit(1);
> } else {
> - fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd->model);
> + error_report("qemu: Unsupported NIC: %s", nd->model);
> exit(1);
> }
> }
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index 2adb9bcf89..d457adfa69 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -856,8 +856,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("qemu: could not load initial ram disk '%s'",
> + loaderparams.initrd_filename);
> exit(1);
> }
> }
> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
> index a092072e2a..a3d9406610 100644
> --- a/hw/mips/mips_mipssim.c
> +++ b/hw/mips/mips_mipssim.c
> @@ -101,8 +101,8 @@ static int64_t load_kernel(void)
> 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("qemu: could not load initial ram disk '%s'",
> + loaderparams.initrd_filename);
> exit(1);
> }
> }
> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
> index 1272d4ef9d..e54ce918a7 100644
> --- a/hw/mips/mips_r4k.c
> +++ b/hw/mips/mips_r4k.c
> @@ -121,8 +121,8 @@ static int64_t load_kernel(void)
> ram_size - initrd_offset);
> }
> if (initrd_size == (target_ulong) -1) {
> - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
> - loaderparams.initrd_filename);
> + error_report("qemu: could not load initial ram disk '%s'",
> + loaderparams.initrd_filename);
> exit(1);
> }
> }
> @@ -246,7 +246,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("qemu: Error registering flash memory.");
> }
> } else if (!qtest_enabled()) {
> /* not fatal */
>
Please remove the "qemu:" prefixes from the strings here, too.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 26/47] hw/moxie: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 26/47] hw/moxie: " Alistair Francis
2017-10-01 1:46 ` Philippe Mathieu-Daudé
@ 2017-10-16 11:47 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:47 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, Anthony Green, armbru
On 30.09.2017 02:16, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: Anthony Green <green@moxielogic.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/moxie/moxiesim.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
> index 5ea8dd3a93..5916f86c68 100644
> --- a/hw/moxie/moxiesim.c
> +++ b/hw/moxie/moxiesim.c
> @@ -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,7 +62,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params)
> 0, 0);
>
> if (kernel_size <= 0) {
> - fprintf(stderr, "qemu: could not load kernel '%s'\n",
> + error_report("qemu: could not load kernel '%s'",
> loader_params->kernel_filename);
> exit(1);
> }
> @@ -85,8 +86,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params)
> ram_size);
> }
> if (initrd_size == (target_ulong)-1) {
> - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
> - loader_params->initrd_filename);
> + error_report("qemu: could not load initial ram disk '%s'",
> + loader_params->initrd_filename);
> exit(1);
> }
> }
Please remove the "qemu:" prefixes from the strings here, too.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 30/47] hw/openrisc: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 30/47] hw/openrisc: " Alistair Francis
2017-09-30 19:05 ` Stafford Horne
@ 2017-10-16 11:50 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:50 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, Stafford Horne, armbru, Jia Liu
On 30.09.2017 02:16, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: Jia Liu <proljc@gmail.com>
> Cc: Stafford Horne <shorne@gmail.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/openrisc/openrisc_sim.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
> index 86bf2849c4..44a6d115dd 100644
> --- a/hw/openrisc/openrisc_sim.c
> +++ b/hw/openrisc/openrisc_sim.c
> @@ -19,6 +19,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "qapi/error.h"
> #include "qemu-common.h"
> #include "cpu.h"
> @@ -87,7 +88,7 @@ static void cpu_openrisc_load_kernel(ram_addr_t ram_size,
> }
>
> if (kernel_size < 0) {
> - fprintf(stderr, "QEMU: couldn't load the kernel '%s'\n",
> + error_report("QEMU: couldn't load the kernel '%s'",
> kernel_filename);
Please remove the "QEMU:" prefix here as well.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 32/47] hw/ppc: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 32/47] hw/ppc: " Alistair Francis
2017-10-04 6:11 ` David Gibson
@ 2017-10-16 11:53 ` Thomas Huth
1 sibling, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:53 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, qemu-ppc, armbru
On 30.09.2017 02:16, Alistair Francis wrote:
> 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.
[...]
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index db0e49ab8f..8a5350161f 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
[...]
> @@ -967,7 +967,7 @@ 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",
> + error_report("qemu: could not load kernel '%s'",
> machine->kernel_filename);
> exit(1);
> }
> @@ -982,8 +982,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("qemu: could not load initial ram disk '%s'",
> + machine->initrd_filename);
> exit(1);
> }
>
> @@ -1024,7 +1024,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("qemu: could not load firmware '%s'", filename);
> exit(1);
> }
> }
Please remove the "qemu:" prefix from the strings here, too.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 33/47] hw/s390x: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 33/47] hw/s390x: " Alistair Francis
@ 2017-10-16 11:55 ` Thomas Huth
0 siblings, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:55 UTC (permalink / raw)
To: Alistair Francis, qemu-devel; +Cc: alistair23, armbru, qemu-s390x
On 30.09.2017 02:16, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/s390x/virtio-ccw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index 62d69aa30b..e5b3cc0005 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -468,7 +468,7 @@ 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",
> + error_report("Guest bug: features[%i]=%x (expected 0)",
> features.index, features.features);
> /* XXX: do a unit check here? */
> }
Sounds like this should rather be a qemu_log_mask(LOG_GUEST_ERROR, ...)
instead?
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 36/47] hw/sh4: Replace fprintf(stderr, "*\n" with error_report()
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 36/47] hw/sh4: " Alistair Francis
@ 2017-10-16 11:56 ` Thomas Huth
0 siblings, 0 replies; 101+ messages in thread
From: Thomas Huth @ 2017-10-16 11:56 UTC (permalink / raw)
To: Alistair Francis, qemu-devel
Cc: alistair23, Magnus Damm, armbru, Aurelien Jarno
On 30.09.2017 02:16, Alistair Francis wrote:
> 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 <alistair.francis@xilinx.com>
> Cc: Magnus Damm <magnus.damm@gmail.com>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/sh4/r2d.c | 9 ++++----
> hw/sh4/sh7750.c | 64 +++++++++++++++++++++++++++++----------------------------
> 2 files changed, 38 insertions(+), 35 deletions(-)
>
> diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
> index 16b9ed2db2..a010f559e2 100644
> --- a/hw/sh4/r2d.c
> +++ b/hw/sh4/r2d.c
> @@ -24,6 +24,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "qapi/error.h"
> #include "qemu-common.h"
> #include "cpu.h"
> @@ -319,8 +320,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("qemu: could not load kernel '%s'", kernel_filename);
> + exit(1);
> }
>
> /* initialization which should be done by firmware */
> @@ -339,8 +340,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("qemu: could not load initrd '%s'", initrd_filename);
> + exit(1);
> }
Please remove the "qemu:" prefix here as well.
Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
* Re: [Qemu-devel] [PATCH v2 07/47] hw/bt: Replace fprintf(stderr, "*\n" with error_report()
2017-10-01 14:06 ` Thomas Huth
@ 2017-10-17 18:32 ` Alistair Francis
0 siblings, 0 replies; 101+ messages in thread
From: Alistair Francis @ 2017-10-17 18:32 UTC (permalink / raw)
To: Thomas Huth
Cc: Alistair Francis, qemu-devel@nongnu.org Developers, Markus Armbruster
On Sun, Oct 1, 2017 at 7:06 AM, Thomas Huth <thuth@redhat.com> wrote:
> On 30.09.2017 02:15, Alistair Francis wrote:
>> 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.
> [...]
>> diff --git a/hw/bt/core.c b/hw/bt/core.c
>> index c1806b71a3..a6e9bf2a3e 100644
>> --- a/hw/bt/core.c
>> +++ b/hw/bt/core.c
>> @@ -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,24 @@ 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__);
>
> I think these lines should now also easily fit into one line only.
>
>> 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,7 +114,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", __func__,
>> + error_report("%s: bad bt device \"%s\"", __func__,
>> dev->lmp_name ?: "(null)");
>
> Bad indentation of the second line.
>
>> exit(-1);
>> }
>> diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
>> index ac067b81f6..6a171a54b7 100644
>> --- a/hw/bt/hci-csr.c
>> +++ b/hw/bt/hci-csr.c
>> @@ -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,8 +169,8 @@ 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__,
>> + 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]);
>
> Bad indentation again.
>
>> }
>> @@ -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;
>> }
>>
>> diff --git a/hw/bt/hci.c b/hw/bt/hci.c
>> index df05f07887..ac9394daf0 100644
>> --- a/hw/bt/hci.c
>> +++ b/hw/bt/hci.c
>> @@ -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,7 +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",
>> + error_report("%s: HCI event params too long (%ib)",
>> __func__, len);
>
> Bad indentation again - or even better: Put it into one line only.
>
>> exit(-1);
>> }
>> @@ -589,7 +590,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", __func__,
>> + error_report("%s: bad inquiry mode %02x", __func__,
>> hci->lm.inquiry_mode);
>
> Bad indentation.
>
>> exit(-1);
>> }
>> @@ -1971,7 +1972,7 @@ static void bt_submit_hci(struct HCIInfo *info,
>> break;
>>
>> short_hci:
>> - fprintf(stderr, "%s: HCI packet too short (%iB)\n",
>> + error_report("%s: HCI packet too short (%iB)",
>> __func__, length);
>
> One line, please.
>
>> bt_hci_event_status(hci, HCI_INVALID_PARAMETERS);
>> break;
>> @@ -1991,7 +1992,7 @@ 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",
>> + error_report("%s: can't take ACL packets %i bytes long",
>> __func__, len);
>
> Fix indentation or put it on one line.
>
>> return;
>> }
>> @@ -2029,7 +2030,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",
>> + error_report("%s: ACL packet too short (%iB)",
>> __func__, length);
>
> One line.
>
>> return;
>> }
>> @@ -2041,15 +2042,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);
>
> One line.
>
>> /* TODO: signal an error */
>> return;
>> }
>> handle &= ~HCI_HANDLE_OFFSET;
>>
>> if (datalen > length) {
>> - fprintf(stderr, "%s: ACL packet too short (%iB < %iB)\n",
>> + fprintf(stderr, "%s: ACL packet too short (%iB < %iB)",
>> __func__, length, datalen);
>
> script failure?
>
>> return;
>> }
>> @@ -2060,7 +2061,7 @@ 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",
>> + error_report("%s: Bad handle %03x in Active Slave Broadcast",
>> __func__, handle);
>
> Indentation.
>
> etc.
>
> Please have a look at all the hunks in this patch before you submit it
>again!
Thanks for going through these.
I did try to review the changes, but there are just so many it's
really difficult to catch them all.
Thanks,
Alistair
>
> Thomas
^ permalink raw reply [flat|nested] 101+ messages in thread
end of thread, other threads:[~2017-10-17 18:32 UTC | newest]
Thread overview: 101+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-30 0:14 [Qemu-devel] [PATCH v2 00/47] Remove some of the fprintf(stderr, "* Alistair Francis
2017-09-30 0:14 ` [Qemu-devel] [PATCH v2 01/47] Replace all occurances of __FUNCTION__ with __func__ Alistair Francis
2017-09-30 0:14 ` Alistair Francis
2017-10-02 14:11 ` Stefan Hajnoczi
2017-10-02 14:11 ` [Qemu-devel] " Stefan Hajnoczi
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 02/47] Fixes after renaming __FUNCTION__ to __func__ Alistair Francis
2017-09-30 6:31 ` Thomas Huth
2017-10-02 14:00 ` Eric Blake
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 03/47] audio: Replace AUDIO_FUNC with __func__ Alistair Francis
2017-09-30 6:35 ` Thomas Huth
2017-10-02 14:08 ` Eric Blake
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 04/47] tests: Replace fprintf(stderr, "*\n" with error_report() Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 05/47] hw/arm: " Alistair Francis
2017-09-30 2:46 ` [Qemu-devel] [Qemu-arm] " Philippe Mathieu-Daudé
2017-10-16 11:41 ` [Qemu-devel] " Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 06/47] hw/block: " Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 07/47] hw/bt: " Alistair Francis
2017-10-01 14:06 ` Thomas Huth
2017-10-17 18:32 ` Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 08/47] hw/char: " Alistair Francis
2017-10-01 14:09 ` Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 09/47] hw/core: " Alistair Francis
2017-10-01 1:56 ` Philippe Mathieu-Daudé
2017-10-01 14:11 ` Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 10/47] hw/cris: " Alistair Francis
2017-10-01 14:13 ` Thomas Huth
2017-10-16 11:42 ` Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 11/47] hw/display: " Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 12/47] hw/dma: " Alistair Francis
2017-10-01 1:55 ` Philippe Mathieu-Daudé
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 13/47] hw/gpio: " Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 14/47] hw/i2c: " Alistair Francis
2017-10-01 1:52 ` Philippe Mathieu-Daudé
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 16/47] hw/ide: " Alistair Francis
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 17/47] hw/input: " Alistair Francis
2017-10-16 11:43 ` Thomas Huth
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 18/47] hw/intc: " Alistair Francis
2017-10-04 7:34 ` Cornelia Huck
2017-09-30 0:15 ` [Qemu-devel] [PATCH v2 19/47] hw/ipmi: " Alistair Francis
2017-10-01 1:50 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 20/47] hw/isa: " Alistair Francis
2017-10-01 1:48 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 21/47] hw/lm32: " Alistair Francis
2017-10-01 1:48 ` Philippe Mathieu-Daudé
2017-10-16 11:45 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 22/47] hw/m68k: " Alistair Francis
2017-09-30 6:42 ` Thomas Huth
2017-10-16 11:25 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 23/47] hw/microblaze: " Alistair Francis
2017-09-30 2:43 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 24/47] hw/mips: " Alistair Francis
2017-09-30 2:36 ` Philippe Mathieu-Daudé
2017-10-16 11:46 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 25/47] hw/misc: " Alistair Francis
2017-10-01 1:47 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 26/47] hw/moxie: " Alistair Francis
2017-10-01 1:46 ` Philippe Mathieu-Daudé
2017-10-16 11:47 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 27/47] hw/net: " Alistair Francis
2017-10-01 1:46 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 28/47] hw/nios2: " Alistair Francis
2017-09-30 2:39 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 29/47] hw/nvram: " Alistair Francis
2017-09-30 6:50 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 30/47] hw/openrisc: " Alistair Francis
2017-09-30 19:05 ` Stafford Horne
2017-10-16 11:50 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 31/47] hw/pci*: " Alistair Francis
2017-10-01 1:43 ` Philippe Mathieu-Daudé
2017-10-01 8:11 ` Marcel Apfelbaum
2017-10-02 18:15 ` Alistair Francis
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 32/47] hw/ppc: " Alistair Francis
2017-10-04 6:11 ` David Gibson
2017-10-16 11:53 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 33/47] hw/s390x: " Alistair Francis
2017-10-16 11:55 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 34/47] hw/scsi: " Alistair Francis
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 35/47] hw/sd: " Alistair Francis
2017-10-01 1:41 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 36/47] hw/sh4: " Alistair Francis
2017-10-16 11:56 ` Thomas Huth
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 37/47] hw/sparc*: " Alistair Francis
2017-09-30 2:40 ` Philippe Mathieu-Daudé
2017-09-30 0:16 ` [Qemu-devel] [PATCH v2 38/47] hw/ssi: " Alistair Francis
2017-10-01 1:38 ` Philippe Mathieu-Daudé
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 39/47] hw/timer: " Alistair Francis
2017-10-01 1:37 ` Philippe Mathieu-Daudé
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 40/47] hw/usb: " Alistair Francis
2017-10-01 1:36 ` Philippe Mathieu-Daudé
2017-10-01 14:16 ` Thomas Huth
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 41/47] hw/watchdog: " Alistair Francis
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 42/47] hw/xen*: " Alistair Francis
2017-10-10 15:13 ` Anthony PERARD
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 43/47] util: " Alistair Francis
2017-09-30 2:43 ` Philippe Mathieu-Daudé
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 44/47] ui: " Alistair Francis
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 45/47] tcg: " Alistair Francis
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 46/47] target: Use qemu_log() instead of fprintf(stderr, ...) Alistair Francis
2017-09-30 0:17 ` [Qemu-devel] [PATCH v2 47/47] target: Replace fprintf(stderr, "*\n" with error_report() Alistair Francis
2017-10-04 7:41 ` Cornelia Huck
[not found] ` <ade26715c9bde1fe921959823de08da582fce58f.1506730372.git.alistair.francis@xilinx.com>
2017-10-10 14:51 ` [Qemu-devel] [PATCH v2 15/47] hw/i386: " Anthony PERARD
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.