Am 17.05.2013 05:24, schrieb Qiao Nuohan: > Move includes and definition of struct DumpState into include/sysemu/dump.h. > > Signed-off-by: Qiao Nuohan <qiaonuo...@cn.fujitsu.com> > Reviewed-by: Zhang Xiaohe <zhan...@cn.fujitsu.com> > --- > dump.c | 29 ----------------------------- > include/sysemu/dump.h | 30 ++++++++++++++++++++++++++++++ > 2 files changed, 30 insertions(+), 29 deletions(-) [...] > diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h > index b8c770f..b41469a 100644 > --- a/include/sysemu/dump.h > +++ b/include/sysemu/dump.h > @@ -14,12 +14,42 @@ > #ifndef DUMP_H > #define DUMP_H > > +#include "elf.h" > +#include "cpu.h" > +#include "exec/cpu-all.h" > +#include "exec/hwaddr.h" > +#include "monitor/monitor.h" > +#include "sysemu/kvm.h" > +#include "sysemu/sysemu.h" > +#include "sysemu/memory_mapping.h" > +#include "qapi/error.h" > +#include "qmp-commands.h"
Thanks for avoiding qemu-common.h here. I just posted the rest of my stub refactoring patches: http://lists.nongnu.org/archive/html/qemu-devel/2013-05/msg02934.html I fear that this patch is conflicting. Are really all of those headers actually needed for the struct you're moving? In particular I'm worried about cpu.h as well as cpu-all.h and kvm.h with indirect dependencies on cpu.h. In my case cpu-common.h worked as alternative to cpu-all.h to get ram_addr_t and hwaddr types. It would be nice if you could try rebasing your series on git://github.com/afaerber/qemu-cpu.git qom-cpu branch plus the above four patches to see if we can get this done in a way that avoids target dependencies. Thanks, Andreas > + > typedef struct ArchDumpInfo { > int d_machine; /* Architecture */ > int d_endian; /* ELFDATA2LSB or ELFDATA2MSB */ > int d_class; /* ELFCLASS32 or ELFCLASS64 */ > } ArchDumpInfo; > > +typedef struct DumpState { > + ArchDumpInfo dump_info; > + MemoryMappingList list; > + uint16_t phdr_num; > + uint32_t sh_info; > + bool have_section; > + bool resume; > + size_t note_size; > + hwaddr memory_offset; > + int fd; > + > + RAMBlock *block; > + ram_addr_t start; > + bool has_filter; > + int64_t begin; > + int64_t length; > + Error **errp; > +} DumpState; > + > int cpu_get_dump_info(ArchDumpInfo *info); > ssize_t cpu_get_note_size(int class, int machine, int nr_cpus); > -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
