mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dump: Drop pointless error_is_set(), DumpState member errp

Browse Source 
In qmp_dump_guest_memory(), the error must be clear on entry, and we
always bail out after setting it, directly or via dump_init().
Therefore, both error_is_set() are always false.  Drop them.

DumpState member errp is now write-only.  Drop it, too.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Markus Armbruster 2014-05-02 13:26:41 +02:00 committed by Luiz Capitulino
parent 2767ceec4e
commit 66ef8bd9c1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dump.c
View File

@ -86,7 +86,6 @@ typedef struct DumpState {
bool has_filter; bool has_filter;
int64_t begin; int64_t begin;
int64_t length; int64_t length;
Error **errp;
uint8_t *note_buf; /* buffer for notes */ uint8_t *note_buf; /* buffer for notes */
size_t note_buf_offset; /* the writing place in note_buf */ size_t note_buf_offset; /* the writing place in note_buf */
@ -1570,7 +1569,6 @@ static int dump_init(DumpState *s, int fd, bool has_format,
nr_cpus++; nr_cpus++;
} }
s->errp = errp;
s->fd = fd; s->fd = fd;
s->has_filter = has_filter; s->has_filter = has_filter;
s->begin = begin; s->begin = begin;
@ -1780,11 +1778,11 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin,
} }
if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) { if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
if (create_kdump_vmcore(s) < 0 && !error_is_set(s->errp)) { if (create_kdump_vmcore(s) < 0) {
error_set(errp, QERR_IO_ERROR); error_set(errp, QERR_IO_ERROR);
} }
} else { } else {
if (create_vmcore(s) < 0 && !error_is_set(s->errp)) { if (create_vmcore(s) < 0) {
error_set(errp, QERR_IO_ERROR); error_set(errp, QERR_IO_ERROR);
} }
} }