Skip to content

Commit

Permalink
dump: hoist lzo_init() from get_len_buf_out() to dump_init()
Browse files Browse the repository at this point in the history
qmp_dump_guest_memory()
  dump_init()
    lzo_init() <---------+
  create_kdump_vmcore()  |
    write_dump_pages()   |
      get_len_buf_out()  |
        lzo_init() ------+

This patch doesn't change the fact that lzo_init() is called for every
LZO-compressed dump, but it makes get_len_buf_out() more focused (single
responsibility).

Suggested-by: Paolo Bonzini <[email protected]>
Signed-off-by: Laszlo Ersek <[email protected]>
Reviewed-by: Paolo Bonzini <[email protected]>
Signed-off-by: Luiz Capitulino <[email protected]>
  • Loading branch information
lersek authored and Luiz Capitulino committed Jun 11, 2014
1 parent 24aeeac commit c998acb
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -1231,13 +1231,6 @@ static size_t get_len_buf_out(size_t page_size, uint32_t flag_compress)

/* buf size for lzo */
#ifdef CONFIG_LZO
if (flag_compress & DUMP_DH_COMPRESSED_LZO) {
if (lzo_init() != LZO_E_OK) {
/* return 0 to indicate lzo is unavailable */
return 0;
}
}

/*
* LZO will expand incompressible data by a little amount. please check the
* following URL to see the expansion calculation:
Expand Down Expand Up @@ -1625,6 +1618,12 @@ static int dump_init(DumpState *s, int fd, bool has_format,
break;

case DUMP_GUEST_MEMORY_FORMAT_KDUMP_LZO:
#ifdef CONFIG_LZO
if (lzo_init() != LZO_E_OK) {
error_setg(errp, "failed to initialize the LZO library");
goto cleanup;
}
#endif
s->flag_compress = DUMP_DH_COMPRESSED_LZO;
break;

Expand Down

0 comments on commit c998acb

Please sign in to comment.