diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-25 13:14:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-25 13:14:37 +0000 |
| commit | 68b459eaa660be17d3547aa581502fe2c572c84f (patch) | |
| tree | e5b3edf44f205dea663ab6d082bfee78fc322d14 /blockdev.c | |
| parent | 3d30395f7fb3315e4ecf0de4e48790e1326bbd47 (diff) | |
| parent | 1ce6be24df0a2f634b61b9b882ac6d10af485ad6 (diff) | |
| download | focaccia-qemu-68b459eaa660be17d3547aa581502fe2c572c84f.tar.gz focaccia-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 'blockdev.c')
| -rw-r--r-- | blockdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/blockdev.c b/blockdev.c index 6eedcf56f8..18e420779f 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1017,7 +1017,7 @@ fail: return dinfo; } -void do_commit(Monitor *mon, const QDict *qdict) +void hmp_commit(Monitor *mon, const QDict *qdict) { const char *device = qdict_get_str(qdict, "device"); BlockDriverState *bs; @@ -1945,7 +1945,7 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd, aio_context_release(aio_context); } -int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) +int hmp_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) { const char *id = qdict_get_str(qdict, "id"); BlockBackend *blk; @@ -1987,7 +1987,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) * then we can just get rid of the block driver state right here. */ if (blk_get_attached_dev(blk)) { - blk_hide_on_behalf_of_do_drive_del(blk); + blk_hide_on_behalf_of_hmp_drive_del(blk); /* Further I/O must not pause the guest */ bdrv_set_on_error(bs, BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT); |