From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 2 Jul 2019 23:16:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2019-07-02-v2' into... 
X-Git-Tag: qemu-xen-4.13.0-rc1~95
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=374f63f6810a2f99254cdf32af67035d951301c8;p=qemu-xen.git

Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2019-07-02-v2' into staging

Monitor patches for 2019-07-02

# gpg: Signature made Tue 02 Jul 2019 12:37:57 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-monitor-2019-07-02-v2:
  dump: Move HMP command handlers to dump/
  MAINTAINERS: Add Windows dump to section "Dump"
  dump: Move the code to dump/
  qapi: Split dump.json off misc.json
  qapi: Rename target.json to misc-target.json
  qapi: Split machine-target.json off target.json and misc.json
  hw/core: Collect HMP command handlers in hw/core/
  hw/core: Collect QMP command handlers in hw/core/
  hw/core: Move numa.c to hw/core/
  qapi: Split machine.json off misc.json
  MAINTAINERS: Merge sections CPU, NUMA into Machine core
  qom: Move HMP command handlers to qom/
  qom: Move QMP command handlers to qom/
  qapi: Split qom.json and qdev.json off misc.json
  hmp: Move hmp.h to include/monitor/
  Makefile: Don't add monitor/ twice to common-obj-y
  MAINTAINERS: Make section "QOM" cover qdev as well
  MAINTAINERS: new maintainers for QOM

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

374f63f6810a2f99254cdf32af67035d951301c8
diff --cc target/arm/helper.c
index 38b73430cb,7caea52561..9a1fe3b72e
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@@ -25,8 -19,9 +25,8 @@@
  #include "hw/semihosting/semihost.h"
  #include "sysemu/cpus.h"
  #include "sysemu/kvm.h"
 -#include "fpu/softfloat.h"
  #include "qemu/range.h"
- #include "qapi/qapi-commands-target.h"
+ #include "qapi/qapi-commands-machine-target.h"
  #include "qapi/error.h"
  #include "qemu/guest-random.h"