cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-dump-Drop-pointless-error_is_set-DumpState-member-er.patch

958e1b
From 5b83dc5c849412b09a7e54ba7223ce5de8a3fd70 Mon Sep 17 00:00:00 2001
958e1b
From: Laszlo Ersek <lersek@redhat.com>
958e1b
Date: Fri, 7 Nov 2014 17:18:06 +0100
958e1b
Subject: [PATCH 19/41] dump: Drop pointless error_is_set(), DumpState member
958e1b
 errp
958e1b
958e1b
Message-id: <1415380693-16593-20-git-send-email-lersek@redhat.com>
958e1b
Patchwork-id: 62205
958e1b
O-Subject: [RHEL-7.1 qemu-kvm PATCH 19/26] dump: Drop pointless error_is_set(), DumpState member errp
958e1b
Bugzilla: 1157798
958e1b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
958e1b
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
958e1b
RH-Acked-by: dgibson <dgibson@redhat.com>
958e1b
958e1b
From: Markus Armbruster <armbru@redhat.com>
958e1b
958e1b
In qmp_dump_guest_memory(), the error must be clear on entry, and we
958e1b
always bail out after setting it, directly or via dump_init().
958e1b
Therefore, both error_is_set() are always false.  Drop them.
958e1b
958e1b
DumpState member errp is now write-only.  Drop it, too.
958e1b
958e1b
Signed-off-by: Markus Armbruster <armbru@redhat.com>
958e1b
Reviewed-by: Eric Blake <eblake@redhat.com>
958e1b
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
958e1b
(cherry picked from commit 66ef8bd9c16b547c985cbe7468dcf60280c993eb)
958e1b
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
---
958e1b
 dump.c | 6 ++----
958e1b
 1 file changed, 2 insertions(+), 4 deletions(-)
958e1b
958e1b
diff --git a/dump.c b/dump.c
958e1b
index 25bf8e6..9250594 100644
958e1b
--- a/dump.c
958e1b
+++ b/dump.c
958e1b
@@ -86,7 +86,6 @@ typedef struct DumpState {
958e1b
     bool has_filter;
958e1b
     int64_t begin;
958e1b
     int64_t length;
958e1b
-    Error **errp;
958e1b
 
958e1b
     uint8_t *note_buf;          /* buffer for notes */
958e1b
     size_t note_buf_offset;     /* the writing place in note_buf */
958e1b
@@ -1576,7 +1575,6 @@ static int dump_init(DumpState *s, int fd, bool has_format,
958e1b
         nr_cpus++;
958e1b
     }
958e1b
 
958e1b
-    s->errp = errp;
958e1b
     s->fd = fd;
958e1b
     s->has_filter = has_filter;
958e1b
     s->begin = begin;
958e1b
@@ -1786,11 +1784,11 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin,
958e1b
     }
958e1b
 
958e1b
     if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
958e1b
-        if (create_kdump_vmcore(s) < 0 && !error_is_set(s->errp)) {
958e1b
+        if (create_kdump_vmcore(s) < 0) {
958e1b
             error_set(errp, QERR_IO_ERROR);
958e1b
         }
958e1b
     } else {
958e1b
-        if (create_vmcore(s) < 0 && !error_is_set(s->errp)) {
958e1b
+        if (create_vmcore(s) < 0) {
958e1b
             error_set(errp, QERR_IO_ERROR);
958e1b
         }
958e1b
     }
958e1b
-- 
958e1b
1.8.3.1
958e1b