[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/11] block: Accept node-name for blockdev-snaps
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 05/11] block: Accept node-name for blockdev-snapshot-delete-internal-sync |
Date: |
Wed, 6 Jul 2016 17:20:41 +0200 |
In order to remove the necessity to use BlockBackend names in the
external API, we want to allow node-names everywhere. This converts
blockdev-snapshot-delete-internal-sync to accept a node-name without
lifting the restriction that we're operating at a root node.
In case of an invalid device name, the command returns the GenericError
error class now instead of DeviceNotFound, because this is what
qmp_get_root_bs() returns.
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 16 +++-------------
tests/qemu-iotests/057 | 2 +-
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 7e9c7a4..8e38d2d 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1299,21 +1299,17 @@ SnapshotInfo
*qmp_blockdev_snapshot_delete_internal_sync(const char *device,
Error **errp)
{
BlockDriverState *bs;
- BlockBackend *blk;
AioContext *aio_context;
QEMUSnapshotInfo sn;
Error *local_err = NULL;
SnapshotInfo *info = NULL;
int ret;
- blk = blk_by_name(device);
- if (!blk) {
- error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
- "Device '%s' not found", device);
+ bs = qmp_get_root_bs(device, errp);
+ if (!bs) {
return NULL;
}
-
- aio_context = blk_get_aio_context(blk);
+ aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(aio_context);
if (!has_id) {
@@ -1329,12 +1325,6 @@ SnapshotInfo
*qmp_blockdev_snapshot_delete_internal_sync(const char *device,
goto out_aio_context;
}
- if (!blk_is_available(blk)) {
- error_setg(errp, "Device '%s' has no medium", device);
- goto out_aio_context;
- }
- bs = blk_bs(blk);
-
if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT_DELETE, errp)) {
goto out_aio_context;
}
diff --git a/tests/qemu-iotests/057 b/tests/qemu-iotests/057
index 9cdd582..bb6c06a 100755
--- a/tests/qemu-iotests/057
+++ b/tests/qemu-iotests/057
@@ -239,7 +239,7 @@ class TestSnapshotDelete(ImageSnapshotTestCase):
result = self.vm.qmp('blockdev-snapshot-delete-internal-sync',
device = 'drive_error',
id = '0')
- self.assert_qmp(result, 'error/class', 'DeviceNotFound')
+ self.assert_qmp(result, 'error/class', 'GenericError')
def test_error_no_id_and_name(self):
result = self.vm.qmp('blockdev-snapshot-delete-internal-sync',
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/11] block: Accept node-name in all node level QMP commands, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 01/11] block: Accept node-name for block-stream, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 02/11] block: Accept node-name for block-commit, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 03/11] block: Accept node-name for blockdev-backup, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 04/11] block: Accept node-name for blockdev-mirror, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 05/11] block: Accept node-name for blockdev-snapshot-delete-internal-sync,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 06/11] block: Accept node-name for blockdev-snapshot-internal-sync, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 07/11] block: Accept node-name for change-backing-file, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 08/11] block: Accept node-name for drive-backup, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 09/11] block: Accept node-name for drive-mirror, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 10/11] nbd-server: Use a separate BlockBackend, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 11/11] nbd-server: Allow node name for nbd-server-add, Kevin Wolf, 2016/07/06
- Re: [Qemu-devel] [RFC PATCH v2 00/11] block: Accept node-name in all node level QMP commands, Kevin Wolf, 2016/07/06