aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-08-30 16:02:17 +0300
committerAvi Kivity <avi@redhat.com>2009-08-30 16:02:17 +0300
commitf908a87964b783ef64ab85451fa8d638b67d8fe8 (patch)
tree12c1868dde3068ba1a8088c65d457376447975a1 /sysemu.h
parentMerge commit '4c0960c0c483fffc5f8e1dab169d946ac295bf44' into upstream-merge (diff)
parentide: split away ide-isa.c (diff)
downloadqemu-kvm-f908a87964b783ef64ab85451fa8d638b67d8fe8.tar.gz
qemu-kvm-f908a87964b783ef64ab85451fa8d638b67d8fe8.tar.bz2
qemu-kvm-f908a87964b783ef64ab85451fa8d638b67d8fe8.zip
Merge commit 'ec82026c97975e1e327aab76653ff7edeeb27967' into upstream-merge
* commit 'ec82026c97975e1e327aab76653ff7edeeb27967': ide: split away ide-isa.c ide: split away ide-internal.h ide: add IDEBus struct, cleanups qdev error logging virtio-pci error logging add qemu_error() + friends qdev: add return value to init() callbacks. fix stack buffer overflows in eepro100.c tx Check block driver read error in pflash_cfi0x Conflicts: Makefile.target hw/pc.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'sysemu.h')
-rw-r--r--sysemu.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sysemu.h b/sysemu.h
index f6d584e5d..6b7a03610 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -66,6 +66,11 @@ 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)));
+
#ifdef _WIN32
/* Polling handling */