aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-12-07 10:46:09 +0200
committerAvi Kivity <avi@redhat.com>2009-12-07 10:46:09 +0200
commit989e2cd2f9db2edcd347c380dddfeb5b64327b76 (patch)
treef803f84b6d6393b6869b36c07bbe3760e7676fe5 /sysemu.h
parentFix mismerge in cpu_post_load (diff)
parentmonitor: QError support (diff)
downloadqemu-kvm-989e2cd2f9db2edcd347c380dddfeb5b64327b76.tar.gz
qemu-kvm-989e2cd2f9db2edcd347c380dddfeb5b64327b76.tar.bz2
qemu-kvm-989e2cd2f9db2edcd347c380dddfeb5b64327b76.zip
Merge commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa' into upstream-merge
* commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa': (22 commits) monitor: QError support Introduce QError utests: Add qstring_from_substr() unit-test utests: Add qstring_append_chr() unit-test QString: Introduce qstring_from_substr() QString: Introduce qstring_append_int() QString: Introduce qstring_append_chr() QJSON: Introduce qobject_from_jsonv() fix I2C slave addressing Fix qdev property type definition for isa serial/parallel devices Fix qemu_malloc/qemu_free use in rtl8139.c Fix free use in xen_backend.c Fix qemu_free use in scsi-generic.c Fix qemu_free use in nseries.c Fix qemu_free use in bt-l2cap.c Fix qemu_free use in nand.c Fix qemu_free use in baum.c Fix qemu_free use in acpi.c pci: move apb specific stuff to apb_pci.c configure: use correct cflags in compiler checks ... Conflicts: monitor.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'sysemu.h')
-rw-r--r--sysemu.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/sysemu.h b/sysemu.h
index 4f662260d..532117cd5 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -7,6 +7,7 @@
#include "qemu-queue.h"
#include "qemu-timer.h"
#include "qdict.h"
+#include "qerror.h"
#ifdef _WIN32
#include <windows.h>
@@ -72,6 +73,12 @@ 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 */