diff options
author | Markus Armbruster <armbru@redhat.com> | 2014-05-02 13:26:41 +0200 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-05-09 09:11:32 -0400 |
commit | 66ef8bd9c16b547c985cbe7468dcf60280c993eb (patch) | |
tree | eaa1bd4d05389f4f74dcec05143904fb1ed81aa8 | |
parent | 2767ceec4ed1d6ac9785d9866c80dc7d674a3631 (diff) | |
download | qemu-66ef8bd9c16b547c985cbe7468dcf60280c993eb.zip qemu-66ef8bd9c16b547c985cbe7468dcf60280c993eb.tar.gz qemu-66ef8bd9c16b547c985cbe7468dcf60280c993eb.tar.bz2 |
dump: Drop pointless error_is_set(), DumpState member errp
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>
-rw-r--r-- | dump.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -86,7 +86,6 @@ typedef struct DumpState { bool has_filter; int64_t begin; int64_t length; - Error **errp; uint8_t *note_buf; /* buffer for notes */ 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++; } - s->errp = errp; s->fd = fd; s->has_filter = has_filter; 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 (create_kdump_vmcore(s) < 0 && !error_is_set(s->errp)) { + if (create_kdump_vmcore(s) < 0) { error_set(errp, QERR_IO_ERROR); } } else { - if (create_vmcore(s) < 0 && !error_is_set(s->errp)) { + if (create_vmcore(s) < 0) { error_set(errp, QERR_IO_ERROR); } } |