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>

diff --cc hw/arm/boot.c
Simple merge

diff --cc hw/s390x/s390-virtio-ccw.c
Simple merge

diff --cc hw/sd/sdhci.c
Simple merge

diff --cc target/s390x/cpu_models.c
index 250d931d7ef6304b84c104d0ead9b2e1305eade4,584c409a1902a6515460a27067b00e1489f02251..1d5f0da4fe011dee5baf5822b6229f13ed0a29f6
--- 1/target/s390x/cpu_models.c
--- 2/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@@ -20,10 -20,9 +20,10 @@@
  #include "qemu/error-report.h"
  #include "qapi/qmp/qerror.h"
  #include "qapi/qobject-input-visitor.h"
- #include "qapi/qmp/qbool.h"
+ #include "qapi/qmp/qdict.h"
  #ifndef CONFIG_USER_ONLY
  #include "sysemu/arch_init.h"
 +#include "hw/pci/pci.h"
  #endif
  
  #define CPUDEF_INIT(_type, _gen, _ec_ga, _mha_pow, _hmfai, _name, _desc) \

diff --cc target/s390x/excp_helper.c
Simple merge

diff --cc target/s390x/gen-features.c
Simple merge

diff --cc target/s390x/kvm.c
Simple merge