From: "Marc-André Lureau" <marcandre.lureau@redhat.com> To: qemu-devel@nongnu.org Cc: "Eric Blake" <eblake@redhat.com>, "Markus Armbruster" <armbru@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Michael Roth" <mdroth@linux.vnet.ibm.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com> Subject: [Qemu-devel] [PATCH v4 20/20] hmp: call the asynchronous QMP screendump to fix outdated/glitches Date: Tue, 9 Apr 2019 18:10:09 +0200 [thread overview] Message-ID: <20190409161009.6322-21-marcandre.lureau@redhat.com> (raw) In-Reply-To: <20190409161009.6322-1-marcandre.lureau@redhat.com> In order to fix the bad screendumps (same as rhbz#1230527), call into the asynchonous version of the QMP command. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- hmp.h | 3 ++- hmp.c | 6 ++---- ui/console.c | 22 ---------------------- hmp-commands.hx | 3 ++- 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/hmp.h b/hmp.h index 43617f2646..4059c8bea9 100644 --- a/hmp.h +++ b/hmp.h @@ -16,6 +16,7 @@ #include "qemu-common.h" #include "qemu/readline.h" +#include "qapi/qmp/dispatch.h" void hmp_info_name(Monitor *mon, const QDict *qdict); void hmp_info_version(Monitor *mon, const QDict *qdict); @@ -102,7 +103,7 @@ 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_sendkey(Monitor *mon, const QDict *qdict); -void hmp_screendump(Monitor *mon, const QDict *qdict); +void hmp_screendump_async(Monitor *mon, const QDict *qdict, QmpReturn *qret); void hmp_nbd_server_start(Monitor *mon, const QDict *qdict); void hmp_nbd_server_add(Monitor *mon, const QDict *qdict); void hmp_nbd_server_remove(Monitor *mon, const QDict *qdict); diff --git a/hmp.c b/hmp.c index 9428c90c5d..60d2bc1c76 100644 --- a/hmp.c +++ b/hmp.c @@ -2373,15 +2373,13 @@ err_out: goto out; } -void hmp_screendump(Monitor *mon, const QDict *qdict) +void hmp_screendump_async(Monitor *mon, const QDict *qdict, QmpReturn *qret) { const char *filename = qdict_get_str(qdict, "filename"); const char *id = qdict_get_try_str(qdict, "device"); int64_t head = qdict_get_try_int(qdict, "head", 0); - Error *err = NULL; - hmp_screendump_sync(filename, id != NULL, id, id != NULL, head, &err); - hmp_handle_error(mon, &err); + qmp_screendump(filename, id != NULL, id, id != NULL, head, qret); } void hmp_nbd_server_start(Monitor *mon, const QDict *qdict) diff --git a/ui/console.c b/ui/console.c index 620cd14b80..c259cf68aa 100644 --- a/ui/console.c +++ b/ui/console.c @@ -429,28 +429,6 @@ static QemuConsole *get_console(bool has_device, const char *device, return con; } -void hmp_screendump_sync(const char *filename, - bool has_device, const char *device, - bool has_head, int64_t head, Error **errp) -{ - DisplaySurface *surface; - QemuConsole *con = get_console(has_device, device, has_head, head, errp); - - if (!con) { - return; - } - /* This may not complete the drawing with Spice, you may have - * glitches or outdated dumps, use qmp instead! */ - graphic_hw_update(con); - surface = qemu_console_surface(con); - if (!surface) { - error_setg(errp, "no surface"); - return; - } - - ppm_save(filename, surface, errp); -} - void qmp_screendump(const char *filename, bool has_device, const char *device, bool has_head, int64_t head, diff --git a/hmp-commands.hx b/hmp-commands.hx index 9b4035965c..638b59e764 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -278,7 +278,8 @@ ETEXI .params = "filename [device [head]]", .help = "save screen from head 'head' of display device 'device' " "into PPM image 'filename'", - .cmd = hmp_screendump, + .async_cmd = hmp_screendump_async, + .async = true, }, STEXI -- 2.21.0.196.g041f5ea1cf
WARNING: multiple messages have this Message-ID (diff)
From: "Marc-André Lureau" <marcandre.lureau@redhat.com> To: qemu-devel@nongnu.org Cc: "Michael Roth" <mdroth@linux.vnet.ibm.com>, "Markus Armbruster" <armbru@redhat.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v4 20/20] hmp: call the asynchronous QMP screendump to fix outdated/glitches Date: Tue, 9 Apr 2019 18:10:09 +0200 [thread overview] Message-ID: <20190409161009.6322-21-marcandre.lureau@redhat.com> (raw) Message-ID: <20190409161009.Zy-cblHnSv8NgCCVzPpVPFYSJXwow3-97tP3k1ofoOc@z> (raw) In-Reply-To: <20190409161009.6322-1-marcandre.lureau@redhat.com> In order to fix the bad screendumps (same as rhbz#1230527), call into the asynchonous version of the QMP command. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- hmp.h | 3 ++- hmp.c | 6 ++---- ui/console.c | 22 ---------------------- hmp-commands.hx | 3 ++- 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/hmp.h b/hmp.h index 43617f2646..4059c8bea9 100644 --- a/hmp.h +++ b/hmp.h @@ -16,6 +16,7 @@ #include "qemu-common.h" #include "qemu/readline.h" +#include "qapi/qmp/dispatch.h" void hmp_info_name(Monitor *mon, const QDict *qdict); void hmp_info_version(Monitor *mon, const QDict *qdict); @@ -102,7 +103,7 @@ 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_sendkey(Monitor *mon, const QDict *qdict); -void hmp_screendump(Monitor *mon, const QDict *qdict); +void hmp_screendump_async(Monitor *mon, const QDict *qdict, QmpReturn *qret); void hmp_nbd_server_start(Monitor *mon, const QDict *qdict); void hmp_nbd_server_add(Monitor *mon, const QDict *qdict); void hmp_nbd_server_remove(Monitor *mon, const QDict *qdict); diff --git a/hmp.c b/hmp.c index 9428c90c5d..60d2bc1c76 100644 --- a/hmp.c +++ b/hmp.c @@ -2373,15 +2373,13 @@ err_out: goto out; } -void hmp_screendump(Monitor *mon, const QDict *qdict) +void hmp_screendump_async(Monitor *mon, const QDict *qdict, QmpReturn *qret) { const char *filename = qdict_get_str(qdict, "filename"); const char *id = qdict_get_try_str(qdict, "device"); int64_t head = qdict_get_try_int(qdict, "head", 0); - Error *err = NULL; - hmp_screendump_sync(filename, id != NULL, id, id != NULL, head, &err); - hmp_handle_error(mon, &err); + qmp_screendump(filename, id != NULL, id, id != NULL, head, qret); } void hmp_nbd_server_start(Monitor *mon, const QDict *qdict) diff --git a/ui/console.c b/ui/console.c index 620cd14b80..c259cf68aa 100644 --- a/ui/console.c +++ b/ui/console.c @@ -429,28 +429,6 @@ static QemuConsole *get_console(bool has_device, const char *device, return con; } -void hmp_screendump_sync(const char *filename, - bool has_device, const char *device, - bool has_head, int64_t head, Error **errp) -{ - DisplaySurface *surface; - QemuConsole *con = get_console(has_device, device, has_head, head, errp); - - if (!con) { - return; - } - /* This may not complete the drawing with Spice, you may have - * glitches or outdated dumps, use qmp instead! */ - graphic_hw_update(con); - surface = qemu_console_surface(con); - if (!surface) { - error_setg(errp, "no surface"); - return; - } - - ppm_save(filename, surface, errp); -} - void qmp_screendump(const char *filename, bool has_device, const char *device, bool has_head, int64_t head, diff --git a/hmp-commands.hx b/hmp-commands.hx index 9b4035965c..638b59e764 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -278,7 +278,8 @@ ETEXI .params = "filename [device [head]]", .help = "save screen from head 'head' of display device 'device' " "into PPM image 'filename'", - .cmd = hmp_screendump, + .async_cmd = hmp_screendump_async, + .async = true, }, STEXI -- 2.21.0.196.g041f5ea1cf
next prev parent reply other threads:[~2019-04-09 16:12 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-09 16:09 [Qemu-devel] [PATCH v4 00/20] monitor: add asynchronous command type Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:09 ` [Qemu-devel] [PATCH v4 01/20] qmp: constify QmpCommand and list Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:09 ` [Qemu-devel] [PATCH v4 02/20] json-lexer: make it safe to call destroy multiple times Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:09 ` [Qemu-devel] [PATCH v4 03/20] qmp: add QmpSession Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:09 ` [Qemu-devel] [PATCH v4 04/20] QmpSession: add a return callback Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:09 ` [Qemu-devel] [PATCH v4 05/20] QmpSession: add json parser and use it in qga Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:09 ` [Qemu-devel] [PATCH v4 06/20] monitor: use qmp session to parse json feed Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:09 ` [Qemu-devel] [PATCH v4 07/20] qga: simplify dispatch_return_cb Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:09 ` [Qemu-devel] [PATCH v4 08/20] QmpSession: introduce QmpReturn Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:09 ` [Qemu-devel] [PATCH v4 09/20] qmp: simplify qmp_return_error() Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:09 ` [Qemu-devel] [PATCH v4 10/20] QmpSession: keep a queue of pending commands Marc-André Lureau 2019-04-09 16:09 ` Marc-André Lureau 2019-04-09 16:10 ` [Qemu-devel] [PATCH v4 11/20] QmpSession: return orderly Marc-André Lureau 2019-04-09 16:10 ` Marc-André Lureau 2019-04-09 16:10 ` [Qemu-devel] [PATCH v4 12/20] qmp: introduce asynchronous command type Marc-André Lureau 2019-04-09 16:10 ` Marc-André Lureau 2019-04-09 16:10 ` [Qemu-devel] [PATCH v4 13/20] scripts: learn 'async' qapi commands Marc-André Lureau 2019-04-09 16:10 ` Marc-André Lureau 2019-04-09 16:10 ` [Qemu-devel] [PATCH v4 14/20] qmp: add qmp_return_is_cancelled() Marc-André Lureau 2019-04-09 16:10 ` Marc-André Lureau 2019-04-09 16:10 ` [Qemu-devel] [PATCH v4 15/20] monitor: add qmp_return_get_monitor() Marc-André Lureau 2019-04-09 16:10 ` Marc-André Lureau 2019-04-09 16:10 ` [Qemu-devel] [PATCH v4 16/20] console: add graphic_hw_update_done() Marc-André Lureau 2019-04-09 16:10 ` Marc-André Lureau 2019-04-10 8:43 ` Gerd Hoffmann 2019-04-10 8:43 ` Gerd Hoffmann 2019-04-09 16:10 ` [Qemu-devel] [PATCH v4 17/20] console: make screendump asynchronous Marc-André Lureau 2019-04-09 16:10 ` Marc-André Lureau 2019-04-10 8:48 ` Gerd Hoffmann 2019-04-10 8:48 ` Gerd Hoffmann 2019-07-15 19:09 ` Marc-André Lureau 2019-07-30 11:23 ` Gerd Hoffmann 2019-04-09 16:10 ` [Qemu-devel] [PATCH v4 18/20] monitor: start making qmp_human_monitor_command() asynchronous Marc-André Lureau 2019-04-09 16:10 ` Marc-André Lureau 2019-04-09 16:10 ` [Qemu-devel] [PATCH v4 19/20] monitor: teach HMP about asynchronous commands Marc-André Lureau 2019-04-09 16:10 ` Marc-André Lureau 2019-04-09 16:10 ` Marc-André Lureau [this message] 2019-04-09 16:10 ` [Qemu-devel] [PATCH v4 20/20] hmp: call the asynchronous QMP screendump to fix outdated/glitches Marc-André Lureau 2019-04-09 19:05 ` [Qemu-devel] [PATCH v4 00/20] monitor: add asynchronous command type no-reply 2019-04-09 19:05 ` no-reply 2019-04-09 19:07 ` no-reply 2019-04-09 19:07 ` no-reply 2019-05-17 22:21 ` Marc-André Lureau 2019-05-21 14:17 ` Markus Armbruster 2019-05-21 14:50 ` Marc-André Lureau 2019-05-23 7:52 ` Markus Armbruster 2019-05-25 12:12 ` Marc-André Lureau 2019-05-27 8:18 ` Markus Armbruster 2019-05-27 9:07 ` Gerd Hoffmann 2019-05-27 13:23 ` Markus Armbruster 2019-05-27 15:17 ` Marc-André Lureau 2019-05-28 6:09 ` Gerd Hoffmann 2019-05-31 9:15 ` Kevin Wolf 2019-05-21 20:50 ` John Snow
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190409161009.6322-21-marcandre.lureau@redhat.com \ --to=marcandre.lureau@redhat.com \ --cc=armbru@redhat.com \ --cc=dgilbert@redhat.com \ --cc=eblake@redhat.com \ --cc=kraxel@redhat.com \ --cc=mdroth@linux.vnet.ibm.com \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.