Commit 95a9457f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-include-2019-08-13-v2' into staging 



Header cleanup patches for 2019-08-13

# gpg: Signature made Fri 16 Aug 2019 12:39:12 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-include-2019-08-13-v2: (29 commits)
  sysemu: Split sysemu/runstate.h off sysemu/sysemu.h
  sysemu: Move the VMChangeStateEntry typedef to qemu/typedefs.h
  Include sysemu/sysemu.h a lot less
  Clean up inclusion of sysemu/sysemu.h
  numa: Move remaining NUMA declarations from sysemu.h to numa.h
  Include sysemu/hostmem.h less
  numa: Don't include hw/boards.h into sysemu/numa.h
  Include hw/boards.h a bit less
  Include hw/qdev-properties.h less
  Include qemu/main-loop.h less
  Include qemu/queue.h slightly less
  Include hw/hw.h exactly where needed
  Include qom/object.h slightly less
  Include exec/memory.h slightly less
  Include migration/vmstate.h less
  migration: Move the VMStateDescription typedef to typedefs.h
  Clean up inclusion of exec/cpu-common.h
  Include hw/irq.h a lot less
  typedefs: Separate incomplete types and function types
  ide: Include hw/ide/internal a bit less outside hw/ide/
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1f3a51f3 54d31236

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -1874,6 +1874,7 @@ M: Markus Armbruster <armbru@redhat.com> 
S: Supported

F: include/qapi/error.h

F: include/qemu/error-report.h

F: qapi/error.json

F: util/error.c

F: util/qemu-error.c
@@ -1923,6 +1924,8 @@ Main loop 
M: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: cpus.c

F: include/qemu/main-loop.h

F: include/sysemu/runstate.h

F: util/main-loop.c

F: util/qemu-timer.c

F: vl.c
@@ -2062,6 +2065,7 @@ F: monitor/monitor-internal.h 
F: monitor/qmp*

F: monitor/misc.c

F: monitor/monitor.c

F: qapi/error.json

F: docs/devel/*qmp-*

F: docs/interop/*qmp-*

F: scripts/qmp/

accel/kvm/kvm-all.c

+3 −1
Original line number Diff line number Diff line
@@ -23,18 +23,20 @@ 
#include "qemu/config-file.h"

#include "qemu/error-report.h"

#include "qapi/error.h"

#include "hw/hw.h"

#include "hw/pci/msi.h"

#include "hw/pci/msix.h"

#include "hw/s390x/adapter.h"

#include "exec/gdbstub.h"

#include "sysemu/kvm_int.h"

#include "sysemu/runstate.h"

#include "sysemu/cpus.h"

#include "sysemu/sysemu.h"

#include "qemu/bswap.h"

#include "exec/memory.h"

#include "exec/ram_addr.h"

#include "exec/address-spaces.h"

#include "qemu/event_notifier.h"

#include "qemu/main-loop.h"

#include "trace.h"

#include "hw/irq.h"

#include "sysemu/sev.h"

accel/stubs/tcg-stub.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include "qemu-common.h"

#include "cpu.h"

#include "tcg/tcg.h"

#include "exec/cpu-common.h"

#include "exec/exec-all.h"



void tb_flush(CPUState *cpu)

accel/tcg/tcg-all.c

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


#include "qemu/osdep.h"

#include "sysemu/accel.h"

#include "sysemu/sysemu.h"

#include "sysemu/tcg.h"

#include "qom/object.h"

#include "cpu.h"

audio/audio.c

+2 −2
Original line number Diff line number Diff line
@@ -23,17 +23,17 @@ 
 */



#include "qemu/osdep.h"

#include "hw/hw.h"

#include "audio.h"

#include "migration/vmstate.h"

#include "monitor/monitor.h"

#include "qemu/timer.h"

#include "qapi/error.h"

#include "qapi/qobject-input-visitor.h"

#include "qapi/qapi-visit-audio.h"

#include "sysemu/sysemu.h"

#include "qemu/cutils.h"

#include "qemu/module.h"

#include "sysemu/replay.h"

#include "sysemu/runstate.h"

#include "trace.h"



#define AUDIO_CAP "audio"