Revision d6f46833
b/monitor.c | ||
---|---|---|
3858 | 3858 |
return NULL; |
3859 | 3859 |
} |
3860 | 3860 |
|
3861 |
void monitor_set_error(Monitor *mon, QError *qerror) |
|
3862 |
{ |
|
3863 |
/* report only the first error */ |
|
3864 |
if (!mon->error) { |
|
3865 |
mon->error = qerror; |
|
3866 |
} else { |
|
3867 |
MON_DEBUG("Additional error report at %s:%d\n", |
|
3868 |
qerror->file, qerror->linenr); |
|
3869 |
QDECREF(qerror); |
|
3870 |
} |
|
3871 |
} |
|
3872 |
|
|
3861 | 3873 |
static void monitor_print_error(Monitor *mon) |
3862 | 3874 |
{ |
3863 | 3875 |
qerror_print(mon->error); |
... | ... | |
4759 | 4771 |
QDECREF(qerror); |
4760 | 4772 |
break; |
4761 | 4773 |
case ERR_SINK_MONITOR: |
4762 |
/* report only the first error */ |
|
4763 |
if (!qemu_error_sink->mon->error) { |
|
4764 |
qemu_error_sink->mon->error = qerror; |
|
4765 |
} else { |
|
4766 |
MON_DEBUG("Additional error report at %s:%d\n", qerror->file, |
|
4767 |
qerror->linenr); |
|
4768 |
QDECREF(qerror); |
|
4769 |
} |
|
4774 |
monitor_set_error(qemu_error_sink->mon, qerror); |
|
4770 | 4775 |
break; |
4771 | 4776 |
} |
4772 | 4777 |
} |
b/monitor.h | ||
---|---|---|
3 | 3 |
|
4 | 4 |
#include "qemu-common.h" |
5 | 5 |
#include "qemu-char.h" |
6 |
#include "qerror.h" |
|
6 | 7 |
#include "qdict.h" |
7 | 8 |
#include "block.h" |
8 | 9 |
|
... | ... | |
49 | 50 |
|
50 | 51 |
typedef void (MonitorCompletion)(void *opaque, QObject *ret_data); |
51 | 52 |
|
53 |
void monitor_set_error(Monitor *mon, QError *qerror); |
|
54 |
|
|
52 | 55 |
#endif /* !MONITOR_H */ |
Also available in: Unified diff