Re: [Qemu-devel] [PATCH 3/9] Move include and struct definition to dump.h

[Andreas Färber]

Am 07.05.2013 09:16, schrieb Qiao Nuohan:
> Move includes and definition of struct DumpState into include/sysemu/dump.h.
> 
> Signed-off-by: Qiao Nuohan <address@hidden>
> Reviewed-by: Zhang Xiaohe <address@hidden>
> ---
>  dump.c                |   30 ------------------------------
>  include/sysemu/dump.h |   31 +++++++++++++++++++++++++++++++
>  2 files changed, 31 insertions(+), 30 deletions(-)
> 
> diff --git a/dump.c b/dump.c
> index c0d3da5..3785a68 100644
> --- a/dump.c
> +++ b/dump.c
> @@ -11,18 +11,7 @@
>   *
>   */
>  
> -#include "qemu-common.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/dump.h"
> -#include "sysemu/sysemu.h"
> -#include "sysemu/memory_mapping.h"
> -#include "qapi/error.h"
> -#include "qmp-commands.h"
>  
>  static uint16_t cpu_convert_to_target16(uint16_t val, int endian)
>  {
> @@ -57,25 +46,6 @@ static uint64_t cpu_convert_to_target64(uint64_t val, int 
> endian)
>      return val;
>  }
>  
> -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;
> -
>  static int dump_cleanup(DumpState *s)
>  {
>      int ret = 0;
> diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h
> index b8c770f..c4c90c4 100644
> --- a/include/sysemu/dump.h
> +++ b/include/sysemu/dump.h
> @@ -14,12 +14,43 @@
>  #ifndef DUMP_H
>  #define DUMP_H
>  
> +#include "qemu-common.h"

Please place only the needed includes in a header, not qemu-common.h.
This avoids circular includes and resulting problems.

Regards,
Andreas

> +#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"
> +
>  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