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