|
 |
9ae3a8 |
From 83178d872394db83d8e4cc91f34edd7c2af43bc2 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 7 Nov 2014 17:18:12 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 25/41] dump: hoist lzo_init() from get_len_buf_out() to
|
|
|
9ae3a8 |
dump_init()
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1415380693-16593-26-git-send-email-lersek@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 62208
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 25/26] dump: hoist lzo_init() from get_len_buf_out() to dump_init()
|
|
|
9ae3a8 |
Bugzilla: 1157798
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: dgibson <dgibson@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
qmp_dump_guest_memory()
|
|
|
9ae3a8 |
dump_init()
|
|
|
9ae3a8 |
lzo_init() <---------+
|
|
|
9ae3a8 |
create_kdump_vmcore() |
|
|
|
9ae3a8 |
write_dump_pages() |
|
|
|
9ae3a8 |
get_len_buf_out() |
|
|
|
9ae3a8 |
lzo_init() ------+
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This patch doesn't change the fact that lzo_init() is called for every
|
|
|
9ae3a8 |
LZO-compressed dump, but it makes get_len_buf_out() more focused (single
|
|
|
9ae3a8 |
responsibility).
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit c998acb03df614ddf2f3e206582586f191d07fff)
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
dump.c | 13 ++++++-------
|
|
|
9ae3a8 |
1 file changed, 6 insertions(+), 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/dump.c b/dump.c
|
|
|
9ae3a8 |
index 450f658..f980354 100644
|
|
|
9ae3a8 |
--- a/dump.c
|
|
|
9ae3a8 |
+++ b/dump.c
|
|
|
9ae3a8 |
@@ -1237,13 +1237,6 @@ static size_t get_len_buf_out(size_t page_size, uint32_t flag_compress)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* buf size for lzo */
|
|
|
9ae3a8 |
#ifdef CONFIG_LZO
|
|
|
9ae3a8 |
- if (flag_compress & DUMP_DH_COMPRESSED_LZO) {
|
|
|
9ae3a8 |
- if (lzo_init() != LZO_E_OK) {
|
|
|
9ae3a8 |
- /* return 0 to indicate lzo is unavailable */
|
|
|
9ae3a8 |
- return 0;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
/*
|
|
|
9ae3a8 |
* LZO will expand incompressible data by a little amount. please check the
|
|
|
9ae3a8 |
* following URL to see the expansion calculation:
|
|
|
9ae3a8 |
@@ -1631,6 +1624,12 @@ static int dump_init(DumpState *s, int fd, bool has_format,
|
|
|
9ae3a8 |
break;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
case DUMP_GUEST_MEMORY_FORMAT_KDUMP_LZO:
|
|
|
9ae3a8 |
+#ifdef CONFIG_LZO
|
|
|
9ae3a8 |
+ if (lzo_init() != LZO_E_OK) {
|
|
|
9ae3a8 |
+ error_setg(errp, "failed to initialize the LZO library");
|
|
|
9ae3a8 |
+ goto cleanup;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+#endif
|
|
|
9ae3a8 |
s->flag_compress = DUMP_DH_COMPRESSED_LZO;
|
|
|
9ae3a8 |
break;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|