* [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes
@ 2010-03-22 9:28 Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 1/6] error: Trim includes after "Move qemu_error & friends..." Markus Armbruster
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Markus Armbruster @ 2010-03-22 9:28 UTC (permalink / raw)
To: qemu-devel; +Cc: lcapitulino
Cleaner integration of location tracking with qemu-tool.c. Move
qerror_report() where it belongs.
v2: Remove an assertion that unreachable code can't be reached, at
Blue Swirl's request. Rebased.
Markus Armbruster (6):
error: Trim includes after "Move qemu_error & friends..."
error: Trim includes in qerror.c
error: Trim includes after "Infrastructure to track locations..."
error: Make use of error_set_progname() optional
error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.o
error: Move qerror_report() from qemu-error.[ch] to qerror.[ch]
Makefile | 6 +++---
hw/qdev-properties.c | 1 +
monitor.c | 2 --
monitor.h | 1 -
qemu-error.c | 20 +-------------------
qemu-error.h | 6 ------
qemu-tool.c | 49 +++++++++++++++----------------------------------
qerror.c | 22 ++++++++++++++++++++--
qerror.h | 5 +++++
sysemu.h | 2 --
10 files changed, 45 insertions(+), 69 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH v2 1/6] error: Trim includes after "Move qemu_error & friends..."
2010-03-22 9:28 [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes Markus Armbruster
@ 2010-03-22 9:29 ` Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 2/6] error: Trim includes in qerror.c Markus Armbruster
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2010-03-22 9:29 UTC (permalink / raw)
To: qemu-devel; +Cc: lcapitulino
Missed in commit 2f792016.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/qdev-properties.c | 1 +
monitor.c | 2 --
sysemu.h | 2 --
3 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 92d6793..157a111 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,6 +1,7 @@
#include "sysemu.h"
#include "net.h"
#include "qdev.h"
+#include "qerror.h"
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
{
diff --git a/monitor.c b/monitor.c
index 0448a70..822dc27 100644
--- a/monitor.c
+++ b/monitor.c
@@ -49,10 +49,8 @@
#include "qint.h"
#include "qfloat.h"
#include "qlist.h"
-#include "qdict.h"
#include "qbool.h"
#include "qstring.h"
-#include "qerror.h"
#include "qjson.h"
#include "json-streamer.h"
#include "json-parser.h"
diff --git a/sysemu.h b/sysemu.h
index 525efd1..5464d35 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -6,8 +6,6 @@
#include "qemu-option.h"
#include "qemu-queue.h"
#include "qemu-timer.h"
-#include "qdict.h"
-#include "qerror.h"
#ifdef _WIN32
#include <windows.h>
--
1.6.6.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH v2 2/6] error: Trim includes in qerror.c
2010-03-22 9:28 [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 1/6] error: Trim includes after "Move qemu_error & friends..." Markus Armbruster
@ 2010-03-22 9:29 ` Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 3/6] error: Trim includes after "Infrastructure to track locations..." Markus Armbruster
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2010-03-22 9:29 UTC (permalink / raw)
To: qemu-devel; +Cc: lcapitulino
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qerror.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/qerror.c b/qerror.c
index d0aba61..ff2fbd5 100644
--- a/qerror.c
+++ b/qerror.c
@@ -11,9 +11,7 @@
*/
#include "qjson.h"
#include "qerror.h"
-#include "qstring.h"
#include "qemu-common.h"
-#include "qemu-error.h"
static void qerror_destroy_obj(QObject *obj);
--
1.6.6.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH v2 3/6] error: Trim includes after "Infrastructure to track locations..."
2010-03-22 9:28 [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 1/6] error: Trim includes after "Move qemu_error & friends..." Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 2/6] error: Trim includes in qerror.c Markus Armbruster
@ 2010-03-22 9:29 ` Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 4/6] error: Make use of error_set_progname() optional Markus Armbruster
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2010-03-22 9:29 UTC (permalink / raw)
To: qemu-devel; +Cc: lcapitulino
Missed in commit 827b0813.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor.h | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/monitor.h b/monitor.h
index bd4ae34..5bdeed1 100644
--- a/monitor.h
+++ b/monitor.h
@@ -3,7 +3,6 @@
#include "qemu-common.h"
#include "qemu-char.h"
-#include "qemu-error.h"
#include "qerror.h"
#include "qdict.h"
#include "block.h"
--
1.6.6.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH v2 4/6] error: Make use of error_set_progname() optional
2010-03-22 9:28 [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes Markus Armbruster
` (2 preceding siblings ...)
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 3/6] error: Trim includes after "Infrastructure to track locations..." Markus Armbruster
@ 2010-03-22 9:29 ` Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 5/6] error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.o Markus Armbruster
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2010-03-22 9:29 UTC (permalink / raw)
To: qemu-devel; +Cc: lcapitulino
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qemu-error.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/qemu-error.c b/qemu-error.c
index 5d5fe37..9b9c0a1 100644
--- a/qemu-error.c
+++ b/qemu-error.c
@@ -167,7 +167,7 @@ void error_print_loc(void)
int i;
const char *const *argp;
- if (!cur_mon) {
+ if (!cur_mon && progname) {
fprintf(stderr, "%s:", progname);
sep = " ";
}
--
1.6.6.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH v2 5/6] error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.o
2010-03-22 9:28 [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes Markus Armbruster
` (3 preceding siblings ...)
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 4/6] error: Make use of error_set_progname() optional Markus Armbruster
@ 2010-03-22 9:29 ` Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 6/6] error: Move qerror_report() from qemu-error.[ch] to qerror.[ch] Markus Armbruster
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2010-03-22 9:29 UTC (permalink / raw)
To: qemu-devel; +Cc: lcapitulino
The location tracking interface is used by code shared with qemi-img,
qemu-nbd and qemu-io, so it needs to be available there. Commit
827b0813 provides it in a rather hamfisted way: it adds a dummy
implementation to qemu-tool.c.
It's cleaner to provide the real thing, and put a few more dummy
monitor functions into qemu-tool.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
Makefile | 6 +++---
qemu-tool.c | 49 +++++++++++++++----------------------------------
2 files changed, 18 insertions(+), 37 deletions(-)
diff --git a/Makefile b/Makefile
index 57c354d..a404fda 100644
--- a/Makefile
+++ b/Makefile
@@ -129,11 +129,11 @@ bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
qemu-img.o: qemu-img-cmds.h
qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS)
-qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y) $(qobject-obj-y)
+qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y)
-qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y) $(qobject-obj-y)
+qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y)
-qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y) $(qobject-obj-y)
+qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y)
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@")
diff --git a/qemu-tool.c b/qemu-tool.c
index dda752b..b39af86 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -15,7 +15,6 @@
#include "monitor.h"
#include "qemu-timer.h"
#include "qemu-log.h"
-#include "qemu-error.h"
#include <sys/time.h>
@@ -33,6 +32,21 @@ void qemu_service_io(void)
{
}
+Monitor *cur_mon;
+
+int monitor_cur_is_qmp(void)
+{
+ return 0;
+}
+
+void monitor_set_error(Monitor *mon, QError *qerror)
+{
+}
+
+void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
+{
+}
+
void monitor_printf(Monitor *mon, const char *fmt, ...)
{
}
@@ -103,36 +117,3 @@ int64_t qemu_get_clock(QEMUClock *clock)
qemu_gettimeofday(&tv);
return (tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000)) / 1000000;
}
-
-Location *loc_push_restore(Location *loc)
-{
- return loc;
-}
-
-Location *loc_push_none(Location *loc)
-{
- return loc;
-}
-
-Location *loc_pop(Location *loc)
-{
- return loc;
-}
-
-Location *loc_save(Location *loc)
-{
- return loc;
-}
-
-void loc_restore(Location *loc)
-{
-}
-
-void error_report(const char *fmt, ...)
-{
- va_list args;
-
- va_start(args, fmt);
- vfprintf(stderr, fmt, args);
- va_end(args);
-}
--
1.6.6.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH v2 6/6] error: Move qerror_report() from qemu-error.[ch] to qerror.[ch]
2010-03-22 9:28 [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes Markus Armbruster
` (4 preceding siblings ...)
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 5/6] error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.o Markus Armbruster
@ 2010-03-22 9:29 ` Markus Armbruster
2010-03-23 21:46 ` [Qemu-devel] Re: [PATCH v2 0/6] error: Clean up after recent changes Luiz Capitulino
2010-03-27 13:40 ` [Qemu-devel] " Aurelien Jarno
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2010-03-22 9:29 UTC (permalink / raw)
To: qemu-devel; +Cc: lcapitulino
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qemu-error.c | 18 ------------------
qemu-error.h | 6 ------
qerror.c | 20 ++++++++++++++++++++
qerror.h | 5 +++++
4 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/qemu-error.c b/qemu-error.c
index 9b9c0a1..57d7555 100644
--- a/qemu-error.c
+++ b/qemu-error.c
@@ -207,21 +207,3 @@ void error_report(const char *fmt, ...)
va_end(ap);
error_printf("\n");
}
-
-void qerror_report_internal(const char *file, int linenr, const char *func,
- const char *fmt, ...)
-{
- va_list va;
- QError *qerror;
-
- va_start(va, fmt);
- qerror = qerror_from_info(file, linenr, func, fmt, &va);
- va_end(va);
-
- if (monitor_cur_is_qmp()) {
- monitor_set_error(cur_mon, qerror);
- } else {
- qerror_print(qerror);
- QDECREF(qerror);
- }
-}
diff --git a/qemu-error.h b/qemu-error.h
index e63c6ab..a45609f 100644
--- a/qemu-error.h
+++ b/qemu-error.h
@@ -37,11 +37,5 @@ void error_printf_unless_qmp(const char *fmt, ...)
void error_print_loc(void);
void error_set_progname(const char *argv0);
void error_report(const char *fmt, ...) __attribute__ ((format(printf, 1, 2)));
-void qerror_report_internal(const char *file, int linenr, const char *func,
- const char *fmt, ...)
- __attribute__ ((format(printf, 4, 5)));
-
-#define qerror_report(fmt, ...) \
- qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__)
#endif
diff --git a/qerror.c b/qerror.c
index ff2fbd5..eaa1deb 100644
--- a/qerror.c
+++ b/qerror.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
* See the COPYING.LIB file in the top-level directory.
*/
+
+#include "monitor.h"
#include "qjson.h"
#include "qerror.h"
#include "qemu-common.h"
@@ -377,6 +379,24 @@ void qerror_print(QError *qerror)
QDECREF(qstring);
}
+void qerror_report_internal(const char *file, int linenr, const char *func,
+ const char *fmt, ...)
+{
+ va_list va;
+ QError *qerror;
+
+ va_start(va, fmt);
+ qerror = qerror_from_info(file, linenr, func, fmt, &va);
+ va_end(va);
+
+ if (monitor_cur_is_qmp()) {
+ monitor_set_error(cur_mon, qerror);
+ } else {
+ qerror_print(qerror);
+ QDECREF(qerror);
+ }
+}
+
/**
* qobject_to_qerror(): Convert a QObject into a QError
*/
diff --git a/qerror.h b/qerror.h
index d96abe1..dd298d4 100644
--- a/qerror.h
+++ b/qerror.h
@@ -37,6 +37,11 @@ QError *qerror_from_info(const char *file, int linenr, const char *func,
const char *fmt, va_list *va);
QString *qerror_human(const QError *qerror);
void qerror_print(QError *qerror);
+void qerror_report_internal(const char *file, int linenr, const char *func,
+ const char *fmt, ...)
+ __attribute__ ((format(printf, 4, 5)));
+#define qerror_report(fmt, ...) \
+ qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__)
QError *qobject_to_qerror(const QObject *obj);
/*
--
1.6.6.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] Re: [PATCH v2 0/6] error: Clean up after recent changes
2010-03-22 9:28 [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes Markus Armbruster
` (5 preceding siblings ...)
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 6/6] error: Move qerror_report() from qemu-error.[ch] to qerror.[ch] Markus Armbruster
@ 2010-03-23 21:46 ` Luiz Capitulino
2010-03-27 13:40 ` [Qemu-devel] " Aurelien Jarno
7 siblings, 0 replies; 9+ messages in thread
From: Luiz Capitulino @ 2010-03-23 21:46 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel
On Mon, 22 Mar 2010 10:28:59 +0100
Markus Armbruster <armbru@redhat.com> wrote:
> Cleaner integration of location tracking with qemu-tool.c. Move
> qerror_report() where it belongs.
>
> v2: Remove an assertion that unreachable code can't be reached, at
> Blue Swirl's request. Rebased.
>
> Markus Armbruster (6):
> error: Trim includes after "Move qemu_error & friends..."
> error: Trim includes in qerror.c
> error: Trim includes after "Infrastructure to track locations..."
> error: Make use of error_set_progname() optional
> error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.o
> error: Move qerror_report() from qemu-error.[ch] to qerror.[ch]
Looks good.
>
> Makefile | 6 +++---
> hw/qdev-properties.c | 1 +
> monitor.c | 2 --
> monitor.h | 1 -
> qemu-error.c | 20 +-------------------
> qemu-error.h | 6 ------
> qemu-tool.c | 49 +++++++++++++++----------------------------------
> qerror.c | 22 ++++++++++++++++++++--
> qerror.h | 5 +++++
> sysemu.h | 2 --
> 10 files changed, 45 insertions(+), 69 deletions(-)
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes
2010-03-22 9:28 [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes Markus Armbruster
` (6 preceding siblings ...)
2010-03-23 21:46 ` [Qemu-devel] Re: [PATCH v2 0/6] error: Clean up after recent changes Luiz Capitulino
@ 2010-03-27 13:40 ` Aurelien Jarno
7 siblings, 0 replies; 9+ messages in thread
From: Aurelien Jarno @ 2010-03-27 13:40 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel, lcapitulino
On Mon, Mar 22, 2010 at 10:28:59AM +0100, Markus Armbruster wrote:
> Cleaner integration of location tracking with qemu-tool.c. Move
> qerror_report() where it belongs.
>
> v2: Remove an assertion that unreachable code can't be reached, at
> Blue Swirl's request. Rebased.
>
> Markus Armbruster (6):
> error: Trim includes after "Move qemu_error & friends..."
> error: Trim includes in qerror.c
> error: Trim includes after "Infrastructure to track locations..."
> error: Make use of error_set_progname() optional
> error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.o
> error: Move qerror_report() from qemu-error.[ch] to qerror.[ch]
Thanks, applied.
> Makefile | 6 +++---
> hw/qdev-properties.c | 1 +
> monitor.c | 2 --
> monitor.h | 1 -
> qemu-error.c | 20 +-------------------
> qemu-error.h | 6 ------
> qemu-tool.c | 49 +++++++++++++++----------------------------------
> qerror.c | 22 ++++++++++++++++++++--
> qerror.h | 5 +++++
> sysemu.h | 2 --
> 10 files changed, 45 insertions(+), 69 deletions(-)
>
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-03-27 13:40 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-22 9:28 [Qemu-devel] [PATCH v2 0/6] error: Clean up after recent changes Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 1/6] error: Trim includes after "Move qemu_error & friends..." Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 2/6] error: Trim includes in qerror.c Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 3/6] error: Trim includes after "Infrastructure to track locations..." Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 4/6] error: Make use of error_set_progname() optional Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 5/6] error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.o Markus Armbruster
2010-03-22 9:29 ` [Qemu-devel] [PATCH v2 6/6] error: Move qerror_report() from qemu-error.[ch] to qerror.[ch] Markus Armbruster
2010-03-23 21:46 ` [Qemu-devel] Re: [PATCH v2 0/6] error: Clean up after recent changes Luiz Capitulino
2010-03-27 13:40 ` [Qemu-devel] " Aurelien Jarno
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.