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

dump: Rework get_start_block

Browse Source 
get_start_block() returns the start address of the first memory block
or -1.

With the GuestPhysBlock iterator conversion we don't need to set the
start address and can therefore remove that code and the "start"
DumpState struct member. The only functionality left is the validation
of the start block so it only makes sense to re-name the function to
validate_start_block()

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com>
Message-Id: <20220811121111.9878-5-frankja@linux.ibm.com>
This commit is contained in:
Janosch Frank 2022-08-11 12:10:57 +00:00 committed by Marc-André Lureau
parent 1e8113032f
commit 0c2994ac90
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dump/dump.c
View File

@ -1500,30 +1500,22 @@ static void create_kdump_vmcore(DumpState *s, Error **errp)
} }
} }
static ram_addr_t get_start_block(DumpState *s) static int validate_start_block(DumpState *s)
{ {
GuestPhysBlock *block; GuestPhysBlock *block;
if (!s->has_filter) { if (!s->has_filter) {
s->next_block = QTAILQ_FIRST(&s->guest_phys_blocks.head);
return 0; return 0;
} }
QTAILQ_FOREACH(block, &s->guest_phys_blocks.head, next) { QTAILQ_FOREACH(block, &s->guest_phys_blocks.head, next) {
/* This block is out of the range */
if (block->target_start >= s->begin + s->length || if (block->target_start >= s->begin + s->length ||
block->target_end <= s->begin) { block->target_end <= s->begin) {
/* This block is out of the range */
continue; continue;
} }
return 0;
s->next_block = block; }
if (s->begin > block->target_start) {
s->start = s->begin - block->target_start;
} else {
s->start = 0;
}
return s->start;
}
return -1; return -1;
} }
@ -1670,8 +1662,8 @@ static void dump_init(DumpState *s, int fd, bool has_format,
goto cleanup; goto cleanup;
} }
s->start = get_start_block(s); /* Is the filter filtering everything? */
if (s->start == -1) { if (validate_start_block(s) == -1) {
error_setg(errp, QERR_INVALID_PARAMETER, "begin"); error_setg(errp, QERR_INVALID_PARAMETER, "begin");
goto cleanup; goto cleanup;
} }

2
include/sysemu/dump.h
View File

@ -166,8 +166,6 @@ typedef struct DumpState {
hwaddr memory_offset; hwaddr memory_offset;
int fd; int fd;
GuestPhysBlock *next_block;
ram_addr_t start;
bool has_filter; bool has_filter;
int64_t begin; int64_t begin;
int64_t length; int64_t length;