motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

error: Simplify error sink setup

Browse source 
qemu_error_sink can either point to a monitor or a file.  In practice,
it always points to the current monitor if we have one, else to
stderr.  Simply route errors to the current monitor or else to stderr,
and remove qemu_error_sink along with the functions to control it.

Actually, the old code switches the sink slightly later, in
handle_user_command() and handle_qmp_command(), than it gets switched
now, implicitly, by setting the current monitor in monitor_read() and
monitor_control_read().  Likewise, it switches back slightly earlier
(same places).  Doesn't make a difference, because there are no calls
of qemu_error() in between.
This commit is contained in:
Markus Armbruster 2010-02-18 13:16:02 +01:00
parent b4a51f7f5d
commit 6e4f984cb9
4 changed files with 9 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

6
monitor.c
View file

@ -3971,8 +3971,6 @@ static void handle_user_command(Monitor *mon, const char *cmdline)
if (!cmd)
goto out;
qemu_errors_to_mon(mon);
if (monitor_handler_is_async(cmd)) {
user_async_cmd_handler(mon, cmd, qdict);
} else if (monitor_handler_ported(cmd)) {
@ -3984,8 +3982,6 @@ static void handle_user_command(Monitor *mon, const char *cmdline)
if (monitor_has_error(mon))
monitor_print_error(mon);
qemu_errors_to_previous();
out:
QDECREF(qdict);
}
@ -4387,7 +4383,6 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
const char *cmd_name, *info_item;
args = NULL;
qemu_errors_to_mon(mon);
obj = json_parser_parse(tokens, NULL);
if (!obj) {
@ -4468,7 +4463,6 @@ err_out:
monitor_protocol_emitter(mon, NULL);
out:
QDECREF(args);
qemu_errors_to_previous();
}
/**