@@ -154,24 +154,28 @@ typedef struct DumpState {
GuestPhysBlockList guest_phys_blocks;
ArchDumpInfo dump_info;
MemoryMappingList list;
- uint32_t phdr_num;
- uint32_t shdr_num;
bool resume;
bool detached;
- ssize_t note_size;
- hwaddr shdr_offset;
- hwaddr phdr_offset;
- hwaddr section_offset;
- hwaddr note_offset;
hwaddr memory_offset;
int fd;
+ /* Guest memory related data */
GuestPhysBlock *next_block;
ram_addr_t start;
bool has_filter;
int64_t begin;
int64_t length;
+ /* Elf dump related data */
+ uint32_t phdr_num;
+ uint32_t shdr_num;
+ uint32_t sh_info;
+ ssize_t note_size;
+ hwaddr shdr_offset;
+ hwaddr phdr_offset;
+ hwaddr note_offset;
+ hwaddr section_offset;
+
void *elf_header;
void *elf_section_hdrs;
uint64_t elf_section_data_size;
Let's move ELF related members into one block and guest memory related ones into another to improve readability. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> --- include/sysemu/dump.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)