[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 99e98d: qemu-io: Use error_[gs]et_progname()
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 99e98d: qemu-io: Use error_[gs]et_progname() |
|
Date: |
Wed, 24 Apr 2019 05:09:55 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 99e98d7c9fc1a1639fad2c638733b02f4b43aebe
https://github.com/qemu/qemu/commit/99e98d7c9fc1a1639fad2c638733b02f4b43aebe
Author: Christophe Fergeau <address@hidden>
Date: 2019-04-17 (Wed, 17 Apr 2019)
Changed paths:
M qemu-io.c
Log Message:
-----------
qemu-io: Use error_[gs]et_progname()
qemu-io reimplements itself what
error_get_progname()/error_set_progname() already does.
This commit switches it to use this API from qemu-error.h
Signed-off-by: Christophe Fergeau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Commit: f5852efa293e1dc240cdfde30b42cea1f780a1f2
https://github.com/qemu/qemu/commit/f5852efa293e1dc240cdfde30b42cea1f780a1f2
Author: Christophe Fergeau <address@hidden>
Date: 2019-04-17 (Wed, 17 Apr 2019)
Changed paths:
M bsd-user/main.c
M include/qemu/error-report.h
M linux-user/main.c
M qemu-img.c
M qemu-io.c
M qemu-nbd.c
M scsi/qemu-pr-helper.c
M util/qemu-error.c
M vl.c
Log Message:
-----------
log: Make glib logging go through QEMU
This commit adds a error_init() helper which calls
g_log_set_default_handler() so that glib logs (g_log, g_warning, ...)
are handled similarly to other QEMU logs. This means they will get a
timestamp if timestamps are enabled, and they will go through the
HMP monitor if one is configured.
This commit also adds a call to error_init() to the binaries
installed by QEMU. Since error_init() also calls error_set_progname(),
this means that *-linux-user, *-bsd-user and qemu-pr-helper messages
output with error_report, info_report, ... will slightly change: they
will be prefixed by the binary name.
glib debug messages are enabled through G_MESSAGES_DEBUG similarly to
the glib default log handler.
At the moment, this change will mostly impact SPICE logging if your
spice version is >= 0.14.1. With older spice versions, this is not going
to work as expected, but will not have any ill effect, so this call is
not conditional on the SPICE version.
Signed-off-by: Christophe Fergeau <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Commit: 4c8b7c8b255061ce264df21a55f69a1318d45654
https://github.com/qemu/qemu/commit/4c8b7c8b255061ce264df21a55f69a1318d45654
Author: Markus Armbruster <address@hidden>
Date: 2019-04-17 (Wed, 17 Apr 2019)
Changed paths:
M util/error.c
Log Message:
-----------
error: Fix error_report_err(), warn_report_err() hint printing
Before the from qerror_report() to error_setg(), hints looked like
this:
qerror_report(QERR_MACRO, ... arguments ...);
error_printf_unless_qmp(... hint ...);
error_printf_unless_qmp() made perfect sense: it printed exactly when
qerror_report() did.
After the conversion to error_setg():
error_setg(errp, QERR_MACRO, ... arguments ...);
error_printf_unless_qmp(... hint ...);
The "unless QMP part" still made some sense; in QMP context, the
caller generally uses the error as QMP response instead of printing
it.
However, everything else is wrong. If the caller handles the error,
the hint gets printed anyway (unless QMP). If the caller reports the
error, the hint gets printed *before* the report (unless QMP) or not
at all (if QMP).
Commit 50b7b000c91 fixed this by making hints a member of Error. It
kept printing hints with error_printf_unless_qmp():
void error_report_err(Error *err)
{
error_report("%s", error_get_pretty(err));
+ if (err->hint) {
+ error_printf_unless_qmp("%s\n", err->hint->str);
+ }
error_free(err);
}
This is wrong. We should (and now can) print the hint exactly when we
print the error.
The mistake has since been copied to warn_report_err() in commit
e43ead1d0b9.
Fix both to use error_printf().
Reported-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Cc: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
[Commit message tweaked]
Commit: b922c0506ad557b98ded1a0c7259844738a86e78
https://github.com/qemu/qemu/commit/b922c0506ad557b98ded1a0c7259844738a86e78
Author: Vladimir Sementsov-Ogievskiy <address@hidden>
Date: 2019-04-17 (Wed, 17 Apr 2019)
Changed paths:
M util/error.c
Log Message:
-----------
util/error: do not free error on error_abort
It would be nice to have Error object not freed away when debugging a
coredump.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
[error_printf_unless_qmp() replaced by error_printf()]
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Commit: e9e1d92d1d8f0bce81a1f25cfeeda9c7374b6ab5
https://github.com/qemu/qemu/commit/e9e1d92d1d8f0bce81a1f25cfeeda9c7374b6ab5
Author: Markus Armbruster <address@hidden>
Date: 2019-04-17 (Wed, 17 Apr 2019)
Changed paths:
M qemu-img.c
Log Message:
-----------
qemu-img: Use error_vreport() in error_exit()
error_exit() uses low-level error_printf() to report errors.
Modernize it to use error_vreport().
Cc: Kevin Wolf <address@hidden>
Cc: Max Reitz <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Commit: 6b3048cee0e0eccd27b62954ecc57c4a1bceb976
https://github.com/qemu/qemu/commit/6b3048cee0e0eccd27b62954ecc57c4a1bceb976
Author: Markus Armbruster <address@hidden>
Date: 2019-04-17 (Wed, 17 Apr 2019)
Changed paths:
M block/ssh.c
M block/trace-events
Log Message:
-----------
block/ssh: Do not report read/write/flush errors to the user
Callbacks ssh_co_readv(), ssh_co_writev(), ssh_co_flush() report
errors to the user with error_printf(). They shouldn't, it's their
caller's job. Replace by a suitable trace point. While there, drop
the unreachable !s->sftp case.
Perhaps we should convert this part of the block driver interface to
Error, so block drivers can pass more detail to their callers. Not
today.
Cc: "Richard W.M. Jones" <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Max Reitz <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Commit: 3eb99edb4800831ed36fa38e095d3fe98b2c1124
https://github.com/qemu/qemu/commit/3eb99edb4800831ed36fa38e095d3fe98b2c1124
Author: Markus Armbruster <address@hidden>
Date: 2019-04-17 (Wed, 17 Apr 2019)
Changed paths:
M hw/core/loader-fit.c
Log Message:
-----------
loader-fit: Wean off error_printf()
load_fit() reports errors with error_printf() instead of
error_report(). Worse, it even reports errors it actually recovers
from, in fit_cfg_compatible() and fit_load_fdt(). Messed up in
initial commit 51b58561c1d.
Convert the helper functions for load_fit() to Error. Make sure each
failure path sets an error.
Fix fit_cfg_compatible() and fit_load_fdt() not to report errors they
actually recover from.
Convert load_fit() to error_report().
Cc: Paul Burton <address@hidden>
Cc: Aleksandar Rikalo <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Commit: 036a26046f9e46021aad21b41011584cf57a3f8f
https://github.com/qemu/qemu/commit/036a26046f9e46021aad21b41011584cf57a3f8f
Author: Markus Armbruster <address@hidden>
Date: 2019-04-17 (Wed, 17 Apr 2019)
Changed paths:
M hw/mips/boston.c
Log Message:
-----------
mips/boston: Report errors with error_report(), not error_printf()
Cc: Paul Burton <address@hidden>
Cc: Aleksandar Rikalo <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Commit: eaf27fab2185290cbfa586af959b12e82cdde1f4
https://github.com/qemu/qemu/commit/eaf27fab2185290cbfa586af959b12e82cdde1f4
Author: Markus Armbruster <address@hidden>
Date: 2019-04-17 (Wed, 17 Apr 2019)
Changed paths:
M hw/pci/pci.c
Log Message:
-----------
pci: Report fatal errors with error_report(), not error_printf()
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Marcel Apfelbaum <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Message-Id: <address@hidden>
Commit: d081cedd688d75863a32e567f68f972ce570e0d9
https://github.com/qemu/qemu/commit/d081cedd688d75863a32e567f68f972ce570e0d9
Author: Markus Armbruster <address@hidden>
Date: 2019-04-17 (Wed, 17 Apr 2019)
Changed paths:
M hw/timer/hpet.c
Log Message:
-----------
hpet: Report warnings with warn_report(), not error_printf()
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Commit: 8f8f588565de871107099eb447b64f8829464ca8
https://github.com/qemu/qemu/commit/8f8f588565de871107099eb447b64f8829464ca8
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M hw/vfio/pci.c
Log Message:
-----------
vfio: Report warnings with warn_report(), not error_printf()
Cc: Alex Williamson <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Acked-by: Alex Williamson <address@hidden>
Commit: 5ab77f9aa3994aeafce2003f0dd234b85fe049b0
https://github.com/qemu/qemu/commit/5ab77f9aa3994aeafce2003f0dd234b85fe049b0
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M target/s390x/kvm.c
Log Message:
-----------
s390x/kvm: Report warnings with warn_report(), not error_printf()
kvm_s390_mem_op() can fail in two ways: when !cap_mem_op, it returns
-ENOSYS, and when kvm_vcpu_ioctl() fails, it returns -errno set by
ioctl(). Its caller s390_cpu_virt_mem_rw() recovers from both
failures.
kvm_s390_mem_op() prints "KVM_S390_MEM_OP failed" with error_printf()
in the latter failure mode. Since this is obviously a warning, use
warn_report().
Perhaps the reporting should be left to the caller. It could warn on
failure other than -ENOSYS.
Cc: Thomas Huth <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Commit: 26eaf2cd0dd31d7bdb2a5ac53f32a051754b0c30
https://github.com/qemu/qemu/commit/26eaf2cd0dd31d7bdb2a5ac53f32a051754b0c30
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M vl.c
Log Message:
-----------
vl: Make -machine $TYPE,help and -accel help print to stdout
Command line help help explicitly requested by the user should be
printed to stdout, not stderr. We do elsewhere. Adjust -machine
$TYPE,help and -accel help to match: use printf() instead of
error_printf().
Cc: Marcel Apfelbaum <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Message-Id: <address@hidden>
Commit: 679cb8e1a1e5d10f44ac9e40fe1458cbfd720ebb
https://github.com/qemu/qemu/commit/679cb8e1a1e5d10f44ac9e40fe1458cbfd720ebb
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M include/monitor/monitor.h
M include/qemu/error-report.h
M monitor.c
M stubs/error-printf.c
M util/qemu-error.c
Log Message:
-----------
monitor error: Make printf()-like functions return a value
printf() & friends return the number of characters written on success,
negative value on error.
monitor_printf(), monitor_vfprintf(), monitor_vprintf(),
error_printf(), error_printf_unless_qmp(), error_vprintf(), and
error_vprintf_unless_qmp() return void. Some of them carry a TODO
comment asking for int instead.
Improve them to return int like printf() does.
This makes our use of monitor_printf() as fprintf_function slightly
less dirty: the function cast no longer adds a return value that isn't
there. It still changes a parameter's pointer type. That will be
addressed in a future commit.
monitor_vfprintf() always returns zero. Improve it to return the
proper value.
Cc: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: 637de4dba268395f7f2e58e40349468c5e17c060
https://github.com/qemu/qemu/commit/637de4dba268395f7f2e58e40349468c5e17c060
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M MAINTAINERS
A include/qemu/qemu-print.h
M stubs/monitor.c
M tests/test-util-sockets.c
M util/Makefile.objs
A util/qemu-print.c
Log Message:
-----------
qemu-print: New qemu_printf(), qemu_vprintf() etc.
We commonly want to print to the current monitor if we have one, else
to stdout/stderr. For stderr, have error_printf(). For stdout, all
we have is monitor_vfprintf(), which is rather unwieldy. We often
print to stderr just because error_printf() is easier.
New qemu_printf() and qemu_vprintf() do exactly what's needed. The
next commits will put them to use.
Cc: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: cdcd43612032aa91aaa747aacc129a5c781ba447
https://github.com/qemu/qemu/commit/cdcd43612032aa91aaa747aacc129a5c781ba447
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M blockdev.c
Log Message:
-----------
blockdev: Make -drive format=help print to stdout
Command line help explicitly requested by the user should be printed
to stdout, not stderr. We do elsewhere. Adjust -drive to match: use
qemu_printf() instead of error_printf(). Plain printf() would be
wrong because we need to print to the current monitor for "drive_add
... format=help".
Cc: Kevin Wolf <address@hidden>
Cc: Max Reitz <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Commit: ef2fd6f1d1e5333eacaebc8466ed5dbed0d55b8b
https://github.com/qemu/qemu/commit/ef2fd6f1d1e5333eacaebc8466ed5dbed0d55b8b
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M chardev/char.c
Log Message:
-----------
char: Make -chardev help print to stdout
Command line help explicitly requested by the user should be printed
to stdout, not stderr. We do elsewhere. Adjust -chardev to match:
use qemu_printf() instead of error_printf(). Plain printf() would be
wrong because we need to print to the current monitor for "chardev-add
help".
Cc: "Marc-André Lureau" <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Commit: 6ade45f2ac936114d82a18ed10df1fb717f4a584
https://github.com/qemu/qemu/commit/6ade45f2ac936114d82a18ed10df1fb717f4a584
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M chardev/char-pty.c
Log Message:
-----------
char-pty: Print "char device redirected" message to stdout
char_pty_open() prints a "char device redirected to PTY_NAME (label
LABEL)" message to the current monitor or else to stderr. This is not
an error, so it shouldn't go to stderr. Print it to stdout instead.
Why is it even printed? No other ChardevClass::open() prints anything
on success. It's because you need to know PTY_NAME to actually use
this char device, e.g. like e.g. "socat STDIO,cfmakeraw FILE:PTY_NAME"
to use the monitor's readline interface. You can get PTY_NAME with
"info chardev" (a.k.a. query-chardev for QMP), but only if you already
have a monitor.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Commit: 8acb2a758bdeb15027ae3150fc0f4e14f6078006
https://github.com/qemu/qemu/commit/8acb2a758bdeb15027ae3150fc0f4e14f6078006
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M include/monitor/monitor.h
M monitor.c
M qdev-monitor.c
Log Message:
-----------
monitor: Simplify how -device/device_add print help
Commit a95db58f210 added monitor_vfprintf() as an error_printf()
generalized from stderr to arbitrary streams, then used it wrapped in
helper out_printf() to print -device/device_add help to stdout. Use
qemu_printf() instead, and delete monitor_vfprintf() and out_printf().
Cc: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: 15ce35fcf18f88e345bd65c169f26d3a3d250ab9
https://github.com/qemu/qemu/commit/15ce35fcf18f88e345bd65c169f26d3a3d250ab9
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M include/qemu-common.h
M include/qemu/cutils.h
M include/sysemu/cpus.h
Log Message:
-----------
include: Include fprintf-fn.h only where needed
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: ba4912cb0d6035192d58fbb4b901e8f39cfd0948
https://github.com/qemu/qemu/commit/ba4912cb0d6035192d58fbb4b901e8f39cfd0948
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M monitor.c
M trace/simple.c
M trace/simple.h
Log Message:
-----------
trace: Simplify how st_print_trace_file_status() prints
st_print_trace_file_status() takes an fprintf()-like callback and a
FILE * to pass to it.
Its only caller hmp_trace_file() passes monitor_fprintf() and the
current monitor cast to FILE *. monitor_fprintf() casts it right
back, and is otherwise identical to monitor_printf(). The
type-punning is ugly.
Drop the callback, and call qemu_printf() instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: d4c51a0af35f5a29da3d58e144f8352581a3f34e
https://github.com/qemu/qemu/commit/d4c51a0af35f5a29da3d58e144f8352581a3f34e
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M accel/tcg/translate-all.c
M include/exec/cpu-all.h
M monitor.c
M tcg/tcg.c
M tcg/tcg.h
Log Message:
-----------
tcg: Simplify how dump_opcount_info() prints
dump_opcount_info() takes an fprintf()-like callback and a FILE * to
pass to it.
Its only caller hmp_info_opcount() passes monitor_fprintf() and the
current monitor cast to FILE *. monitor_fprintf() casts it right
back, and is otherwise identical to monitor_printf(). The
type-punning is ugly.
Drop the callback, and call qemu_printf() instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: 3de2faa9a87e0a9fd84a00a2481cdbb0304e866d
https://github.com/qemu/qemu/commit/3de2faa9a87e0a9fd84a00a2481cdbb0304e866d
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M accel/tcg/translate-all.c
M include/exec/cpu-all.h
M monitor.c
M tcg/tcg.c
M tcg/tcg.h
Log Message:
-----------
tcg: Simplify how dump_exec_info() prints
dump_exec_info() takes an fprintf()-like callback and a FILE * to pass
to it.
Its only caller hmp_info_jit() passes monitor_fprintf() and the
current monitor cast to FILE *. monitor_fprintf() casts it right
back, and is otherwise identical to monitor_printf(). The
type-punning is ugly.
Drop the callback, and call qemu_printf() instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: 76c8661595fa9414fabf8a164b9adfc93c8a65e2
https://github.com/qemu/qemu/commit/76c8661595fa9414fabf8a164b9adfc93c8a65e2
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M cpus.c
M include/sysemu/cpus.h
M monitor.c
Log Message:
-----------
tcg: Simplify how dump_drift_info() prints
dump_drift_info() takes an fprintf()-like callback and a FILE * to pass
to it.
Its only caller hmp_info_jit() passes monitor_fprintf() and a Monitor
* cast to FILE *. monitor_fprintf() casts it right back, and is
otherwise identical to monitor_printf(). The type-punning is ugly.
Drop the callback, and call qemu_printf() instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: ac7ff4cf5f20eee8cec228209f6b3ca557c60639
https://github.com/qemu/qemu/commit/ac7ff4cf5f20eee8cec228209f6b3ca557c60639
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M include/block/qapi.h
M include/qemu/qsp.h
M monitor.c
M util/qsp.c
Log Message:
-----------
qsp: Simplify how qsp_report() prints
qsp_report() takes an fprintf()-like callback and a FILE * to pass to
it.
Its only caller hmp_sync_profile() passes monitor_fprintf() and the
current monitor cast to FILE *. monitor_fprintf() casts it right
back, and is otherwise identical to monitor_printf(). The
type-punning is ugly.
Drop the callback, and call qemu_printf() instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: e1ce7d747bc071f86a77683b433b852001163c2c
https://github.com/qemu/qemu/commit/e1ce7d747bc071f86a77683b433b852001163c2c
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M block/qapi.c
M hmp.c
M include/block/qapi.h
M qemu-img.c
M qemu-io-cmds.c
Log Message:
-----------
block/qapi: Clean up how we print to monitor or stdout
bdrv_snapshot_dump(), bdrv_image_info_specific_dump(),
bdrv_image_info_dump() and their helpers take an fprintf()-like
callback and a FILE * to pass to it.
hmp.c passes monitor_printf() cast to fprintf_function and the current
monitor cast to FILE *.
qemu-img.c and qemu-io-cmds.c pass fprintf and stdout.
The type-punning is technically undefined behaviour, but works in
practice. Clean up: drop the callback, and call qemu_printf()
instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: b6b71cb5c674a97a4cd935349ce8a2764f720af4
https://github.com/qemu/qemu/commit/b6b71cb5c674a97a4cd935349ce8a2764f720af4
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M exec.c
M include/exec/memory-internal.h
M include/exec/memory.h
M memory.c
M monitor.c
Log Message:
-----------
memory: Clean up how mtree_info() prints
mtree_info() takes an fprintf()-like callback and a FILE * to pass to
it, and so do its helper functions. Passing around callback and
argument is rather tiresome.
Its only caller hmp_info_mtree() passes monitor_printf() cast to
fprintf_function and the current monitor cast to FILE *.
The type-punning is technically undefined behaviour, but works in
practice. Clean up: drop the callback, and call qemu_printf()
instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: 0442428a8976b4f94e04d24b5db9eb1b678d82c4
https://github.com/qemu/qemu/commit/0442428a8976b4f94e04d24b5db9eb1b678d82c4
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M bsd-user/main.c
M cpus.c
M include/exec/cpu-common.h
M include/sysemu/cpus.h
M linux-user/main.c
M target/alpha/cpu.c
M target/alpha/cpu.h
M target/arm/cpu.c
M target/arm/cpu.h
M target/arm/helper.c
M target/cris/cpu.c
M target/cris/cpu.h
M target/hppa/cpu.c
M target/hppa/cpu.h
M target/i386/cpu.c
M target/i386/cpu.h
M target/lm32/cpu.c
M target/lm32/cpu.h
M target/m68k/cpu.h
M target/m68k/helper.c
M target/mips/cpu.h
M target/mips/translate.c
M target/mips/translate_init.inc.c
M target/openrisc/cpu.c
M target/openrisc/cpu.h
M target/ppc/cpu.h
M target/ppc/translate_init.inc.c
M target/riscv/cpu.c
M target/riscv/cpu.h
M target/s390x/cpu.h
M target/s390x/cpu_models.c
M target/sh4/cpu.c
M target/sh4/cpu.h
M target/sparc/cpu.c
M target/sparc/cpu.h
M target/tricore/cpu.h
M target/tricore/helper.c
M target/xtensa/cpu.h
M target/xtensa/helper.c
M vl.c
Log Message:
-----------
target: Simplify how the TARGET_cpu_list() print
The various TARGET_cpu_list() take an fprintf()-like callback and a
FILE * to pass to it. Their callers (vl.c's main() via list_cpus(),
bsd-user/main.c's main(), linux-user/main.c's main()) all pass
fprintf() and stdout. Thus, the flexibility provided by the (rather
tiresome) indirection isn't actually used.
Drop the callback, and call qemu_printf() instead.
Calling printf() would also work, but would make the code unsuitable
for monitor context without making it simpler.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Commit: fad866daa85c65267fa44de40f10cc1ee904ae1a
https://github.com/qemu/qemu/commit/fad866daa85c65267fa44de40f10cc1ee904ae1a
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M target/m68k/cpu.h
M target/m68k/helper.c
M target/m68k/monitor.c
M target/nios2/cpu.h
M target/nios2/mmu.c
M target/nios2/monitor.c
M target/ppc/cpu.h
M target/ppc/mmu-hash64.c
M target/ppc/mmu-hash64.h
M target/ppc/mmu_helper.c
M target/ppc/monitor.c
M target/sparc/cpu.h
M target/sparc/ldst_helper.c
M target/sparc/mmu_helper.c
M target/sparc/monitor.c
M target/xtensa/cpu.h
M target/xtensa/mmu_helper.c
M target/xtensa/monitor.c
Log Message:
-----------
target: Clean up how the dump_mmu() print
The various dump_mmu() take an fprintf()-like callback and a FILE * to
pass to it, and so do their helper functions. Passing around callback
and argument is rather tiresome.
Most dump_mmu() are called only by the target's hmp_info_tlb(). These
all pass monitor_printf() cast to fprintf_function and the current
monitor cast to FILE *.
SPARC's dump_mmu() gets also called from target/sparc/ldst_helper.c a
few times #ifdef DEBUG_MMU. These calls pass fprintf() and stdout.
The type-punning is technically undefined behaviour, but works in
practice. Clean up: drop the callback, and call qemu_printf()
instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: d3fd9e4b79f77afea17213a7b32ba9eda7fc59c1
https://github.com/qemu/qemu/commit/d3fd9e4b79f77afea17213a7b32ba9eda7fc59c1
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M target/i386/cpu.h
M target/i386/helper.c
M target/i386/monitor.c
Log Message:
-----------
target/i386: Simplify how x86_cpu_dump_local_apic_state() prints
x86_cpu_dump_local_apic_state() takes an fprintf()-like callback and a
FILE * to pass to it, and so do its helper functions.
Its only caller hmp_info_local_apic() passes monitor_fprintf() and the
current monitor cast to FILE *. monitor_fprintf() casts it right
back, and is otherwise identical to monitor_printf(). The
type-punning is ugly.
Drop the callback, and call qemu_printf() instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: 11cb6c152a52fdda6a7f5a8bb271344aaf0c2b98
https://github.com/qemu/qemu/commit/11cb6c152a52fdda6a7f5a8bb271344aaf0c2b98
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M include/qom/cpu.h
M monitor.c
M qom/cpu.c
M target/ppc/cpu.h
M target/ppc/translate.c
Log Message:
-----------
qom/cpu: Simplify how CPUClass::dump_statistics() prints
CPUClass method dump_statistics() takes an fprintf()-like callback and
a FILE * to pass to it.
Its only caller hmp_info_cpustats() (via cpu_dump_statistics()) passes
monitor_fprintf() and the current monitor cast to FILE *.
monitor_fprintf() casts it right back, and is otherwise identical to
monitor_printf(). The type-punning is ugly.
Drop the callback, and call qemu_printf() instead.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: 19aaa4c3fd15eeb82f10c35ffc7d53e103d10787
https://github.com/qemu/qemu/commit/19aaa4c3fd15eeb82f10c35ffc7d53e103d10787
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M include/qemu/qemu-print.h
M util/qemu-print.c
Log Message:
-----------
qemu-print: New qemu_fprintf(), qemu_vfprintf()
Code that doesn't want to know about current monitor vs. stdout
vs. stderr takes an fprintf_function callback and a FILE * argument to
pass to it. Actual arguments are either fprintf() and stdout or
stderr, or monitor_fprintf() and the current monitor cast to FILE *.
monitor_fprintf() casts it right back, and is otherwise identical to
monitor_printf(). The type-punning is ugly.
New qemu_fprintf() and qemu_vprintf() address this need without type
punning: they are like fprintf() and vfprintf(), except they print to
the current monitor when passed a null FILE *. The next commits will
put them to use.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: 90c84c56006747537e9e4240271523c4c3b7a481
https://github.com/qemu/qemu/commit/90c84c56006747537e9e4240271523c4c3b7a481
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M accel/kvm/kvm-all.c
M bsd-user/main.c
M cpus.c
M exec.c
M include/exec/log.h
M include/qom/cpu.h
M linux-user/alpha/cpu_loop.c
M linux-user/cpu_loop-common.h
M linux-user/cris/cpu_loop.c
M linux-user/microblaze/cpu_loop.c
M linux-user/s390x/cpu_loop.c
M linux-user/sh4/cpu_loop.c
M linux-user/sparc/cpu_loop.c
M monitor.c
M qom/cpu.c
M target/alpha/cpu.h
M target/alpha/helper.c
M target/arm/arm-semi.c
M target/arm/cpu.h
M target/arm/translate-a64.c
M target/arm/translate.c
M target/arm/translate.h
M target/cris/cpu.h
M target/cris/helper.c
M target/cris/translate.c
M target/hppa/cpu.h
M target/hppa/helper.c
M target/i386/cpu.h
M target/i386/hax-all.c
M target/i386/helper.c
M target/lm32/cpu.h
M target/lm32/translate.c
M target/m68k/cpu.h
M target/m68k/translate.c
M target/microblaze/cpu.h
M target/microblaze/helper.c
M target/microblaze/translate.c
M target/mips/internal.h
M target/mips/translate.c
M target/moxie/cpu.h
M target/moxie/helper.c
M target/moxie/translate.c
M target/nios2/cpu.h
M target/nios2/helper.c
M target/nios2/translate.c
M target/openrisc/cpu.h
M target/openrisc/translate.c
M target/ppc/cpu.h
M target/ppc/translate.c
M target/riscv/cpu.c
M target/s390x/helper.c
M target/s390x/internal.h
M target/sh4/cpu.h
M target/sh4/translate.c
M target/sparc/cpu.c
M target/sparc/cpu.h
M target/tilegx/cpu.c
M target/tricore/cpu.h
M target/tricore/translate.c
M target/unicore32/cpu.h
M target/unicore32/translate.c
M target/xtensa/cpu.h
M target/xtensa/translate.c
Log Message:
-----------
qom/cpu: Simplify how CPUClass:cpu_dump_state() prints
CPUClass method dump_statistics() takes an fprintf()-like callback and
a FILE * to pass to it. Most callers pass fprintf() and stderr.
log_cpu_state() passes fprintf() and qemu_log_file.
hmp_info_registers() passes monitor_fprintf() and the current monitor
cast to FILE *. monitor_fprintf() casts it right back, and is
otherwise identical to monitor_printf().
The callback gets passed around a lot, which is tiresome. The
type-punning around monitor_fprintf() is ugly.
Drop the callback, and call qemu_fprintf() instead. Also gets rid of
the type-punning, since qemu_fprintf() takes NULL instead of the
current monitor cast to FILE *.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: 30cc98315f59d4baf30e386211292abdfabd98dc
https://github.com/qemu/qemu/commit/30cc98315f59d4baf30e386211292abdfabd98dc
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M disas.c
M include/monitor/monitor.h
M monitor.c
Log Message:
-----------
monitor: Clean up how monitor_disas() funnels output to monitor
INIT_DISASSEMBLE_INFO() takes an fprintf()-like callback and a FILE *
to pass to it. monitor_disas() passes monitor_fprintf() and the
current monitor cast to FILE *. monitor_fprintf() casts it right
back, and is otherwise identical to monitor_printf(). The
type-punning is ugly.
Pass qemu_fprintf() and NULL instead.
monitor_fprintf() is now unused; delete it.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
[Commit message typo corrected]
Commit: 3979fca4b69fc31c372687cd0bb6950592f248bd
https://github.com/qemu/qemu/commit/3979fca4b69fc31c372687cd0bb6950592f248bd
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M disas.c
M disas/alpha.c
M disas/arm-a64.cc
M disas/arm.c
M disas/cris.c
M disas/hppa.c
M disas/i386.c
M disas/lm32.c
M disas/m68k.c
M disas/microblaze.c
M disas/mips.c
M disas/moxie.c
M disas/nanomips.cpp
M disas/nios2.c
M disas/ppc.c
M disas/riscv.c
M disas/s390.c
M disas/sh4.c
M disas/sparc.c
M disas/tci.c
M disas/xtensa.c
R include/disas/bfd.h
A include/disas/dis-asm.h
M include/qom/cpu.h
M target/openrisc/disas.c
M target/ppc/translate_init.inc.c
Log Message:
-----------
disas: Rename include/disas/bfd.h back to include/disas/dis-asm.h
Commit dc99065b5f9 (v0.1.0) added dis-asm.h from binutils.
Commit 43d4145a986 (v0.1.5) inlined bfd.h into dis-asm.h to remove the
dependency on binutils.
Commit 76cad71136b (v1.4.0) moved dis-asm.h to include/disas/bfd.h.
The new name is confusing when you try to match against (pre GPLv3+)
binutils. Rename it back. Keep it in the same directory, of course.
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Commit: ede9a8a656c992deecce45f8175985dd81cc6be9
https://github.com/qemu/qemu/commit/ede9a8a656c992deecce45f8175985dd81cc6be9
Author: Markus Armbruster <address@hidden>
Date: 2019-04-18 (Thu, 18 Apr 2019)
Changed paths:
M include/disas/dis-asm.h
R include/qemu/fprintf-fn.h
Log Message:
-----------
include: Move fprintf_function to disas/
The previous commits have eliminated fprintf_function outside
disassemblers, simplifying code and cleaning up the ugly type-punning
fprintf_function seems to attract. Move fprintf_function to
include/disas/dis-asm.h to reduce the temptation to abuse it.
I considered renaming it to fprintf_ftype (reverting that part of
commit 6e2d864edf5, v0.14.0) to get us closer to binutils, but I
figure the fork is too distant to make this worthwhile.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Commit: c4e9f845f6248885ff73a9e1ecb74052a1c3dcd4
https://github.com/qemu/qemu/commit/c4e9f845f6248885ff73a9e1ecb74052a1c3dcd4
Author: Peter Maydell <address@hidden>
Date: 2019-04-24 (Wed, 24 Apr 2019)
Changed paths:
M MAINTAINERS
M accel/kvm/kvm-all.c
M accel/tcg/translate-all.c
M block/qapi.c
M block/ssh.c
M block/trace-events
M blockdev.c
M bsd-user/main.c
M chardev/char-pty.c
M chardev/char.c
M cpus.c
M disas.c
M disas/alpha.c
M disas/arm-a64.cc
M disas/arm.c
M disas/cris.c
M disas/hppa.c
M disas/i386.c
M disas/lm32.c
M disas/m68k.c
M disas/microblaze.c
M disas/mips.c
M disas/moxie.c
M disas/nanomips.cpp
M disas/nios2.c
M disas/ppc.c
M disas/riscv.c
M disas/s390.c
M disas/sh4.c
M disas/sparc.c
M disas/tci.c
M disas/xtensa.c
M exec.c
M hmp.c
M hw/core/loader-fit.c
M hw/mips/boston.c
M hw/pci/pci.c
M hw/timer/hpet.c
M hw/vfio/pci.c
M include/block/qapi.h
R include/disas/bfd.h
A include/disas/dis-asm.h
M include/exec/cpu-all.h
M include/exec/cpu-common.h
M include/exec/log.h
M include/exec/memory-internal.h
M include/exec/memory.h
M include/monitor/monitor.h
M include/qemu-common.h
M include/qemu/cutils.h
M include/qemu/error-report.h
R include/qemu/fprintf-fn.h
A include/qemu/qemu-print.h
M include/qemu/qsp.h
M include/qom/cpu.h
M include/sysemu/cpus.h
M linux-user/alpha/cpu_loop.c
M linux-user/cpu_loop-common.h
M linux-user/cris/cpu_loop.c
M linux-user/main.c
M linux-user/microblaze/cpu_loop.c
M linux-user/s390x/cpu_loop.c
M linux-user/sh4/cpu_loop.c
M linux-user/sparc/cpu_loop.c
M memory.c
M monitor.c
M qdev-monitor.c
M qemu-img.c
M qemu-io-cmds.c
M qemu-io.c
M qemu-nbd.c
M qom/cpu.c
M scsi/qemu-pr-helper.c
M stubs/error-printf.c
M stubs/monitor.c
M target/alpha/cpu.c
M target/alpha/cpu.h
M target/alpha/helper.c
M target/arm/arm-semi.c
M target/arm/cpu.c
M target/arm/cpu.h
M target/arm/helper.c
M target/arm/translate-a64.c
M target/arm/translate.c
M target/arm/translate.h
M target/cris/cpu.c
M target/cris/cpu.h
M target/cris/helper.c
M target/cris/translate.c
M target/hppa/cpu.c
M target/hppa/cpu.h
M target/hppa/helper.c
M target/i386/cpu.c
M target/i386/cpu.h
M target/i386/hax-all.c
M target/i386/helper.c
M target/i386/monitor.c
M target/lm32/cpu.c
M target/lm32/cpu.h
M target/lm32/translate.c
M target/m68k/cpu.h
M target/m68k/helper.c
M target/m68k/monitor.c
M target/m68k/translate.c
M target/microblaze/cpu.h
M target/microblaze/helper.c
M target/microblaze/translate.c
M target/mips/cpu.h
M target/mips/internal.h
M target/mips/translate.c
M target/mips/translate_init.inc.c
M target/moxie/cpu.h
M target/moxie/helper.c
M target/moxie/translate.c
M target/nios2/cpu.h
M target/nios2/helper.c
M target/nios2/mmu.c
M target/nios2/monitor.c
M target/nios2/translate.c
M target/openrisc/cpu.c
M target/openrisc/cpu.h
M target/openrisc/disas.c
M target/openrisc/translate.c
M target/ppc/cpu.h
M target/ppc/mmu-hash64.c
M target/ppc/mmu-hash64.h
M target/ppc/mmu_helper.c
M target/ppc/monitor.c
M target/ppc/translate.c
M target/ppc/translate_init.inc.c
M target/riscv/cpu.c
M target/riscv/cpu.h
M target/s390x/cpu.h
M target/s390x/cpu_models.c
M target/s390x/helper.c
M target/s390x/internal.h
M target/s390x/kvm.c
M target/sh4/cpu.c
M target/sh4/cpu.h
M target/sh4/translate.c
M target/sparc/cpu.c
M target/sparc/cpu.h
M target/sparc/ldst_helper.c
M target/sparc/mmu_helper.c
M target/sparc/monitor.c
M target/tilegx/cpu.c
M target/tricore/cpu.h
M target/tricore/helper.c
M target/tricore/translate.c
M target/unicore32/cpu.h
M target/unicore32/translate.c
M target/xtensa/cpu.h
M target/xtensa/helper.c
M target/xtensa/mmu_helper.c
M target/xtensa/monitor.c
M target/xtensa/translate.c
M tcg/tcg.c
M tcg/tcg.h
M tests/test-util-sockets.c
M trace/simple.c
M trace/simple.h
M util/Makefile.objs
M util/error.c
M util/qemu-error.c
A util/qemu-print.c
M util/qsp.c
M vl.c
Log Message:
-----------
Merge remote-tracking branch
'remotes/armbru/tags/pull-error-monitor-2019-04-18' into staging
Error reporting & monitor patches for 2019-04-18
# gpg: Signature made Thu 18 Apr 2019 21:40:41 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <address@hidden>" [full]
# gpg: aka "Markus Armbruster <address@hidden>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-error-monitor-2019-04-18: (36 commits)
include: Move fprintf_function to disas/
disas: Rename include/disas/bfd.h back to include/disas/dis-asm.h
monitor: Clean up how monitor_disas() funnels output to monitor
qom/cpu: Simplify how CPUClass:cpu_dump_state() prints
qemu-print: New qemu_fprintf(), qemu_vfprintf()
qom/cpu: Simplify how CPUClass::dump_statistics() prints
target/i386: Simplify how x86_cpu_dump_local_apic_state() prints
target: Clean up how the dump_mmu() print
target: Simplify how the TARGET_cpu_list() print
memory: Clean up how mtree_info() prints
block/qapi: Clean up how we print to monitor or stdout
qsp: Simplify how qsp_report() prints
tcg: Simplify how dump_drift_info() prints
tcg: Simplify how dump_exec_info() prints
tcg: Simplify how dump_opcount_info() prints
trace: Simplify how st_print_trace_file_status() prints
include: Include fprintf-fn.h only where needed
monitor: Simplify how -device/device_add print help
char-pty: Print "char device redirected" message to stdout
char: Make -chardev help print to stdout
...
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/85947dafad13...c4e9f845f624
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 99e98d: qemu-io: Use error_[gs]et_progname(),
Peter Maydell <=