Commit f3b8f18e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2019-08-21' into staging 



Monitor patches for 2019-08-21

# gpg: Signature made Wed 21 Aug 2019 16:35:07 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-08-21:
  monitor/qmp: Update comment for commit 4eaca8de
  qdev: Collect HMP handlers command handlers in qdev-monitor.c
  qapi: Move query-target from misc.json to machine.json
  hw/core: Move cpu.c, cpu.h from qom/ to hw/core/

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fe066b48 eb707eac

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -1274,6 +1274,7 @@ Machine core 
M: Eduardo Habkost <ehabkost@redhat.com>

M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>

S: Supported

F: hw/core/cpu.c

F: hw/core/machine-qmp-cmds.c

F: hw/core/machine.c

F: hw/core/null-machine.c
@@ -1281,10 +1282,9 @@ F: hw/core/numa.c 
F: hw/cpu/cluster.c

F: qapi/machine.json

F: qapi/machine-target.json

F: qom/cpu.c

F: include/hw/boards.h

F: include/hw/core/cpu.h

F: include/hw/cpu/cluster.h

F: include/qom/cpu.h

F: include/sysemu/numa.h

T: git https://github.com/ehabkost/qemu.git machine-next
@@ -2048,12 +2048,10 @@ F: hw/core/qdev* 
F: include/hw/qdev*

F: include/monitor/qdev.h

F: include/qom/

X: include/qom/cpu.h

F: qapi/qom.json

F: qapi/qdev.json

F: qdev-monitor.c

F: qom/

X: qom/cpu.c

F: tests/check-qom-interface.c

F: tests/check-qom-proplist.c

F: tests/test-qdev-global-props.c

accel/tcg/user-exec-stub.c

+1 −1
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "qom/cpu.h"

#include "hw/core/cpu.h"

#include "sysemu/replay.h"

#include "sysemu/sysemu.h"

arch_init.c

+0 −11
Original line number Diff line number Diff line
@@ -106,14 +106,3 @@ int xen_available(void) 
    return 0;

#endif

}
 




TargetInfo *qmp_query_target(Error **errp)

{

    TargetInfo *info = g_malloc0(sizeof(*info));



    info->arch = qapi_enum_parse(&SysEmuTarget_lookup, TARGET_NAME, -1,

                                 &error_abort);



    return info;

}

cpus-common.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "qemu/osdep.h"

#include "qemu/main-loop.h"

#include "exec/cpu-common.h"

#include "qom/cpu.h"

#include "hw/core/cpu.h"

#include "sysemu/cpus.h"



static QemuMutex qemu_cpu_list_lock;

docs/interop/firmware.json

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
# = Firmware

##



{ 'include' : 'common.json' }

{ 'include' : 'machine.json' }

{ 'include' : 'block-core.json' }



##