From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKodr-0000KM-6Q for qemu-devel@nongnu.org; Wed, 06 Jul 2016 11:21:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKodl-0000ob-G5 for qemu-devel@nongnu.org; Wed, 06 Jul 2016 11:21:34 -0400 From: Kevin Wolf Date: Wed, 6 Jul 2016 17:20:41 +0200 Message-Id: <1467818447-2728-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1467818447-2728-1-git-send-email-kwolf@redhat.com> References: <1467818447-2728-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v2 05/11] block: Accept node-name for blockdev-snapshot-delete-internal-sync List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, eblake@redhat.com, qemu-devel@nongnu.org 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 --- 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