[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v6 11/11] dump-guest-memory: add qmp event DUMP_
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH v6 11/11] dump-guest-memory: add qmp event DUMP_COMPLETED |
Date: |
Tue, 16 Feb 2016 14:50:15 +0800 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Wed, 12/09 10:42, Peter Xu wrote:
> One new QMP event DUMP_COMPLETED is added. When a dump finishes, one
> DUMP_COMPLETED event will occur to notify the user.
>
> Signed-off-by: Peter Xu <address@hidden>
> ---
> docs/qmp-events.txt | 18 ++++++++++++++++++
> dump.c | 19 +++++++++++++------
> qapi/event.json | 16 ++++++++++++++++
> 3 files changed, 47 insertions(+), 6 deletions(-)
>
> diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt
> index d2f1ce4..3a03004 100644
> --- a/docs/qmp-events.txt
> +++ b/docs/qmp-events.txt
> @@ -220,6 +220,24 @@ Data:
> },
> "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
>
> +DUMP_COMPLETED
> +--------------
> +
> +Emitted when the guest has finished one memory dump.
> +
> +Data:
> +
> +- "result": DumpQueryResult type described in qapi-schema.json
> +- "error": Error message when dump failed. This is only a
> + human-readable string provided when dump failed. It should not be
> + parsed in any way (json-string, optional)
> +
> +Example:
> +
> +{ "event": "DUMP_COMPLETED",
> + "data": {"result": {"total": 1090650112, "status": "completed",
> + "completed": 1090650112} } }
> +
> GUEST_PANICKED
> --------------
>
> diff --git a/dump.c b/dump.c
> index 80afa1e..30be595 100644
> --- a/dump.c
> +++ b/dump.c
> @@ -25,6 +25,7 @@
> #include "qapi/error.h"
> #include "qapi/qmp/qerror.h"
> #include "qmp-commands.h"
> +#include "qapi-event.h"
>
> #include <zlib.h>
> #ifdef CONFIG_LZO
> @@ -1633,6 +1634,7 @@ cleanup:
> static void dump_process(DumpState *s, Error **errp)
> {
> Error *local_err = NULL;
> + DumpQueryResult *result = NULL;
>
> if (s->has_format && s->format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
> create_kdump_vmcore(s, &local_err);
> @@ -1645,6 +1647,16 @@ static void dump_process(DumpState *s, Error **errp)
> atomic_set(&s->status,
> (local_err ? DUMP_STATUS_FAILED : DUMP_STATUS_COMPLETED));
>
> + /* send DUMP_COMPLETED message (unconditionally) */
> + result = qmp_query_dump(NULL);
> + /* should never fail */
> + assert(result);
> + qapi_event_send_dump_completed(result, !!local_err, (local_err ? \
> + error_get_pretty(local_err) : NULL),
> + &error_abort);
> + qapi_free_DumpQueryResult(result);
> +
> + error_propagate(errp, local_err);
> dump_cleanup(s);
> }
>
> @@ -1652,13 +1664,8 @@ static void *dump_thread(void *data)
> {
> Error *err = NULL;
> DumpState *s = (DumpState *)data;
> -
> dump_process(s, &err);
> -
> - if (err) {
> - /* TODO: notify user the error */
> - error_free(err);
> - }
> + error_free(err);
> return NULL;
> }
>
> diff --git a/qapi/event.json b/qapi/event.json
> index f0cef01..bf7dd61 100644
> --- a/qapi/event.json
> +++ b/qapi/event.json
> @@ -356,3 +356,19 @@
> ##
> { 'event': 'MEM_UNPLUG_ERROR',
> 'data': { 'device': 'str', 'msg': 'str' } }
> +
> +##
> +# @DUMP_COMPLETED
> +#
> +# Emitted when background dump has completed
> +#
> +# @result: DumpQueryResult type described in qapi-schema.json.
> +#
> +# @error: #optional human-readable error string that provides
> +# hint on why dump failed. Only presents on failure. The
> +# user should not try to interpret the error string.
> +#
> +# Since: 2.6
> +##
> +{ 'event': 'DUMP_COMPLETED' ,
> + 'data': { 'result': 'DumpQueryResult', '*error': 'str' } }
> --
> 2.4.3
>
Reviewed-by: Fam Zheng <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH v6 11/11] dump-guest-memory: add qmp event DUMP_COMPLETED,
Fam Zheng <=