From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uf9mm-0006oS-TT for qemu-devel@nongnu.org; Wed, 22 May 2013 10:13:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uf9mg-00020e-Dd for qemu-devel@nongnu.org; Wed, 22 May 2013 10:13:00 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45223 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uf9mg-00020O-4T for qemu-devel@nongnu.org; Wed, 22 May 2013 10:12:54 -0400 Message-ID: <519CD261.9060200@suse.de> Date: Wed, 22 May 2013 16:12:49 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1368761104-20105-1-git-send-email-qiaonuohan@cn.fujitsu.com> <1368761104-20105-4-git-send-email-qiaonuohan@cn.fujitsu.com> In-Reply-To: <1368761104-20105-4-git-send-email-qiaonuohan@cn.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 3/9 v3] Move includes and struct definition to dump.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Qiao Nuohan Cc: zhangxh@cn.fujitsu.com, kumagai-atsushi@mxc.nes.nec.co.jp, d.hatayama@jp.fujitsu.com, anderson@redhat.com, qemu-devel@nongnu.org Am 17.05.2013 05:24, schrieb Qiao Nuohan: > Move includes and definition of struct DumpState into include/sysemu/du= mp.h. >=20 > Signed-off-by: Qiao Nuohan > Reviewed-by: Zhang Xiaohe > --- > 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 > =20 > +#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; > =20 > +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); > =20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg