Skip to content

Remove some of the fprintf(stderr, "*

Markus Armbruster qemu-arm qemu-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v8 Latest14 patches 8 repliesIn review
  2. v715 patches 11 repliesSuperseded

Changes in v8 from the cover letter

* Cover letter: add warning about weakness of my filter script, ask reviewers to look out for unwanted stuff
* PATCH v7 12 dropped [Philippe]
* PATCH 02,09: Trailing punctuation in error messages trimmed [Eric]
* PATCH 10: Commit message replaced
* PATCH 14: Bogus submodule change dropped [Eric]

Patches in v8 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14audio: Replace AUDIO_FUNC with __func__audio/alsaaudio.c audio/audio.c audio/audio_int.h +8 more+85 -930 replies
2/14hw/arm: Replace fprintf(stderr, "*\n" with error_report()hw/arm/armv7m.c hw/arm/boot.c hw/arm/gumstix.c +8 more+38 -330 replies
3/14hw/dma: Replace fprintf(stderr, "*\n" with error_report()hw/dma/soc_dma.c+18 -180 replies
4/14hw/lm32: Replace fprintf(stderr, "*\n" with error_report()hw/lm32/lm32_boards.c hw/lm32/milkymist.c+6 -80 replies
5/14hw/mips: Replace fprintf(stderr, "*\n" with error_report()hw/mips/mips_fulong2e.c hw/mips/mips_jazz.c hw/mips/mips_malta.c +2 more+27 -330 replies
6/14hw/moxie: Replace fprintf(stderr, "*\n" with error_report()hw/moxie/moxiesim.c+6 -70 replies
7/14hw/openrisc: Replace fprintf(stderr, "*\n" with error_report()hw/openrisc/openrisc_sim.c+2 -20 replies
8/14hw/pci*: Replace fprintf(stderr, "*\n" with error_report()hw/pci-host/bonito.c hw/pci/pci.c+5 -50 replies
9/14hw/ppc: Replace fprintf(stderr, "*\n" with error_report()hw/ppc/e500.c hw/ppc/mac_newworld.c hw/ppc/mac_oldworld.c +4 more+28 -311 reply
10/14hw/sd: Replace fprintf(stderr, "*\n" with DPRINTF()hw/sd/sd.c+4 -30 replies
11/14hw/sparc*: Replace fprintf(stderr, "*\n" with error_report()hw/sparc/leon3.c hw/sparc/sun4m.c hw/sparc64/niagara.c +1 more+21 -250 replies
12/14hw/xen*: Replace fprintf(stderr, "*\n" with error_report()hw/xen/xen-common.c hw/xenpv/xen_machine_pv.c+8 -60 replies
13/14tcg: Replace fprintf(stderr, "*\n" with error_report()cpus.c exec.c vl.c+9 -91 reply
14/14target: Use qemu_log() instead of fprintf(stderr, ...)target/cris/translate.c target/ppc/translate.c target/sh4/translate.c +1 more+14 -336 replies

Reviews trailers per patch

All 14 patches have a Reviewed-by or Acked-by.

PatchPhilippe Mathieu-DaudéStafford HorneMichael WalleThomas HuthMark Cave-AylandEric BlakeGerd Hoffmann
1/14R-b R-b R-b R-b
2/14R-b R-b
3/14R-b
4/14R-b R-b A-b
5/14R-b
6/14R-b R-b R-b
7/14R-b R-b A-b
8/14R-b
9/14R-b R-b
10/14R-b
11/14R-b R-b A-b
12/14R-b
13/14R-b R-b
14/14R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 7 reviewers.

Read the v8 thread

Cover letter [Qemu-devel] [PATCH v8 00/14] Remove some of the fprintf(stderr, "*

This is my attempt to salvage a good part of Alistair's error reporting cleanup series

[PATCH v6 00/29] Remove some of the fprintf(stderr, "*

Continue on improving QEMUs logging/error messages by removing more fprintf()'s.

Unfortunatley my Coccinelle skills aren't that great so it's all done in some nasty regex and a little bit of manual work.

It foundered on the problem that some of its fprintf() to error_report() conversions are inappropriate, see

    Message-ID: <[email protected]>
    https://lists.gnu.org/archive/html/qemu-devel/2017-12/msg04961.html

Alistair didn't feel like checking about one hundred conversions by hand, which is understandable. But letting the work go to waste would be a shame, so I wrote an AWK script (see below) to extract a common kind of obviously good conversions: the ones where the fprintf() is followed by exit(). Judging from the diffstat, this salvages more than half of his conversion work. The script is not foolproof: it keeps patch hunks containing "good" or no conversions. Unwanted stuff could conceivably hide there. Please review for that.

v8:
* Cover letter: add warning about weakness of my filter script, ask reviewers to look out for unwanted stuff
* PATCH v7 12 dropped [Philippe]
* PATCH 02,09: Trailing punctuation in error messages trimmed [Eric]
* PATCH 10: Commit message replaced
* PATCH 14: Bogus submodule change dropped [Eric]

v7:
* Old PATCH 02,03,21 are already in master, drop
* Conversions not obviously followed by exit() dropped Nothing left in old PATCH 06-12,16,17,22, drop R-bys dropped
* Rebased, trivial conflict in the last patch resolved

#!/usr/bin/awk -f

hunk && /^\+[ \t]*error_report/ {
n++
er_indent = match(substr($0, 2), /[^ \t]/)
er_nr = NR
plus = 0
fatal = 0
}

hunk && er_indent && /^\+/ {
    plus++
}

hunk && er_indent && /^[ \t]*exit/ {
d = NR - er_nr - plus
if (maxd < d)
maxd = d
fatal = 1
}

hunk && er_indent && match(substr($0, 2), /[^ \t]/) < er_indent {
if (fatal)
nf++
er_indent = 0
}

hunk && /^[-+ ]/ {
    hunk = hunk "\n" $0
    next
}
hunk {
    if (n && nf && n != nf)
	print loc, "mixed hunk", n, nf >"/dev/stderr"
    else if (n && !nf)
	print loc, "non-fatal hunk", n, nf >"/dev/stderr"
    else if (!n || nf)
	print hunk
    hunk = ""
}
/^@@ / {
    hunk = $0
    loc = FILENAME ":" FNR ":"
    n = nf = 0
    next
}

{
print
}

END {
print "max distance", maxd+0 >"/dev/stderr"
}

Alistair Francis (14):
audio: Replace AUDIO_FUNC with __func__
hw/arm: Replace fprintf(stderr, "*\n" with error_report() hw/dma: Replace fprintf(stderr, "*\n" with error_report() hw/lm32: Replace fprintf(stderr, "*\n" with error_report() hw/mips: Replace fprintf(stderr, "*\n" with error_report() hw/moxie: Replace fprintf(stderr, "*\n" with error_report() hw/openrisc: Replace fprintf(stderr, "*\n" with error_report() hw/pci*: Replace fprintf(stderr, "*\n" with error_report() hw/ppc: Replace fprintf(stderr, "*\n" with error_report() hw/sd: Replace fprintf(stderr, "*\n" with DPRINTF() hw/sparc*: Replace fprintf(stderr, "*\n" with error_report() hw/xen*: Replace fprintf(stderr, "*\n" with error_report()
tcg: Replace fprintf(stderr, "*\n" with error_report()
target: Use qemu_log() instead of fprintf(stderr, ...)

 audio/alsaaudio.c            |  4 ++--
 audio/audio.c                | 40 +++++++++++++++----------------
 audio/audio_int.h            |  6 -----
 audio/audio_pt_int.c         | 28 +++++++++++-----------
 audio/audio_template.h       | 26 ++++++++++----------
 audio/dsoundaudio.c          |  2 +-
 audio/mixeng.c               |  2 +-
 audio/ossaudio.c             | 10 ++++----
 audio/paaudio.c              | 56 ++++++++++++++++++++++----------------------
 audio/sdlaudio.c             |  2 +-
 audio/wavaudio.c             |  2 +-
 cpus.c                       | 10 ++++----
 exec.c                       |  6 ++---
 hw/arm/armv7m.c              |  2 +-
 hw/arm/boot.c                | 16 ++++++-------
 hw/arm/gumstix.c             | 13 +++++-----
 hw/arm/mainstone.c           |  7 +++---
 hw/arm/musicpal.c            |  2 +-
 hw/arm/omap1.c               |  5 ++--
 hw/arm/omap2.c               |  3 ++-
 hw/arm/omap_sx1.c            |  2 +-
 hw/arm/pxa2xx.c              |  7 +++---
 hw/arm/vexpress.c            |  8 +++----
 hw/arm/z2.c                  |  6 ++---
 hw/dma/soc_dma.c             | 36 ++++++++++++++--------------
 hw/lm32/lm32_boards.c        |  7 +++---
 hw/lm32/milkymist.c          |  7 +++---
 hw/mips/mips_fulong2e.c      | 13 +++++-----
 hw/mips/mips_jazz.c          |  4 ++--
 hw/mips/mips_malta.c         | 16 ++++++-------
 hw/mips/mips_mipssim.c       | 11 ++++-----
 hw/mips/mips_r4k.c           | 16 ++++++-------
 hw/moxie/moxiesim.c          | 13 +++++-----
 hw/openrisc/openrisc_sim.c   |  4 ++--
 hw/pci-host/bonito.c         |  6 ++---
 hw/pci/pci.c                 |  4 ++--
 hw/ppc/e500.c                | 16 ++++++-------
 hw/ppc/mac_newworld.c        |  2 +-
 hw/ppc/mac_oldworld.c        |  2 +-
 hw/ppc/ppc405_boards.c       | 15 +++++-------
 hw/ppc/ppc440_bamboo.c       | 16 ++++++-------
 hw/ppc/prep.c                |  4 ++--
 hw/ppc/virtex_ml507.c        |  4 ++--
 hw/sd/sd.c                   |  7 +++---
 hw/sparc/leon3.c             | 16 ++++++-------
 hw/sparc/sun4m.c             | 16 ++++++-------
 hw/sparc64/niagara.c         |  4 ++--
 hw/sparc64/sun4u.c           | 10 ++++----
 hw/xen/xen-common.c          |  5 ++--
 hw/xenpv/xen_machine_pv.c    |  9 +++----
 target/cris/translate.c      |  2 +-
 target/ppc/translate.c       | 36 ++++++++--------------------
 target/sh4/translate.c       |  7 ++----
 target/unicore32/translate.c |  2 +-
 vl.c                         |  2 +-
 55 files changed, 271 insertions(+), 306 deletions(-)
Signature · 1 line
2.13.6