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 /block | |
| parent | 3d30395f7fb3315e4ecf0de4e48790e1326bbd47 (diff) | |
| parent | 1ce6be24df0a2f634b61b9b882ac6d10af485ad6 (diff) | |
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 'block')
| -rw-r--r-- | block/block-backend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index aabe569642..bfb041823e 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -145,7 +145,7 @@ static void blk_delete(BlockBackend *blk) bdrv_unref(blk->bs); blk->bs = NULL; } - /* Avoid double-remove after blk_hide_on_behalf_of_do_drive_del() */ + /* Avoid double-remove after blk_hide_on_behalf_of_hmp_drive_del() */ if (blk->name[0]) { QTAILQ_REMOVE(&blk_backends, blk, link); } @@ -206,7 +206,7 @@ BlockBackend *blk_next(BlockBackend *blk) /* * Return @blk's name, a non-null string. * Wart: the name is empty iff @blk has been hidden with - * blk_hide_on_behalf_of_do_drive_del(). + * blk_hide_on_behalf_of_hmp_drive_del(). */ const char *blk_name(BlockBackend *blk) { @@ -282,7 +282,7 @@ BlockBackend *blk_by_legacy_dinfo(DriveInfo *dinfo) * Strictly for use by do_drive_del(). * TODO get rid of it! */ -void blk_hide_on_behalf_of_do_drive_del(BlockBackend *blk) +void blk_hide_on_behalf_of_hmp_drive_del(BlockBackend *blk) { QTAILQ_REMOVE(&blk_backends, blk, link); blk->name[0] = 0; |