mirror of https://github.com/xqemu/xqemu.git
block migration: Consolidate block transmission
Based on the original patch by Pierre Riteau: Use a common blk_send function to transmit a block. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
57cce12d54
commit
13f0b67fd3
|
@ -72,6 +72,22 @@ typedef struct BlkMigState {
|
||||||
|
|
||||||
static BlkMigState block_mig_state;
|
static BlkMigState block_mig_state;
|
||||||
|
|
||||||
|
static void blk_send(QEMUFile *f, BlkMigBlock * blk)
|
||||||
|
{
|
||||||
|
int len;
|
||||||
|
|
||||||
|
/* sector number and flags */
|
||||||
|
qemu_put_be64(f, (blk->sector << BDRV_SECTOR_BITS)
|
||||||
|
| BLK_MIG_FLAG_DEVICE_BLOCK);
|
||||||
|
|
||||||
|
/* device name */
|
||||||
|
len = strlen(blk->bmds->bs->device_name);
|
||||||
|
qemu_put_byte(f, len);
|
||||||
|
qemu_put_buffer(f, (uint8_t *)blk->bmds->bs->device_name, len);
|
||||||
|
|
||||||
|
qemu_put_buffer(f, blk->buf, BLOCK_SIZE);
|
||||||
|
}
|
||||||
|
|
||||||
static void blk_mig_read_cb(void *opaque, int ret)
|
static void blk_mig_read_cb(void *opaque, int ret)
|
||||||
{
|
{
|
||||||
BlkMigBlock *blk = opaque;
|
BlkMigBlock *blk = opaque;
|
||||||
|
@ -90,9 +106,8 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds, int is_async)
|
||||||
int64_t total_sectors = bmds->total_sectors;
|
int64_t total_sectors = bmds->total_sectors;
|
||||||
int64_t cur_sector = bmds->cur_sector;
|
int64_t cur_sector = bmds->cur_sector;
|
||||||
BlockDriverState *bs = bmds->bs;
|
BlockDriverState *bs = bmds->bs;
|
||||||
int len, nr_sectors;
|
|
||||||
BlkMigBlock *blk;
|
BlkMigBlock *blk;
|
||||||
uint8_t *tmp_buf;
|
int nr_sectors;
|
||||||
|
|
||||||
if (bmds->shared_base) {
|
if (bmds->shared_base) {
|
||||||
while (cur_sector < total_sectors &&
|
while (cur_sector < total_sectors &&
|
||||||
|
@ -123,75 +138,42 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds, int is_async)
|
||||||
nr_sectors = total_sectors - cur_sector;
|
nr_sectors = total_sectors - cur_sector;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
blk = qemu_malloc(sizeof(BlkMigBlock));
|
||||||
|
blk->buf = qemu_malloc(BLOCK_SIZE);
|
||||||
|
blk->bmds = bmds;
|
||||||
|
blk->sector = cur_sector;
|
||||||
|
|
||||||
if (is_async) {
|
if (is_async) {
|
||||||
blk = qemu_malloc(sizeof(BlkMigBlock));
|
|
||||||
blk->buf = qemu_malloc(BLOCK_SIZE);
|
|
||||||
|
|
||||||
bmds->cur_sector = cur_sector + nr_sectors;
|
|
||||||
blk->sector = cur_sector;
|
|
||||||
blk->bmds = bmds;
|
|
||||||
|
|
||||||
blk->iov.iov_base = blk->buf;
|
blk->iov.iov_base = blk->buf;
|
||||||
blk->iov.iov_len = nr_sectors * BDRV_SECTOR_SIZE;
|
blk->iov.iov_len = nr_sectors * BDRV_SECTOR_SIZE;
|
||||||
qemu_iovec_init_external(&blk->qiov, &blk->iov, 1);
|
qemu_iovec_init_external(&blk->qiov, &blk->iov, 1);
|
||||||
|
|
||||||
blk->aiocb = bdrv_aio_readv(bs, cur_sector, &blk->qiov,
|
blk->aiocb = bdrv_aio_readv(bs, cur_sector, &blk->qiov,
|
||||||
nr_sectors, blk_mig_read_cb, blk);
|
nr_sectors, blk_mig_read_cb, blk);
|
||||||
|
|
||||||
if (!blk->aiocb) {
|
if (!blk->aiocb) {
|
||||||
printf("Error reading sector %" PRId64 "\n", cur_sector);
|
printf("Error reading sector %" PRId64 "\n", cur_sector);
|
||||||
qemu_free(blk->buf);
|
qemu_free(blk->buf);
|
||||||
qemu_free(blk);
|
qemu_free(blk);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bdrv_reset_dirty(bs, cur_sector, nr_sectors);
|
|
||||||
block_mig_state.submitted++;
|
block_mig_state.submitted++;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
tmp_buf = qemu_malloc(BLOCK_SIZE);
|
if (bdrv_read(bs, cur_sector, blk->buf, nr_sectors) < 0) {
|
||||||
|
|
||||||
if (bdrv_read(bs, cur_sector, tmp_buf, nr_sectors) < 0) {
|
|
||||||
printf("Error reading sector %" PRId64 "\n", cur_sector);
|
printf("Error reading sector %" PRId64 "\n", cur_sector);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
blk_send(f, blk);
|
||||||
|
|
||||||
bdrv_reset_dirty(bs, cur_sector, nr_sectors);
|
qemu_free(blk->buf);
|
||||||
|
qemu_free(blk);
|
||||||
/* sector number and flags */
|
|
||||||
qemu_put_be64(f, (cur_sector << BDRV_SECTOR_BITS)
|
|
||||||
| BLK_MIG_FLAG_DEVICE_BLOCK);
|
|
||||||
|
|
||||||
/* device name */
|
|
||||||
len = strlen(bs->device_name);
|
|
||||||
qemu_put_byte(f, len);
|
|
||||||
qemu_put_buffer(f, (uint8_t *)bs->device_name, len);
|
|
||||||
|
|
||||||
qemu_put_buffer(f, tmp_buf, BLOCK_SIZE);
|
|
||||||
|
|
||||||
bmds->cur_sector = cur_sector + BDRV_SECTORS_PER_DIRTY_CHUNK;
|
|
||||||
|
|
||||||
qemu_free(tmp_buf);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bdrv_reset_dirty(bs, cur_sector, nr_sectors);
|
||||||
|
bmds->cur_sector = cur_sector + nr_sectors;
|
||||||
|
|
||||||
return (bmds->cur_sector >= total_sectors);
|
return (bmds->cur_sector >= total_sectors);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void send_blk(QEMUFile *f, BlkMigBlock * blk)
|
|
||||||
{
|
|
||||||
int len;
|
|
||||||
|
|
||||||
/* sector number and flags */
|
|
||||||
qemu_put_be64(f, (blk->sector << BDRV_SECTOR_BITS)
|
|
||||||
| BLK_MIG_FLAG_DEVICE_BLOCK);
|
|
||||||
|
|
||||||
/* device name */
|
|
||||||
len = strlen(blk->bmds->bs->device_name);
|
|
||||||
qemu_put_byte(f, len);
|
|
||||||
qemu_put_buffer(f, (uint8_t *)blk->bmds->bs->device_name, len);
|
|
||||||
|
|
||||||
qemu_put_buffer(f, blk->buf, BLOCK_SIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void set_dirty_tracking(int enable)
|
static void set_dirty_tracking(int enable)
|
||||||
{
|
{
|
||||||
BlkMigDevState *bmds;
|
BlkMigDevState *bmds;
|
||||||
|
@ -254,30 +236,22 @@ static int blk_mig_save_bulked_block(QEMUFile *f, int is_async)
|
||||||
static void blk_mig_save_dirty_blocks(QEMUFile *f)
|
static void blk_mig_save_dirty_blocks(QEMUFile *f)
|
||||||
{
|
{
|
||||||
BlkMigDevState *bmds;
|
BlkMigDevState *bmds;
|
||||||
uint8_t *buf;
|
BlkMigBlock blk;
|
||||||
int64_t sector;
|
int64_t sector;
|
||||||
int len;
|
|
||||||
|
|
||||||
buf = qemu_malloc(BLOCK_SIZE);
|
blk.buf = qemu_malloc(BLOCK_SIZE);
|
||||||
|
|
||||||
QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
|
QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
|
||||||
for (sector = 0; sector < bmds->cur_sector;) {
|
for (sector = 0; sector < bmds->cur_sector;) {
|
||||||
if (bdrv_get_dirty(bmds->bs, sector)) {
|
if (bdrv_get_dirty(bmds->bs, sector)) {
|
||||||
if (bdrv_read(bmds->bs, sector, buf,
|
if (bdrv_read(bmds->bs, sector, blk.buf,
|
||||||
BDRV_SECTORS_PER_DIRTY_CHUNK) < 0) {
|
BDRV_SECTORS_PER_DIRTY_CHUNK) < 0) {
|
||||||
|
printf("Error reading sector %" PRId64 "\n", sector);
|
||||||
/* FIXME: add error handling */
|
/* FIXME: add error handling */
|
||||||
}
|
}
|
||||||
|
blk.bmds = bmds;
|
||||||
/* sector number and flags */
|
blk.sector = sector;
|
||||||
qemu_put_be64(f, (sector << BDRV_SECTOR_BITS)
|
blk_send(f, &blk);
|
||||||
| BLK_MIG_FLAG_DEVICE_BLOCK);
|
|
||||||
|
|
||||||
/* device name */
|
|
||||||
len = strlen(bmds->bs->device_name);
|
|
||||||
qemu_put_byte(f, len);
|
|
||||||
qemu_put_buffer(f, (uint8_t *)bmds->bs->device_name, len);
|
|
||||||
|
|
||||||
qemu_put_buffer(f, buf, BLOCK_SIZE);
|
|
||||||
|
|
||||||
bdrv_reset_dirty(bmds->bs, sector,
|
bdrv_reset_dirty(bmds->bs, sector,
|
||||||
BDRV_SECTORS_PER_DIRTY_CHUNK);
|
BDRV_SECTORS_PER_DIRTY_CHUNK);
|
||||||
|
@ -286,7 +260,7 @@ static void blk_mig_save_dirty_blocks(QEMUFile *f)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
qemu_free(buf);
|
qemu_free(blk.buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void flush_blks(QEMUFile* f)
|
static void flush_blks(QEMUFile* f)
|
||||||
|
@ -301,7 +275,7 @@ static void flush_blks(QEMUFile* f)
|
||||||
if (qemu_file_rate_limit(f)) {
|
if (qemu_file_rate_limit(f)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
send_blk(f, blk);
|
blk_send(f, blk);
|
||||||
|
|
||||||
QSIMPLEQ_REMOVE_HEAD(&block_mig_state.blk_list, entry);
|
QSIMPLEQ_REMOVE_HEAD(&block_mig_state.blk_list, entry);
|
||||||
qemu_free(blk->buf);
|
qemu_free(blk->buf);
|
||||||
|
|
Loading…
Reference in New Issue