From e105226b0203159f15fc932eac668c67686ec923 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>

Date: Wed, 13 Dec 2017 13:38:54 +0100

Subject: [PATCH 23/41] dump-guest-memory: cleanup: removing

 dump_{error|cleanup}().

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>

Message-id: <20171213133912.26176-24-marcandre.lureau@redhat.com>

Patchwork-id: 78372

O-Subject: [RHEL-7.5 qemu-kvm PATCH v3 23/41] dump-guest-memory: cleanup: removing dump_{error|cleanup}().

Bugzilla: 1411490

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Peter Xu <peterx@redhat.com>

It might be a little bit confusing and error prone to do

dump_cleanup() in these two functions. A better way is to do

dump_cleanup() before dump finish, no matter whether dump has

succeeded or not.

Signed-off-by: Peter Xu <peterx@redhat.com>

Reviewed-by: Fam Zheng <famz@redhat.com>

Message-Id: <1455772616-8668-2-git-send-email-peterx@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit e3517a529913a2a48c12ba8eef4975ad561af97c)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 dump.c | 78 +++++++++++++++++++++++++++---------------------------------------

 1 file changed, 32 insertions(+), 46 deletions(-)

diff --git a/dump.c b/dump.c

index a359c29..790bfe4 100644

--- a/dump.c

+++ b/dump.c

@@ -81,12 +81,6 @@ static int dump_cleanup(DumpState *s)

     return 0;

 }

-static void dump_error(DumpState *s, const char *reason, Error **errp)

-{

-    dump_cleanup(s);

-    error_setg(errp, "%s", reason);

-}

-

 static int fd_write_vmcore(const void *buf, size_t size, void *opaque)

 {

     DumpState *s = opaque;

@@ -127,7 +121,7 @@ static void write_elf64_header(DumpState *s, Error **errp)

     ret = fd_write_vmcore(&elf_header, sizeof(elf_header), s);

     if (ret < 0) {

-        dump_error(s, "dump: failed to write elf header", errp);

+        error_setg(errp, "dump: failed to write elf header");

     }

 }

@@ -158,7 +152,7 @@ static void write_elf32_header(DumpState *s, Error **errp)

     ret = fd_write_vmcore(&elf_header, sizeof(elf_header), s);

     if (ret < 0) {

-        dump_error(s, "dump: failed to write elf header", errp);

+        error_setg(errp, "dump: failed to write elf header");

     }

 }

@@ -181,7 +175,7 @@ static void write_elf64_load(DumpState *s, MemoryMapping *memory_mapping,

     ret = fd_write_vmcore(&phdr, sizeof(Elf64_Phdr), s);

     if (ret < 0) {

-        dump_error(s, "dump: failed to write program header table", errp);

+        error_setg(errp, "dump: failed to write program header table");

     }

 }

@@ -204,7 +198,7 @@ static void write_elf32_load(DumpState *s, MemoryMapping *memory_mapping,

     ret = fd_write_vmcore(&phdr, sizeof(Elf32_Phdr), s);

     if (ret < 0) {

-        dump_error(s, "dump: failed to write program header table", errp);

+        error_setg(errp, "dump: failed to write program header table");

     }

 }

@@ -224,7 +218,7 @@ static void write_elf64_note(DumpState *s, Error **errp)

     ret = fd_write_vmcore(&phdr, sizeof(Elf64_Phdr), s);

     if (ret < 0) {

-        dump_error(s, "dump: failed to write program header table", errp);

+        error_setg(errp, "dump: failed to write program header table");

     }

 }

@@ -246,7 +240,7 @@ static void write_elf64_notes(WriteCoreDumpFunction f, DumpState *s,

         id = cpu_index(cpu);

         ret = cpu_write_elf64_note(f, cpu, id, s);

         if (ret < 0) {

-            dump_error(s, "dump: failed to write elf notes", errp);

+            error_setg(errp, "dump: failed to write elf notes");

             return;

         }

     }

@@ -255,7 +249,7 @@ static void write_elf64_notes(WriteCoreDumpFunction f, DumpState *s,

         cpu = ENV_GET_CPU(env);

         ret = cpu_write_elf64_qemunote(f, cpu, s);

         if (ret < 0) {

-            dump_error(s, "dump: failed to write CPU status", errp);

+            error_setg(errp, "dump: failed to write CPU status");

             return;

         }

     }

@@ -277,7 +271,7 @@ static void write_elf32_note(DumpState *s, Error **errp)

     ret = fd_write_vmcore(&phdr, sizeof(Elf32_Phdr), s);

     if (ret < 0) {

-        dump_error(s, "dump: failed to write program header table", errp);

+        error_setg(errp, "dump: failed to write program header table");

     }

 }

@@ -294,7 +288,7 @@ static void write_elf32_notes(WriteCoreDumpFunction f, DumpState *s,

         id = cpu_index(cpu);

         ret = cpu_write_elf32_note(f, cpu, id, s);

         if (ret < 0) {

-            dump_error(s, "dump: failed to write elf notes", errp);

+            error_setg(errp, "dump: failed to write elf notes");

             return;

         }

     }

@@ -303,7 +297,7 @@ static void write_elf32_notes(WriteCoreDumpFunction f, DumpState *s,

         cpu = ENV_GET_CPU(env);

         ret = cpu_write_elf32_qemunote(f, cpu, s);

         if (ret < 0) {

-            dump_error(s, "dump: failed to write CPU status", errp);

+            error_setg(errp, "dump: failed to write CPU status");

             return;

         }

     }

@@ -331,7 +325,7 @@ static void write_elf_section(DumpState *s, int type, Error **errp)

     ret = fd_write_vmcore(&shdr, shdr_size, s);

     if (ret < 0) {

-        dump_error(s, "dump: failed to write section header table", errp);

+        error_setg(errp, "dump: failed to write section header table");

     }

 }

@@ -341,7 +335,7 @@ static void write_data(DumpState *s, void *buf, int length, Error **errp)

     ret = fd_write_vmcore(buf, length, s);

     if (ret < 0) {

-        dump_error(s, "dump: failed to save memory", errp);

+        error_setg(errp, "dump: failed to save memory");

     }

 }

@@ -573,11 +567,6 @@ static void dump_begin(DumpState *s, Error **errp)

     }

 }

-static void dump_completed(DumpState *s)

-{

-    dump_cleanup(s);

-}

-

 static int get_next_block(DumpState *s, GuestPhysBlock *block)

 {

     while (1) {

@@ -629,8 +618,6 @@ static void dump_iterate(DumpState *s, Error **errp)

         }

     } while (!get_next_block(s, block));

-

-    dump_completed(s);

 }

 static void create_vmcore(DumpState *s, Error **errp)

@@ -770,7 +757,7 @@ static void create_header32(DumpState *s, Error **errp)

     dh->status = cpu_to_dump32(s, status);

     if (write_buffer(s->fd, 0, dh, size) < 0) {

-        dump_error(s, "dump: failed to write disk dump header", errp);

+        error_setg(errp, "dump: failed to write disk dump header");

         goto out;

     }

@@ -789,7 +776,7 @@ static void create_header32(DumpState *s, Error **errp)

     if (write_buffer(s->fd, DISKDUMP_HEADER_BLOCKS *

                      block_size, kh, size) < 0) {

-        dump_error(s, "dump: failed to write kdump sub header", errp);

+        error_setg(errp, "dump: failed to write kdump sub header");

         goto out;

     }

@@ -805,7 +792,7 @@ static void create_header32(DumpState *s, Error **errp)

     }

     if (write_buffer(s->fd, offset_note, s->note_buf,

                      s->note_size) < 0) {

-        dump_error(s, "dump: failed to write notes", errp);

+        error_setg(errp, "dump: failed to write notes");

         goto out;

     }

@@ -870,7 +857,7 @@ static void create_header64(DumpState *s, Error **errp)

     dh->status = cpu_to_dump32(s, status);

     if (write_buffer(s->fd, 0, dh, size) < 0) {

-        dump_error(s, "dump: failed to write disk dump header", errp);

+        error_setg(errp, "dump: failed to write disk dump header");

         goto out;

     }

@@ -889,7 +876,7 @@ static void create_header64(DumpState *s, Error **errp)

     if (write_buffer(s->fd, DISKDUMP_HEADER_BLOCKS *

                      block_size, kh, size) < 0) {

-        dump_error(s, "dump: failed to write kdump sub header", errp);

+        error_setg(errp, "dump: failed to write kdump sub header");

         goto out;

     }

@@ -906,7 +893,7 @@ static void create_header64(DumpState *s, Error **errp)

     if (write_buffer(s->fd, offset_note, s->note_buf,

                      s->note_size) < 0) {

-        dump_error(s, "dump: failed to write notes", errp);

+        error_setg(errp, "dump: failed to write notes");

         goto out;

     }

@@ -1092,7 +1079,7 @@ static void write_dump_bitmap(DumpState *s, Error **errp)

     while (get_next_page(&block_iter, &pfn, NULL, s)) {

         ret = set_dump_bitmap(last_pfn, pfn, true, dump_bitmap_buf, s);

         if (ret < 0) {

-            dump_error(s, "dump: failed to set dump_bitmap", errp);

+            error_setg(errp, "dump: failed to set dump_bitmap");

             goto out;

         }

@@ -1109,7 +1096,7 @@ static void write_dump_bitmap(DumpState *s, Error **errp)

         ret = set_dump_bitmap(last_pfn, last_pfn + bits_per_buf, false,

                               dump_bitmap_buf, s);

         if (ret < 0) {

-            dump_error(s, "dump: failed to sync dump_bitmap", errp);

+            error_setg(errp, "dump: failed to sync dump_bitmap");

             goto out;

         }

     }

@@ -1242,7 +1229,7 @@ static void write_dump_pages(DumpState *s, Error **errp)

     ret = write_cache(&page_data, buf, s->dump_info.page_size, false);

     g_free(buf);

     if (ret < 0) {

-        dump_error(s, "dump: failed to write page data (zero page)", errp);

+        error_setg(errp, "dump: failed to write page data (zero page)");

         goto out;

     }

@@ -1258,7 +1245,7 @@ static void write_dump_pages(DumpState *s, Error **errp)

             ret = write_cache(&page_desc, &pd_zero, sizeof(PageDescriptor),

                               false);

             if (ret < 0) {

-                dump_error(s, "dump: failed to write page desc", errp);

+                error_setg(errp, "dump: failed to write page desc");

                 goto out;

             }

         } else {

@@ -1283,7 +1270,7 @@ static void write_dump_pages(DumpState *s, Error **errp)

                 ret = write_cache(&page_data, buf_out, size_out, false);

                 if (ret < 0) {

-                    dump_error(s, "dump: failed to write page data", errp);

+                    error_setg(errp, "dump: failed to write page data");

                     goto out;

                 }

 #ifdef CONFIG_LZO

@@ -1296,7 +1283,7 @@ static void write_dump_pages(DumpState *s, Error **errp)

                 ret = write_cache(&page_data, buf_out, size_out, false);

                 if (ret < 0) {

-                    dump_error(s, "dump: failed to write page data", errp);

+                    error_setg(errp, "dump: failed to write page data");

                     goto out;

                 }

 #endif

@@ -1310,7 +1297,7 @@ static void write_dump_pages(DumpState *s, Error **errp)

                 ret = write_cache(&page_data, buf_out, size_out, false);

                 if (ret < 0) {

-                    dump_error(s, "dump: failed to write page data", errp);

+                    error_setg(errp, "dump: failed to write page data");

                     goto out;

                 }

 #endif

@@ -1326,7 +1313,7 @@ static void write_dump_pages(DumpState *s, Error **errp)

                 ret = write_cache(&page_data, buf,

                                   s->dump_info.page_size, false);

                 if (ret < 0) {

-                    dump_error(s, "dump: failed to write page data", errp);

+                    error_setg(errp, "dump: failed to write page data");

                     goto out;

                 }

             }

@@ -1338,7 +1325,7 @@ static void write_dump_pages(DumpState *s, Error **errp)

             ret = write_cache(&page_desc, &pd, sizeof(PageDescriptor), false);

             if (ret < 0) {

-                dump_error(s, "dump: failed to write page desc", errp);

+                error_setg(errp, "dump: failed to write page desc");

                 goto out;

             }

         }

@@ -1346,12 +1333,12 @@ static void write_dump_pages(DumpState *s, Error **errp)

     ret = write_cache(&page_desc, NULL, 0, true);

     if (ret < 0) {

-        dump_error(s, "dump: failed to sync cache for page_desc", errp);

+        error_setg(errp, "dump: failed to sync cache for page_desc");

         goto out;

     }

     ret = write_cache(&page_data, NULL, 0, true);

     if (ret < 0) {

-        dump_error(s, "dump: failed to sync cache for page_data", errp);

+        error_setg(errp, "dump: failed to sync cache for page_data");

         goto out;

     }

@@ -1395,7 +1382,7 @@ static void create_kdump_vmcore(DumpState *s, Error **errp)

     ret = write_start_flat_header(s->fd);

     if (ret < 0) {

-        dump_error(s, "dump: failed to write start flat header", errp);

+        error_setg(errp, "dump: failed to write start flat header");

         return;

     }

@@ -1419,11 +1406,9 @@ static void create_kdump_vmcore(DumpState *s, Error **errp)

     ret = write_end_flat_header(s->fd);

     if (ret < 0) {

-        dump_error(s, "dump: failed to write end flat header", errp);

+        error_setg(errp, "dump: failed to write end flat header");

         return;

     }

-

-    dump_completed(s);

 }

 static ram_addr_t get_start_block(DumpState *s)

@@ -1711,6 +1696,7 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin,

         create_vmcore(s, errp);

     }

+    dump_cleanup(s);

     g_free(s);

 }

-- 

1.8.3.1