Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-02-07-v4' into staging
commit7e0019a7196ebed177c95824875cf852e1a6f667
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 9 Feb 2018 14:39:09 +0000 (9 14:39 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 9 Feb 2018 14:39:09 +0000 (9 14:39 +0000)
tree0a4e5a411c80a56737354700bb15bf4f7262831d
parentf31cd9e4e2172a4807f390194978c61e717791d2
parent922a01a013d2270682a188258cbccacfecf8129c
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-02-07-v4' into staging

Miscellaneous patches for 2018-02-07

# gpg: Signature made Fri 09 Feb 2018 12:52:51 GMT
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2018-02-07-v4:
  Move include qemu/option.h from qemu-common.h to actual users
  Drop superfluous includes of qapi/qmp/qjson.h
  Drop superfluous includes of qapi/qmp/dispatch.h
  Include qapi/qmp/qnull.h exactly where needed
  Include qapi/qmp/qnum.h exactly where needed
  Include qapi/qmp/qbool.h exactly where needed
  Include qapi/qmp/qstring.h exactly where needed
  Include qapi/qmp/qdict.h exactly where needed
  Include qapi/qmp/qlist.h exactly where needed
  Include qapi/qmp/qobject.h exactly where needed
  qdict qlist: Make most helper macros functions
  Eliminate qapi/qmp/types.h
  Typedef the subtypes of QObject in qemu/typedefs.h, too
  Include qmp-commands.h exactly where needed
  Drop superfluous includes of qapi/qmp/qerror.h
  Include qapi/error.h exactly where needed
  Drop superfluous includes of qapi-types.h and test-qapi-types.h
  Clean up includes
  Use #include "..." for our own headers, <...> for others
  vnc: use stubs for CONFIG_VNC=n dummy functions

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/arm/boot.c
hw/s390x/s390-virtio-ccw.c
hw/sd/sdhci.c
target/s390x/cpu_models.c
target/s390x/excp_helper.c
target/s390x/gen-features.c
target/s390x/kvm.c