OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

dump: Use ERRP_GUARD() 

Let's move to the new way of handling errors before changing the dump
code. This patch has mostly been generated by the coccinelle script
scripts/coccinelle/errp-guard.cocci.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220330123603.107120-2-frankja@linux.ibm.com>
This commit is contained in:
Janosch Frank 2022-03-30 12:35:55 +00:00 committed by Marc-André Lureau
parent a74782936d
commit 86a518bba4
1 changed files with 61 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
dump/dump.c
View File

@ -389,23 +389,21 @@ static void write_data(DumpState *s, void *buf, int length, Error **errp)
static void write_memory(DumpState *s, GuestPhysBlock *block, ram_addr_t start, static void write_memory(DumpState *s, GuestPhysBlock *block, ram_addr_t start,
int64_t size, Error **errp) int64_t size, Error **errp)
{ {
ERRP_GUARD();
int64_t i; int64_t i;
Error *local_err = NULL;
for (i = 0; i < size / s->dump_info.page_size; i++) { for (i = 0; i < size / s->dump_info.page_size; i++) {
write_data(s, block->host_addr + start + i * s->dump_info.page_size, write_data(s, block->host_addr + start + i * s->dump_info.page_size,
s->dump_info.page_size, &local_err); s->dump_info.page_size, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
} }
if ((size % s->dump_info.page_size) != 0) { if ((size % s->dump_info.page_size) != 0) {
write_data(s, block->host_addr + start + i * s->dump_info.page_size, write_data(s, block->host_addr + start + i * s->dump_info.page_size,
size % s->dump_info.page_size, &local_err); size % s->dump_info.page_size, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
} }
@ -475,11 +473,11 @@ static void get_offset_range(hwaddr phys_addr,
static void write_elf_loads(DumpState *s, Error **errp) static void write_elf_loads(DumpState *s, Error **errp)
{ {
ERRP_GUARD();
hwaddr offset, filesz; hwaddr offset, filesz;
MemoryMapping *memory_mapping; MemoryMapping *memory_mapping;
uint32_t phdr_index = 1; uint32_t phdr_index = 1;
uint32_t max_index; uint32_t max_index;
Error *local_err = NULL;
if (s->have_section) { if (s->have_section) {
max_index = s->sh_info; max_index = s->sh_info;
@ -493,14 +491,13 @@ static void write_elf_loads(DumpState *s, Error **errp)
s, &offset, &filesz); s, &offset, &filesz);
if (s->dump_info.d_class == ELFCLASS64) { if (s->dump_info.d_class == ELFCLASS64) {
write_elf64_load(s, memory_mapping, phdr_index++, offset, write_elf64_load(s, memory_mapping, phdr_index++, offset,
filesz, &local_err); filesz, errp);
} else { } else {
write_elf32_load(s, memory_mapping, phdr_index++, offset, write_elf32_load(s, memory_mapping, phdr_index++, offset,
filesz, &local_err); filesz, errp);
} }
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
@ -513,7 +510,7 @@ static void write_elf_loads(DumpState *s, Error **errp)
/* write elf header, PT_NOTE and elf note to vmcore. */ /* write elf header, PT_NOTE and elf note to vmcore. */
static void dump_begin(DumpState *s, Error **errp) static void dump_begin(DumpState *s, Error **errp)
{ {
Error *local_err = NULL; ERRP_GUARD();
/* /*
* the vmcore's format is: * the vmcore's format is:
@ -541,73 +538,64 @@ static void dump_begin(DumpState *s, Error **errp)
/* write elf header to vmcore */ /* write elf header to vmcore */
if (s->dump_info.d_class == ELFCLASS64) { if (s->dump_info.d_class == ELFCLASS64) {
write_elf64_header(s, &local_err); write_elf64_header(s, errp);
} else { } else {
write_elf32_header(s, &local_err); write_elf32_header(s, errp);
} }
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
if (s->dump_info.d_class == ELFCLASS64) { if (s->dump_info.d_class == ELFCLASS64) {
/* write PT_NOTE to vmcore */ /* write PT_NOTE to vmcore */
write_elf64_note(s, &local_err); write_elf64_note(s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
/* write all PT_LOAD to vmcore */ /* write all PT_LOAD to vmcore */
write_elf_loads(s, &local_err); write_elf_loads(s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
/* write section to vmcore */ /* write section to vmcore */
if (s->have_section) { if (s->have_section) {
write_elf_section(s, 1, &local_err); write_elf_section(s, 1, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
} }
/* write notes to vmcore */ /* write notes to vmcore */
write_elf64_notes(fd_write_vmcore, s, &local_err); write_elf64_notes(fd_write_vmcore, s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
} else { } else {
/* write PT_NOTE to vmcore */ /* write PT_NOTE to vmcore */
write_elf32_note(s, &local_err); write_elf32_note(s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
/* write all PT_LOAD to vmcore */ /* write all PT_LOAD to vmcore */
write_elf_loads(s, &local_err); write_elf_loads(s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
/* write section to vmcore */ /* write section to vmcore */
if (s->have_section) { if (s->have_section) {
write_elf_section(s, 0, &local_err); write_elf_section(s, 0, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
} }
/* write notes to vmcore */ /* write notes to vmcore */
write_elf32_notes(fd_write_vmcore, s, &local_err); write_elf32_notes(fd_write_vmcore, s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
} }
@ -643,9 +631,9 @@ static int get_next_block(DumpState *s, GuestPhysBlock *block)
/* write all memory to vmcore */ /* write all memory to vmcore */
static void dump_iterate(DumpState *s, Error **errp) static void dump_iterate(DumpState *s, Error **errp)
{ {
ERRP_GUARD();
GuestPhysBlock *block; GuestPhysBlock *block;
int64_t size; int64_t size;
Error *local_err = NULL;
do { do {
block = s->next_block; block = s->next_block;
@ -657,9 +645,8 @@ static void dump_iterate(DumpState *s, Error **errp)
size -= block->target_end - (s->begin + s->length); size -= block->target_end - (s->begin + s->length);
} }
} }
write_memory(s, block, s->start, size, &local_err); write_memory(s, block, s->start, size, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
@ -668,11 +655,10 @@ static void dump_iterate(DumpState *s, Error **errp)
static void create_vmcore(DumpState *s, Error **errp) static void create_vmcore(DumpState *s, Error **errp)
{ {
Error *local_err = NULL; ERRP_GUARD();
dump_begin(s, &local_err); dump_begin(s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
@ -809,6 +795,7 @@ static bool note_name_equal(DumpState *s,
/* write common header, sub header and elf note to vmcore */ /* write common header, sub header and elf note to vmcore */
static void create_header32(DumpState *s, Error **errp) static void create_header32(DumpState *s, Error **errp)
{ {
ERRP_GUARD();
DiskDumpHeader32 *dh = NULL; DiskDumpHeader32 *dh = NULL;
KdumpSubHeader32 *kh = NULL; KdumpSubHeader32 *kh = NULL;
size_t size; size_t size;
@ -817,7 +804,6 @@ static void create_header32(DumpState *s, Error **errp)
uint32_t bitmap_blocks; uint32_t bitmap_blocks;
uint32_t status = 0; uint32_t status = 0;
uint64_t offset_note; uint64_t offset_note;
Error *local_err = NULL;
/* write common header, the version of kdump-compressed format is 6th */ /* write common header, the version of kdump-compressed format is 6th */
size = sizeof(DiskDumpHeader32); size = sizeof(DiskDumpHeader32);
@ -893,9 +879,8 @@ static void create_header32(DumpState *s, Error **errp)
s->note_buf_offset = 0; s->note_buf_offset = 0;
/* use s->note_buf to store notes temporarily */ /* use s->note_buf to store notes temporarily */
write_elf32_notes(buf_write_note, s, &local_err); write_elf32_notes(buf_write_note, s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
goto out; goto out;
} }
if (write_buffer(s->fd, offset_note, s->note_buf, if (write_buffer(s->fd, offset_note, s->note_buf,
@ -921,6 +906,7 @@ out:
/* write common header, sub header and elf note to vmcore */ /* write common header, sub header and elf note to vmcore */
static void create_header64(DumpState *s, Error **errp) static void create_header64(DumpState *s, Error **errp)
{ {
ERRP_GUARD();
DiskDumpHeader64 *dh = NULL; DiskDumpHeader64 *dh = NULL;
KdumpSubHeader64 *kh = NULL; KdumpSubHeader64 *kh = NULL;
size_t size; size_t size;
@ -929,7 +915,6 @@ static void create_header64(DumpState *s, Error **errp)
uint32_t bitmap_blocks; uint32_t bitmap_blocks;
uint32_t status = 0; uint32_t status = 0;
uint64_t offset_note; uint64_t offset_note;
Error *local_err = NULL;
/* write common header, the version of kdump-compressed format is 6th */ /* write common header, the version of kdump-compressed format is 6th */
size = sizeof(DiskDumpHeader64); size = sizeof(DiskDumpHeader64);
@ -1005,9 +990,8 @@ static void create_header64(DumpState *s, Error **errp)
s->note_buf_offset = 0; s->note_buf_offset = 0;
/* use s->note_buf to store notes temporarily */ /* use s->note_buf to store notes temporarily */
write_elf64_notes(buf_write_note, s, &local_err); write_elf64_notes(buf_write_note, s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
goto out; goto out;
} }
@ -1463,8 +1447,8 @@ out:
static void create_kdump_vmcore(DumpState *s, Error **errp) static void create_kdump_vmcore(DumpState *s, Error **errp)
{ {
ERRP_GUARD();
int ret; int ret;
Error *local_err = NULL;
/* /*
* the kdump-compressed format is: * the kdump-compressed format is:
@ -1494,21 +1478,18 @@ static void create_kdump_vmcore(DumpState *s, Error **errp)
return; return;
} }
write_dump_header(s, &local_err); write_dump_header(s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
write_dump_bitmap(s, &local_err); write_dump_bitmap(s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
write_dump_pages(s, &local_err); write_dump_pages(s, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
return; return;
} }
@ -1638,10 +1619,10 @@ static void dump_init(DumpState *s, int fd, bool has_format,
DumpGuestMemoryFormat format, bool paging, bool has_filter, DumpGuestMemoryFormat format, bool paging, bool has_filter,
int64_t begin, int64_t length, Error **errp) int64_t begin, int64_t length, Error **errp)
{ {
ERRP_GUARD();
VMCoreInfoState *vmci = vmcoreinfo_find(); VMCoreInfoState *vmci = vmcoreinfo_find();
CPUState *cpu; CPUState *cpu;
int nr_cpus; int nr_cpus;
Error *err = NULL;
int ret; int ret;
s->has_format = has_format; s->has_format = has_format;
@ -1760,9 +1741,8 @@ static void dump_init(DumpState *s, int fd, bool has_format,
/* get memory mapping */ /* get memory mapping */
if (paging) { if (paging) {
qemu_get_guest_memory_mapping(&s->list, &s->guest_phys_blocks, &err); qemu_get_guest_memory_mapping(&s->list, &s->guest_phys_blocks, errp);
if (err != NULL) { if (*errp) {
error_propagate(errp, err);
goto cleanup; goto cleanup;
} }
} else { } else {
@ -1861,33 +1841,32 @@ cleanup:
/* this operation might be time consuming. */ /* this operation might be time consuming. */
static void dump_process(DumpState *s, Error **errp) static void dump_process(DumpState *s, Error **errp)
{ {
Error *local_err = NULL; ERRP_GUARD();
DumpQueryResult *result = NULL; DumpQueryResult *result = NULL;
if (s->has_format && s->format == DUMP_GUEST_MEMORY_FORMAT_WIN_DMP) { if (s->has_format && s->format == DUMP_GUEST_MEMORY_FORMAT_WIN_DMP) {
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
create_win_dump(s, &local_err); create_win_dump(s, errp);
#endif #endif
} else if (s->has_format && s->format != DUMP_GUEST_MEMORY_FORMAT_ELF) { } else if (s->has_format && s->format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
create_kdump_vmcore(s, &local_err); create_kdump_vmcore(s, errp);
} else { } else {
create_vmcore(s, &local_err); create_vmcore(s, errp);
} }
/* make sure status is written after written_size updates */ /* make sure status is written after written_size updates */
smp_wmb(); smp_wmb();
qatomic_set(&s->status, qatomic_set(&s->status,
(local_err ? DUMP_STATUS_FAILED : DUMP_STATUS_COMPLETED)); (*errp ? DUMP_STATUS_FAILED : DUMP_STATUS_COMPLETED));
/* send DUMP_COMPLETED message (unconditionally) */ /* send DUMP_COMPLETED message (unconditionally) */
result = qmp_query_dump(NULL); result = qmp_query_dump(NULL);
/* should never fail */ /* should never fail */
assert(result); assert(result);
qapi_event_send_dump_completed(result, !!local_err, (local_err ? qapi_event_send_dump_completed(result, !!*errp, (*errp ?
error_get_pretty(local_err) : NULL)); error_get_pretty(*errp) : NULL));
qapi_free_DumpQueryResult(result); qapi_free_DumpQueryResult(result);
error_propagate(errp, local_err);
dump_cleanup(s); dump_cleanup(s);
} }
@ -1916,10 +1895,10 @@ void qmp_dump_guest_memory(bool paging, const char *file,
int64_t length, bool has_format, int64_t length, bool has_format,
DumpGuestMemoryFormat format, Error **errp) DumpGuestMemoryFormat format, Error **errp)
{ {
ERRP_GUARD();
const char *p; const char *p;
int fd = -1; int fd = -1;
DumpState *s; DumpState *s;
Error *local_err = NULL;
bool detach_p = false; bool detach_p = false;
if (runstate_check(RUN_STATE_INMIGRATE)) { if (runstate_check(RUN_STATE_INMIGRATE)) {
@ -2019,9 +1998,8 @@ void qmp_dump_guest_memory(bool paging, const char *file,
dump_state_prepare(s); dump_state_prepare(s);
dump_init(s, fd, has_format, format, paging, has_begin, dump_init(s, fd, has_format, format, paging, has_begin,
begin, length, &local_err); begin, length, errp);
if (local_err) { if (*errp) {
error_propagate(errp, local_err);
qatomic_set(&s->status, DUMP_STATUS_FAILED); qatomic_set(&s->status, DUMP_STATUS_FAILED);
return; return;
} }