From dd9cb7929e2b98bf9f8017ebbd7e433d38541664 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 10 May 2010 23:52:07 -0700 Subject: Upstream: integrate minor cleanups Change-Id: I8de8e1044794f0ef8427717fc0b3b5e9e121247b --- sysemu.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'sysemu.h') diff --git a/sysemu.h b/sysemu.h index fe24415..1d9e28c 100644 --- a/sysemu.h +++ b/sysemu.h @@ -3,6 +3,11 @@ /* Misc. things related to the system emulator. */ #include "qemu-common.h" +#include "qemu-option.h" +#include "qemu-queue.h" +#include "qemu-timer.h" +#include "qdict.h" +#include "qerror.h" #ifdef _WIN32 #include @@ -70,6 +75,17 @@ int qemu_savevm_state_complete(QEMUFile *f); int qemu_savevm_state(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, ...) + __attribute__ ((format(printf, 4, 5))); + +#define qemu_error_new(fmt, ...) \ + qemu_error_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__) + #ifdef _WIN32 /* Polling handling */ -- cgit v1.1