diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-03 00:16:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-03 00:16:43 +0100 |
| commit | 374f63f6810a2f99254cdf32af67035d951301c8 (patch) | |
| tree | 80a4e3af467182a9002ff01eda12a733af1850d1 /target/ppc | |
| parent | 506179e42112be77bfd071f050b15762d3b2cd43 (diff) | |
| parent | 2608b3df8f9cd91baee9d04e246a0255dbb612db (diff) | |
| download | qemu-374f63f6810a2f99254cdf32af67035d951301c8.zip | |
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>
Diffstat (limited to 'target/ppc')
| -rw-r--r-- | target/ppc/monitor.c | 2 | ||||
| -rw-r--r-- | target/ppc/translate_init.inc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/ppc/monitor.c b/target/ppc/monitor.c index 7f8360d903..a5a177d717 100644 --- a/target/ppc/monitor.c +++ b/target/ppc/monitor.c @@ -27,7 +27,7 @@ #include "monitor/monitor.h" #include "qemu/ctype.h" #include "monitor/hmp-target.h" -#include "hmp.h" +#include "monitor/hmp.h" static target_long monitor_get_ccr(const struct MonitorDef *md, int val) { diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 03cb6d0521..86fc8f2e31 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -41,7 +41,7 @@ #include "qemu/cutils.h" #include "disas/capstone.h" #include "fpu/softfloat.h" -#include "qapi/qapi-commands-target.h" +#include "qapi/qapi-commands-machine-target.h" /* #define PPC_DUMP_CPU */ /* #define PPC_DEBUG_SPR */ |