[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/9] qapi: convert screendump
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 3/9] qapi: convert screendump |
Date: |
Wed, 29 Aug 2012 16:53:00 -0300 |
Next commits will update devices to propagate errors.
Signed-off-by: Luiz Capitulino <address@hidden>
---
console.c | 7 ++++---
console.h | 1 -
hmp-commands.hx | 3 +--
hmp.c | 9 +++++++++
hmp.h | 1 +
monitor.c | 6 ------
qapi-schema.json | 13 +++++++++++++
qmp-commands.hx | 5 +----
8 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/console.c b/console.c
index bd501aa..9ab95d8 100644
--- a/console.c
+++ b/console.c
@@ -24,6 +24,7 @@
#include "qemu-common.h"
#include "console.h"
#include "qemu-timer.h"
+#include "qmp-commands.h"
//#define DEBUG_CONSOLE
#define DEFAULT_BACKSCROLL 512
@@ -176,7 +177,7 @@ void vga_hw_invalidate(void)
active_console->hw_invalidate(active_console->hw);
}
-void vga_hw_screen_dump(const char *filename)
+void qmp_screendump(const char *filename, Error **errp)
{
TextConsole *previous_active_console;
bool cswitch;
@@ -190,9 +191,9 @@ void vga_hw_screen_dump(const char *filename)
console_select(0);
}
if (consoles[0] && consoles[0]->hw_screen_dump) {
- consoles[0]->hw_screen_dump(consoles[0]->hw, filename, cswitch, NULL);
+ consoles[0]->hw_screen_dump(consoles[0]->hw, filename, cswitch, errp);
} else {
- error_report("screen dump not implemented");
+ error_setg(errp, "device doesn't support screendump\n");
}
if (cswitch) {
diff --git a/console.h b/console.h
index 9caeb43..d72c546 100644
--- a/console.h
+++ b/console.h
@@ -356,7 +356,6 @@ DisplayState *graphic_console_init(vga_hw_update_ptr update,
void vga_hw_update(void);
void vga_hw_invalidate(void);
-void vga_hw_screen_dump(const char *filename);
void vga_hw_text_update(console_ch_t *chardata);
int is_graphic_console(void);
diff --git a/hmp-commands.hx b/hmp-commands.hx
index f6104b0..cb09e9d 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -194,8 +194,7 @@ ETEXI
.args_type = "filename:F",
.params = "filename",
.help = "save screen into PPM image 'filename'",
- .user_print = monitor_user_noop,
- .mhandler.cmd_new = do_screen_dump,
+ .mhandler.cmd = hmp_screen_dump,
},
STEXI
diff --git a/hmp.c b/hmp.c
index 81c8acb..ad1dbe7 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1102,3 +1102,12 @@ void hmp_closefd(Monitor *mon, const QDict *qdict)
qmp_closefd(fdname, &errp);
hmp_handle_error(mon, &errp);
}
+
+void hmp_screen_dump(Monitor *mon, const QDict *qdict)
+{
+ const char *filename = qdict_get_str(qdict, "filename");
+ Error *err = NULL;
+
+ qmp_screendump(filename, &err);
+ hmp_handle_error(mon, &err);
+}
diff --git a/hmp.h b/hmp.h
index 7dd93bf..1278abd 100644
--- a/hmp.h
+++ b/hmp.h
@@ -71,5 +71,6 @@ void hmp_netdev_add(Monitor *mon, const QDict *qdict);
void hmp_netdev_del(Monitor *mon, const QDict *qdict);
void hmp_getfd(Monitor *mon, const QDict *qdict);
void hmp_closefd(Monitor *mon, const QDict *qdict);
+void hmp_screen_dump(Monitor *mon, const QDict *qdict);
#endif
diff --git a/monitor.c b/monitor.c
index b17b1bb..d285ef3 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1016,12 +1016,6 @@ static int client_migrate_info(Monitor *mon, const QDict
*qdict,
return -1;
}
-static int do_screen_dump(Monitor *mon, const QDict *qdict, QObject **ret_data)
-{
- vga_hw_screen_dump(qdict_get_str(qdict, "filename"));
- return 0;
-}
-
static void do_logfile(Monitor *mon, const QDict *qdict)
{
cpu_set_log_filename(qdict_get_str(qdict, "filename"));
diff --git a/qapi-schema.json b/qapi-schema.json
index bd8ad74..99192ed 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2493,3 +2493,16 @@
# Since: 1.2.0
##
{ 'command': 'query-target', 'returns': 'TargetInfo' }
+
+##
+# @screendump:
+#
+# Write a PPM of the VGA screen to a file.
+#
+# @filename: the path of a new PPM file to store the image
+#
+# Returns: Nothing on success
+#
+# Since: 0.14.0
+##
+{ 'command': 'screendump', 'data': {'filename': 'str'} }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 3745a21..0edc923 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -146,10 +146,7 @@ EQMP
{
.name = "screendump",
.args_type = "filename:F",
- .params = "filename",
- .help = "save screen into PPM image 'filename'",
- .user_print = monitor_user_noop,
- .mhandler.cmd_new = do_screen_dump,
+ .mhandler.cmd_new = qmp_marshal_input_screendump,
},
SQMP
--
1.7.11.2.249.g31c7954.dirty
- [Qemu-devel] [PATCH qmp-next v3 0/9]: qapi: convert screendump, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 1/9] error: add error_setg(), Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 2/9] console: vga_hw_screen_dump_ptr: take Error argument, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 3/9] qapi: convert screendump,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 4/9] vga: ppm_save(): add error handling, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 5/9] omap_lcdc: rename ppm_save() to omap_ppm_save(), Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 6/9] omap_lcdc: omap_ppm_save(): add error handling, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 7/9] g364fb: g364fb_screen_dump(): add error handling, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 8/9] tcx: tcx24_screen_dump(): add error handling, Luiz Capitulino, 2012/08/29
- [Qemu-devel] [PATCH 9/9] tcx: tcx_screen_dump(): add error handling, Luiz Capitulino, 2012/08/29