From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKods-0000M2-B9 for qemu-devel@nongnu.org; Wed, 06 Jul 2016 11:21:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKodm-0000pU-Lj for qemu-devel@nongnu.org; Wed, 06 Jul 2016 11:21:35 -0400 From: Kevin Wolf Date: Wed, 6 Jul 2016 17:20:42 +0200 Message-Id: <1467818447-2728-7-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 06/11] block: Accept node-name for blockdev-snapshot-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-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 | 15 +++------------ tests/qemu-iotests/057 | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/blockdev.c b/blockdev.c index 8e38d2d..7a0890f 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1504,7 +1504,6 @@ static void internal_snapshot_prepare(BlkActionState *common, Error *local_err = NULL; const char *device; const char *name; - BlockBackend *blk; BlockDriverState *bs; QEMUSnapshotInfo old_sn, *sn; bool ret; @@ -1527,23 +1526,15 @@ static void internal_snapshot_prepare(BlkActionState *common, return; } - 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; } /* AioContext is released in .clean() */ - state->aio_context = blk_get_aio_context(blk); + state->aio_context = bdrv_get_aio_context(bs); aio_context_acquire(state->aio_context); - if (!blk_is_available(blk)) { - error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, device); - return; - } - bs = blk_bs(blk); - state->bs = bs; bdrv_drained_begin(bs); diff --git a/tests/qemu-iotests/057 b/tests/qemu-iotests/057 index bb6c06a..9f0a5a3 100755 --- a/tests/qemu-iotests/057 +++ b/tests/qemu-iotests/057 @@ -182,7 +182,7 @@ class TestSingleTransaction(ImageSnapshotTestCase): 'name': 'a' }, }] result = self.vm.qmp('transaction', actions = actions) - self.assert_qmp(result, 'error/class', 'DeviceNotFound') + self.assert_qmp(result, 'error/class', 'GenericError') def test_error_exist(self): self.createSnapshotInTransaction(1) -- 1.8.3.1