Failed in applying to current master (
apply log)
Maintainers: "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Thomas Huth <thuth@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Markus Armbruster <armbru@redhat.com>
meson.build | 4 +-
hw/display/qxl.h | 2 -
include/monitor/hmp.h | 8 +
include/monitor/qmp-helpers.h | 26 +++
include/ui/console.h | 2 +-
include/ui/qemu-spice.h | 8 +-
include/ui/spice-display.h | 2 -
chardev/spice.c | 2 -
hw/display/qxl.c | 26 +--
monitor/hmp-cmds.c | 368 +--------------------------------
monitor/misc.c | 67 ------
monitor/qmp-cmds.c | 176 +++-------------
ui/input.c | 32 ++-
ui/spice-display.c | 10 -
ui/ui-hmp-cmds.c | 460 ++++++++++++++++++++++++++++++++++++++++++
ui/ui-qmp-cmds.c | 177 ++++++++++++++++
ui/vdagent.c | 4 -
hw/display/trace-events | 1 -
ui/meson.build | 2 +
19 files changed, 727 insertions(+), 650 deletions(-)
create mode 100644 include/monitor/qmp-helpers.h
create mode 100644 ui/ui-hmp-cmds.c
create mode 100644 ui/ui-qmp-cmds.c