ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Convert bdrv_find to blk_by_name 

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-id: 1425296209-1476-3-git-send-email-famz@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Fam Zheng 2015-03-02 19:36:47 +08:00 committed by Max Reitz
parent 5560625bad
commit c9ebaf744e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
migration/block.c
View File

@ -23,6 +23,7 @@
#include "migration/block.h" #include "migration/block.h"
#include "migration/migration.h" #include "migration/migration.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "sysemu/block-backend.h"
#include <assert.h> #include <assert.h>
#define BLOCK_SIZE (1 << 20) #define BLOCK_SIZE (1 << 20)
@ -783,6 +784,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id)
char device_name[256]; char device_name[256];
int64_t addr; int64_t addr;
BlockDriverState *bs, *bs_prev = NULL; BlockDriverState *bs, *bs_prev = NULL;
BlockBackend *blk;
uint8_t *buf; uint8_t *buf;
int64_t total_sectors = 0; int64_t total_sectors = 0;
int nr_sectors; 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); qemu_get_buffer(f, (uint8_t *)device_name, len);
device_name[len] = '\0'; device_name[len] = '\0';
bs = bdrv_find(device_name); blk = blk_by_name(device_name);
if (!bs) { if (!blk) {
fprintf(stderr, "Error unknown block device %s\n", fprintf(stderr, "Error unknown block device %s\n",
device_name); device_name);
return -EINVAL; return -EINVAL;
} }
bs = blk_bs(blk);
if (bs != bs_prev) { if (bs != bs_prev) {
bs_prev = bs; bs_prev = bs;