From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXYKv-0003aS-1u for qemu-devel@nongnu.org; Mon, 16 Mar 2015 12:57:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXYKo-0002AN-Pj for qemu-devel@nongnu.org; Mon, 16 Mar 2015 12:57:52 -0400 From: Kevin Wolf Date: Mon, 16 Mar 2015 17:57:14 +0100 Message-Id: <1426525041-21926-11-git-send-email-kwolf@redhat.com> In-Reply-To: <1426525041-21926-1-git-send-email-kwolf@redhat.com> References: <1426525041-21926-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 10/17] migration: Convert bdrv_find to blk_by_name List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Fam Zheng Signed-off-by: Fam Zheng Message-id: 1425296209-1476-3-git-send-email-famz@redhat.com Reviewed-by: Max Reitz Signed-off-by: Max Reitz --- migration/block.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/migration/block.c b/migration/block.c index 0c76106..085c0fa 100644 --- a/migration/block.c +++ b/migration/block.c @@ -23,6 +23,7 @@ #include "migration/block.h" #include "migration/migration.h" #include "sysemu/blockdev.h" +#include "sysemu/block-backend.h" #include #define BLOCK_SIZE (1 << 20) @@ -783,6 +784,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) char device_name[256]; int64_t addr; BlockDriverState *bs, *bs_prev = NULL; + BlockBackend *blk; uint8_t *buf; int64_t total_sectors = 0; int nr_sectors; @@ -800,12 +802,13 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) qemu_get_buffer(f, (uint8_t *)device_name, len); device_name[len] = '\0'; - bs = bdrv_find(device_name); - if (!bs) { + blk = blk_by_name(device_name); + if (!blk) { fprintf(stderr, "Error unknown block device %s\n", device_name); return -EINVAL; } + bs = blk_bs(blk); if (bs != bs_prev) { bs_prev = bs; -- 1.8.3.1