[Qemu-commits] [qemu/qemu] 16c132: tci: Fix compile failure by including qemu-common....

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 16c1321bd78ad79a7252b714184ee2a0b5944c56
      
https://github.com/qemu/qemu/commit/16c1321bd78ad79a7252b714184ee2a0b5944c56
  Author: Peter Maydell <address@hidden>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M disas/tci.c

  Log Message:
  -----------
  tci: Fix compile failure by including qemu-common.h

Compilation of TCI was accidentally broken by the recent disassembler
changes:

  CC    x86_64-softmmu/arch_init.o
In file included from target-i386/cpu-qom.h:23:0,
           from target-i386/cpu.h:986,
           from include/qemu-common.h:122,
           from include/disas/bfd.h:12,
           from disas/tci.c:20:
include/qom/cpu.h:178:43: error: unknown type name ‘disassemble_info’
     void (*disas_set_info)(CPUState *cpu, disassemble_info *info);
                                     ^
include/qom/cpu.h:179:1: error:
no semicolon at end of struct or union [-Werror]
 } CPUClass;
 ^
cc1: all warnings being treated as errors

The underlying cause of this is an include loop:
 bfd.h -> qemu-common.h -> target-arm/cpu.h ->  target-arm/cpu-qom.h
  -> qom/cpu.h -> bfd.h

which means that if bfd.h is included first then qom/cpu.h doesn't
get the definition of the disassemble_info type that it wanted.
The easiest fix for this is to include qemu-common.h from tci.c
before including disas/bfd.h.

Signed-off-by: Peter Maydell <address@hidden>


  Commit: 6169b60285fe1ff730d840a49527e721bfb30899
      
https://github.com/qemu/qemu/commit/6169b60285fe1ff730d840a49527e721bfb30899
  Author: Peter Maydell <address@hidden>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  Update version for v2.4.0-rc0 release

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a9dc4cf94c18...6169b60285fe