On Tue, 12/01 21:28, Peter Xu wrote:
> No functional change. Cleanup only.
>
> Signed-off-by: Peter Xu <pet...@redhat.com>
> ---
> dump.c | 35 ++++++++++++++++++++++-------------
> include/sysemu/dump.h | 3 +++
> 2 files changed, 25 insertions(+), 13 deletions(-)
>
> diff --git a/dump.c b/dump.c
> index 3cf75db..e46749d 100644
> --- a/dump.c
> +++ b/dump.c
> @@ -1441,6 +1441,9 @@ static void dump_init(DumpState *s, int fd, bool
> has_format,
> Error *err = NULL;
> int ret;
>
> + s->has_format = has_format;
> + s->format = format;
> +
> /* kdump-compressed is conflict with paging and filter */
> if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
> assert(!paging && !has_filter);
> @@ -1594,6 +1597,24 @@ cleanup:
> dump_cleanup(s);
> }
>
> +/* this operation might be time consuming. */
> +static void dump_process(DumpState *s, Error **errp)
> +{
> + if (s->has_format && s->format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
> + create_kdump_vmcore(s, errp);
> + } else {
> + create_vmcore(s, errp);
> + }
> +
> + if (*errp) {
> + s->status = DUMP_STATUS_FAILED;
> + } else {
> + s->status = DUMP_STATUS_COMPLETED;
> + }
As in patch 3, this should use local_err + error_propagate.
> +
> + dump_cleanup(s);
> +}
> +
> void qmp_dump_guest_memory(bool paging, const char *file,
> bool has_detach, bool detach,
> bool has_begin, int64_t begin, bool has_length,
> @@ -1679,19 +1700,7 @@ void qmp_dump_guest_memory(bool paging, const char
> *file,
> return;
> }
>
> - if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
> - create_kdump_vmcore(s, errp);
> - } else {
> - create_vmcore(s, errp);
> - }
> -
> - if (*errp) {
> - s->status = DUMP_STATUS_FAILED;
> - } else {
> - s->status = DUMP_STATUS_COMPLETED;
> - }
> -
> - dump_cleanup(s);
> + dump_process(s, errp);
> }
>
> DumpGuestMemoryCapability *qmp_query_dump_guest_memory_capability(Error
> **errp)
> diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h
> index affef38..d6f4a9c 100644
> --- a/include/sysemu/dump.h
> +++ b/include/sysemu/dump.h
> @@ -185,6 +185,9 @@ typedef struct DumpState {
> size_t num_dumpable; /* number of page that can be dumped */
> uint32_t flag_compress; /* indicate the compression format */
> DumpStatus status; /* current dump status */
> +
> + bool has_format; /* whether format is provided */
> + DumpGuestMemoryFormat format; /* valid only if has_format == true */
> } DumpState;
>
> uint16_t cpu_to_dump16(DumpState *s, uint16_t val);
> --
> 2.4.3
>
