summaryrefslogtreecommitdiff
path: root/sysemu.h
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-02-18 13:16:02 +0100
committerMarkus Armbruster <armbru@redhat.com>2010-03-16 16:55:05 +0100
commit6e4f984cb9474db99bf4e3998ff86cdb9ed02380 (patch)
tree593183a7a30cf3c5263951af410c75489de0aa3c /sysemu.h
parentb4a51f7f5d4855d1af7eb6ce6c6f79bd24d1d5a8 (diff)
downloadqemu-6e4f984cb9474db99bf4e3998ff86cdb9ed02380.tar.gz
error: Simplify error sink setup
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.
Diffstat (limited to 'sysemu.h')
-rw-r--r--sysemu.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/sysemu.h b/sysemu.h
index 3fef78df88..14de993afc 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -73,9 +73,6 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f);
void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f);
int qemu_loadvm_state(QEMUFile *f);
-void qemu_errors_to_file(FILE *fp);
-void qemu_errors_to_mon(Monitor *mon);
-void qemu_errors_to_previous(void);
void qemu_error(const char *fmt, ...) __attribute__ ((format(printf, 1, 2)));
void qemu_error_internal(const char *file, int linenr, const char *func,
const char *fmt, ...)