Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

[mirror_qemu.git] / blockdev.c

diff --git a/blockdev.c b/blockdev.c
index c5b2c2c209223d6521261df2c265d1f929529ab2..040c152512be469680cfde7ef3175c2024761dc7 100644 (file)
--- 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;