Commit 776efef3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



NEED_CPU_H cleanups, big enough to deserve their own pull request.

# gpg: Signature made Thu 19 May 2016 15:42:37 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"

* remotes/bonzini/tags/for-upstream: (52 commits)
  hw: clean up hw/hw.h includes
  hw: remove pio_addr_t
  cpu: move exec-all.h inclusion out of cpu.h
  exec: extract exec/tb-context.h
  hw: explicitly include qemu/log.h
  mips: move CP0 functions out of cpu.h
  arm: move arm_log_exception into .c file
  qemu-common: push cpu.h inclusion out of qemu-common.h
  acpi: do not use TARGET_PAGE_SIZE
  s390x: reorganize CSS bits between cpu.h and other headers
  dma: do not depend on kvm_enabled()
  gdbstub: remove unnecessary includes from gdbstub-xml.c
  qemu-common: stop including qemu/host-utils.h from qemu-common.h
  qemu-common: stop including qemu/bswap.h from qemu-common.h
  cpu: move endian-dependent load/store functions to cpu-all.h
  hw: cannot include hw/hw.h from user emulation
  hw: move CPU state serialization to migration/cpu.h
  hw: do not use VMSTATE_*TL
  include: poison symbols in osdep.h
  apic: move target-dependent definitions to cpu.h
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8ec4fe0a df43d49c

arch_init.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
 * THE SOFTWARE.

 */

#include "qemu/osdep.h"

#include "qemu-common.h"

#include "cpu.h"

#include "sysemu/sysemu.h"

#include "sysemu/arch_init.h"

#include "hw/pci/pci.h"

audio/mixeng.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 */

#include "qemu/osdep.h"

#include "qemu-common.h"

#include "qemu/bswap.h"

#include "audio.h"



#define AUDIO_CAP "mixeng"

audio/noaudio.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */

#include "qemu/osdep.h"

#include "qemu-common.h"

#include "qemu/host-utils.h"

#include "audio.h"

#include "qemu/timer.h"

audio/spiceaudio.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include "qemu/osdep.h"

#include "hw/hw.h"

#include "qemu/host-utils.h"

#include "qemu/error-report.h"

#include "qemu/timer.h"

#include "ui/qemu-spice.h"

audio/wavaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * THE SOFTWARE.

 */

#include "qemu/osdep.h"

#include "hw/hw.h"

#include "qemu/host-utils.h"

#include "qemu/timer.h"

#include "audio.h"