diff options
| author | Peter Maydell | 2017-03-28 15:48:07 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-03-28 15:48:07 +0200 |
| commit | 4d2bee82f4276b6f694fa2b0b179b4b3673984f6 (patch) | |
| tree | 81957b65024816fbb0a9750d0693b65cdb9655e2 /blockdev.c | |
| parent | Merge remote-tracking branch 'remotes/stsquad/tags/pull-mttcg-fixups-for-rc2-... (diff) | |
| parent | block: Declare blockdev-add and blockdev-del supported (diff) | |
| download | qemu-4d2bee82f4276b6f694fa2b0b179b4b3673984f6.tar.gz qemu-4d2bee82f4276b6f694fa2b0b179b4b3673984f6.tar.xz qemu-4d2bee82f4276b6f694fa2b0b179b4b3673984f6.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-03-28' into staging
Block patches for 2017-03-28
# gpg: Signature made Tue 28 Mar 2017 14:41:37 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-block-2017-03-28:
block: Declare blockdev-add and blockdev-del supported
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/blockdev.c b/blockdev.c index c5b2c2c209..040c152512 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2835,7 +2835,7 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict) bs = bdrv_find_node(id); if (bs) { - qmp_x_blockdev_del(id, &local_err); + qmp_blockdev_del(id, &local_err); if (local_err) { error_report_err(local_err); } @@ -3900,7 +3900,7 @@ fail: visit_free(v); } -void qmp_x_blockdev_del(const char *node_name, Error **errp) +void qmp_blockdev_del(const char *node_name, Error **errp) { AioContext *aio_context; BlockDriverState *bs; |