[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/50] monitor: Factor monitor_set_error() out of qe
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 08/50] monitor: Factor monitor_set_error() out of qemu_error_internal() |
Date: |
Thu, 4 Mar 2010 16:56:29 +0100 |
This separates the monitor part from the QError part.
Signed-off-by: Markus Armbruster <address@hidden>
---
monitor.c | 21 +++++++++++++--------
monitor.h | 3 +++
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/monitor.c b/monitor.c
index 8e2e5c3..da52cb4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3855,6 +3855,18 @@ fail:
return NULL;
}
+void monitor_set_error(Monitor *mon, QError *qerror)
+{
+ /* report only the first error */
+ if (!mon->error) {
+ mon->error = qerror;
+ } else {
+ MON_DEBUG("Additional error report at %s:%d\n",
+ qerror->file, qerror->linenr);
+ QDECREF(qerror);
+ }
+}
+
static void monitor_print_error(Monitor *mon)
{
qerror_print(mon->error);
@@ -4756,14 +4768,7 @@ void qemu_error_internal(const char *file, int linenr,
const char *func,
QDECREF(qerror);
break;
case ERR_SINK_MONITOR:
- /* report only the first error */
- if (!qemu_error_sink->mon->error) {
- qemu_error_sink->mon->error = qerror;
- } else {
- MON_DEBUG("Additional error report at %s:%d\n", qerror->file,
- qerror->linenr);
- QDECREF(qerror);
- }
+ monitor_set_error(qemu_error_sink->mon, qerror);
break;
}
}
diff --git a/monitor.h b/monitor.h
index c481c9d..6d7969c 100644
--- a/monitor.h
+++ b/monitor.h
@@ -3,6 +3,7 @@
#include "qemu-common.h"
#include "qemu-char.h"
+#include "qerror.h"
#include "qdict.h"
#include "block.h"
@@ -48,4 +49,6 @@ void monitor_flush(Monitor *mon);
typedef void (MonitorCompletion)(void *opaque, QObject *ret_data);
+void monitor_set_error(Monitor *mon, QError *qerror);
+
#endif /* !MONITOR_H */
--
1.6.6.1
- [Qemu-devel] [PATCH 03/50] pc: Fix error reporting for -boot once, (continued)
- [Qemu-devel] [PATCH 03/50] pc: Fix error reporting for -boot once, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 10/50] error: Simplify error sink setup, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 04/50] pc: Factor common code out of pc_boot_set() and cmos_init(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 12/50] error: New error_printf() and error_vprintf(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 09/50] error: Move qemu_error() & friends from monitor.c to own file, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 11/50] error: Move qemu_error & friends into their own header, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 35/50] error: New QERR_DEVICE_MULTIPLE_BUSSES, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 23/50] qdev: Fix -device and device_add to handle unsuitable bus gracefully, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 14/50] error: Don't abuse qemu_error() for non-error in qbus_find(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 26/50] qdev: Hide "ptr" properties from users, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 08/50] monitor: Factor monitor_set_error() out of qemu_error_internal(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 41/50] error: New QERR_DEVICE_INIT_FAILED, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 31/50] error: New QERR_PROPERTY_VALUE_BAD, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 13/50] error: Don't abuse qemu_error() for non-error in qdev_device_help(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 07/50] block: Simplify usb_msd_initfn() test for "can read bdrv key", Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 06/50] monitor: Separate "default monitor" and "current monitor" cleanly, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 40/50] error: New QERR_BUS_NO_HOTPLUG, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 18/50] error: Infrastructure to track locations for error reporting, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 15/50] error: Don't abuse qemu_error() for non-error in scsi_hot_add(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 34/50] error: New QERR_BUS_NOT_FOUND, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 39/50] error: New QERR_BAD_BUS_FOR_DEVICE, Markus Armbruster, 2010/03/04