2
0
Эх сурвалжийг харах

Move error_printf_unless_qmp() with monitor unit

Since it depends on monitor code, and error_vprintf_unless_qmp() is
already there.

This will help to move error-report in a common subproject.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220420132624.2439741-31-marcandre.lureau@redhat.com>
Marc-André Lureau 3 жил өмнө
parent
commit
756a98dd70

+ 3 - 0
include/monitor/monitor.h

@@ -56,4 +56,7 @@ void monitor_register_hmp(const char *name, bool info,
 void monitor_register_hmp_info_hrt(const char *name,
 void monitor_register_hmp_info_hrt(const char *name,
                                    HumanReadableText *(*handler)(Error **errp));
                                    HumanReadableText *(*handler)(Error **errp));
 
 
+int error_vprintf_unless_qmp(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
+int error_printf_unless_qmp(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
+
 #endif /* MONITOR_H */
 #endif /* MONITOR_H */

+ 0 - 2
include/qemu/error-report.h

@@ -32,8 +32,6 @@ void loc_set_file(const char *fname, int lno);
 
 
 int error_vprintf(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
 int error_vprintf(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
 int error_printf(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
 int error_printf(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
-int error_vprintf_unless_qmp(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
-int error_printf_unless_qmp(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
 
 
 void error_vreport(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
 void error_vreport(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
 void warn_vreport(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);
 void warn_vreport(const char *fmt, va_list ap) G_GNUC_PRINTF(1, 0);

+ 10 - 0
monitor/monitor.c

@@ -286,6 +286,16 @@ int error_vprintf_unless_qmp(const char *fmt, va_list ap)
     return -1;
     return -1;
 }
 }
 
 
+int error_printf_unless_qmp(const char *fmt, ...)
+{
+    va_list ap;
+    int ret;
+
+    va_start(ap, fmt);
+    ret = error_vprintf_unless_qmp(fmt, ap);
+    va_end(ap);
+    return ret;
+}
 
 
 static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] = {
 static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] = {
     /* Limit guest-triggerable events to 1 per second */
     /* Limit guest-triggerable events to 1 per second */

+ 1 - 0
stubs/error-printf.c

@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qemu/error-report.h"
+#include "monitor/monitor.h"
 
 
 int error_vprintf(const char *fmt, va_list ap)
 int error_vprintf(const char *fmt, va_list ap)
 {
 {

+ 1 - 0
ui/vnc.c

@@ -54,6 +54,7 @@
 #include "qemu/cutils.h"
 #include "qemu/cutils.h"
 #include "qemu/help_option.h"
 #include "qemu/help_option.h"
 #include "io/dns-resolver.h"
 #include "io/dns-resolver.h"
+#include "monitor/monitor.h"
 
 
 #define VNC_REFRESH_INTERVAL_BASE GUI_REFRESH_INTERVAL_DEFAULT
 #define VNC_REFRESH_INTERVAL_BASE GUI_REFRESH_INTERVAL_DEFAULT
 #define VNC_REFRESH_INTERVAL_INC  50
 #define VNC_REFRESH_INTERVAL_INC  50

+ 0 - 11
util/error-report.c

@@ -40,17 +40,6 @@ int error_printf(const char *fmt, ...)
     return ret;
     return ret;
 }
 }
 
 
-int error_printf_unless_qmp(const char *fmt, ...)
-{
-    va_list ap;
-    int ret;
-
-    va_start(ap, fmt);
-    ret = error_vprintf_unless_qmp(fmt, ap);
-    va_end(ap);
-    return ret;
-}
-
 static Location std_loc = {
 static Location std_loc = {
     .kind = LOC_NONE
     .kind = LOC_NONE
 };
 };