diff options
| author | Peter Maydell | 2015-02-25 14:14:37 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-02-25 14:14:37 +0100 |
| commit | 68b459eaa660be17d3547aa581502fe2c572c84f (patch) | |
| tree | e5b3edf44f205dea663ab6d082bfee78fc322d14 /include/ui | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150218-1' into s... (diff) | |
| parent | hmp: Name HMP info handler functions hmp_info_SUBCOMMAND() (diff) | |
| download | qemu-68b459eaa660be17d3547aa581502fe2c572c84f.tar.gz qemu-68b459eaa660be17d3547aa581502fe2c572c84f.tar.xz qemu-68b459eaa660be17d3547aa581502fe2c572c84f.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-02-18' into staging
hmp: Normalize HMP command handler names
# gpg: Signature made Wed Feb 18 10:59:44 2015 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-monitor-2015-02-18:
hmp: Name HMP info handler functions hmp_info_SUBCOMMAND()
hmp: Name HMP command handler functions hmp_COMMAND()
hmp: Clean up declarations for long-gone info handlers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/console.h | 2 | ||||
| -rw-r--r-- | include/ui/qemu-spice.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 5c19c3c098..0f97d86728 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -56,7 +56,7 @@ struct MouseTransformInfo { int a[7]; }; -void do_mouse_set(Monitor *mon, const QDict *qdict); +void hmp_mouse_set(Monitor *mon, const QDict *qdict); /* keysym is a unicode code except for special keys (see QEMU_KEY_xxx constants) */ diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index 762e063125..25b94c7530 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -45,9 +45,6 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port, const char *subject, MonitorCompletion cb, void *opaque); -void do_info_spice_print(Monitor *mon, const QObject *data); -void do_info_spice(Monitor *mon, QObject **ret_data); - CharDriverState *qemu_chr_open_spice_vmc(const char *type); #if SPICE_SERVER_VERSION >= 0x000c02 CharDriverState *qemu_chr_open_spice_port(const char *name); |