* [Qemu-devel] [PATCH 0/6] block-migration: Various cleanups
@ 2009-11-26 18:44 Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 1/6] Fix coding style Pierre Riteau
0 siblings, 1 reply; 7+ messages in thread
From: Pierre Riteau @ 2009-11-26 18:44 UTC (permalink / raw)
To: Liran Schour, qemu-devel
Hi,
While reading the block migration code I couldn't resist cleaning it up.
Among other things I replaced the lists by simple queues from NetBSD
(it can probably be useful for other subsystems).
block-migration.c | 486 ++++++++++++++++++++++-------------------------------
block-migration.h | 4 +-
qemu-queue.h | 109 ++++++++++++-
savevm.c | 41 +++---
4 files changed, 332 insertions(+), 308 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 1/6] Fix coding style
2009-11-26 18:44 [Qemu-devel] [PATCH 0/6] block-migration: Various cleanups Pierre Riteau
@ 2009-11-26 18:44 ` Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 2/6] Import a simple queue implementation from NetBSD Pierre Riteau
0 siblings, 1 reply; 7+ messages in thread
From: Pierre Riteau @ 2009-11-26 18:44 UTC (permalink / raw)
To: Liran Schour, qemu-devel; +Cc: Pierre Riteau
Signed-off-by: Pierre Riteau <Pierre.Riteau@irisa.fr>
---
block-migration.c | 366 ++++++++++++++++++++++++++---------------------------
block-migration.h | 2 +-
savevm.c | 41 +++---
3 files changed, 200 insertions(+), 209 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index 09771ed..0cb162a 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -21,23 +21,23 @@
#define SECTOR_SIZE (1 << SECTOR_BITS)
#define SECTOR_MASK ~(SECTOR_SIZE - 1);
-#define BLOCK_SIZE (block_mig_state->sectors_per_block << SECTOR_BITS)
+#define BLOCK_SIZE (block_mig_state->sectors_per_block << SECTOR_BITS)
#define BLK_MIG_FLAG_DEVICE_BLOCK 0x01
#define BLK_MIG_FLAG_EOS 0x02
#define MAX_IS_ALLOCATED_SEARCH 65536
-#define MAX_BLOCKS_READ 10000
-#define BLOCKS_READ_CHANGE 100
-#define INITIAL_BLOCKS_READ 100
+#define MAX_BLOCKS_READ 10000
+#define BLOCKS_READ_CHANGE 100
+#define INITIAL_BLOCKS_READ 100
//#define DEBUG_BLK_MIGRATION
#ifdef DEBUG_BLK_MIGRATION
-#define dprintf(fmt, ...) \
+#define dprintf(fmt, ...) \
do { printf("blk_migration: " fmt, ## __VA_ARGS__); } while (0)
#else
-#define dprintf(fmt, ...) \
+#define dprintf(fmt, ...) \
do { } while (0)
#endif
@@ -68,87 +68,87 @@ typedef struct BlkMigState {
int64_t print_completion;
} BlkMigState;
-static BlkMigState *block_mig_state = NULL;
+static BlkMigState *block_mig_state = NULL;
static void blk_mig_read_cb(void *opaque, int ret)
{
BlkMigBlock *blk = opaque;
-
+
blk->ret = ret;
-
+
/* insert at the end */
- if(block_mig_state->last_blk == NULL) {
+ if (block_mig_state->last_blk == NULL) {
block_mig_state->first_blk = blk;
block_mig_state->last_blk = blk;
} else {
block_mig_state->last_blk->next = blk;
block_mig_state->last_blk = blk;
}
-
+
block_mig_state->submitted--;
block_mig_state->read_done++;
assert(block_mig_state->submitted >= 0);
-
+
return;
}
static int mig_read_device_bulk(QEMUFile *f, BlkMigDevState *bms)
-{
+{
int nr_sectors;
int64_t total_sectors, cur_sector = 0;
BlockDriverState *bs = bms->bs;
BlkMigBlock *blk;
-
+
blk = qemu_malloc(sizeof(BlkMigBlock));
blk->buf = qemu_malloc(BLOCK_SIZE);
-
+
cur_sector = bms->cur_sector;
total_sectors = bdrv_getlength(bs) >> SECTOR_BITS;
-
- if(bms->shared_base) {
- while(cur_sector < bms->total_sectors &&
- !bdrv_is_allocated(bms->bs, cur_sector,
+
+ if (bms->shared_base) {
+ while (cur_sector < bms->total_sectors &&
+ !bdrv_is_allocated(bms->bs, cur_sector,
MAX_IS_ALLOCATED_SEARCH, &nr_sectors)) {
cur_sector += nr_sectors;
}
}
-
- if(cur_sector >= total_sectors) {
+
+ if (cur_sector >= total_sectors) {
bms->cur_sector = total_sectors;
qemu_free(blk->buf);
qemu_free(blk);
return 1;
}
-
- if(cur_sector >= block_mig_state->print_completion) {
+
+ if (cur_sector >= block_mig_state->print_completion) {
printf("Completed %" PRId64 " %%\r", cur_sector * 100 / total_sectors);
fflush(stdout);
- block_mig_state->print_completion +=
+ block_mig_state->print_completion +=
(block_mig_state->sectors_per_block * 10000);
}
-
- /* we going to transfder BLOCK_SIZE any way even if it is not allocated */
+
+ /* we going to transfer BLOCK_SIZE any way even if it is not allocated */
nr_sectors = block_mig_state->sectors_per_block;
- cur_sector &= ~((int64_t)block_mig_state->sectors_per_block -1);
-
- if(total_sectors - cur_sector < block_mig_state->sectors_per_block) {
+ cur_sector &= ~((int64_t)block_mig_state->sectors_per_block - 1);
+
+ if (total_sectors - cur_sector < block_mig_state->sectors_per_block) {
nr_sectors = (total_sectors - cur_sector);
}
-
+
bms->cur_sector = cur_sector + nr_sectors;
blk->sector = cur_sector;
blk->bmds = bms;
blk->next = NULL;
-
+
blk->iov.iov_base = blk->buf;
blk->iov.iov_len = nr_sectors * SECTOR_SIZE;
qemu_iovec_init_external(&blk->qiov, &blk->iov, 1);
-
+
blk->aiocb = bdrv_aio_readv(bs, cur_sector, &blk->qiov,
nr_sectors, blk_mig_read_cb, blk);
-
- if(!blk->aiocb) {
+
+ if (!blk->aiocb) {
printf("Error reading sector %" PRId64 "\n", cur_sector);
qemu_free(blk->buf);
qemu_free(blk);
@@ -157,90 +157,86 @@ static int mig_read_device_bulk(QEMUFile *f, BlkMigDevState *bms)
bdrv_reset_dirty(bms->bs, cur_sector, nr_sectors);
block_mig_state->submitted++;
-
+
return (bms->cur_sector >= total_sectors);
}
static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds)
-{
+{
int len, nr_sectors;
int64_t total_sectors = bmds->total_sectors, cur_sector = 0;
uint8_t *tmp_buf = NULL;
BlockDriverState *bs = bmds->bs;
tmp_buf = qemu_malloc(BLOCK_SIZE);
-
+
cur_sector = bmds->cur_sector;
-
- if(bmds->shared_base) {
- while(cur_sector < bmds->total_sectors &&
- !bdrv_is_allocated(bmds->bs, cur_sector,
+
+ if (bmds->shared_base) {
+ while (cur_sector < bmds->total_sectors &&
+ !bdrv_is_allocated(bmds->bs, cur_sector,
MAX_IS_ALLOCATED_SEARCH, &nr_sectors)) {
cur_sector += nr_sectors;
}
}
-
- if(cur_sector >= total_sectors) {
+
+ if (cur_sector >= total_sectors) {
bmds->cur_sector = total_sectors;
qemu_free(tmp_buf);
return 1;
}
-
- if(cur_sector >= block_mig_state->print_completion) {
+
+ if (cur_sector >= block_mig_state->print_completion) {
printf("Completed %" PRId64 " %%\r", cur_sector * 100 / total_sectors);
fflush(stdout);
- block_mig_state->print_completion +=
+ block_mig_state->print_completion +=
(block_mig_state->sectors_per_block * 10000);
}
-
- cur_sector &= ~((int64_t)block_mig_state->sectors_per_block -1);
-
- /* we going to transfer
- BLOCK_SIZE
- any way even if it is not allocated */
+
+ cur_sector &= ~((int64_t)block_mig_state->sectors_per_block - 1);
+
+ /* we going to transfer BLOCK_SIZE any way even if it is not allocated */
nr_sectors = block_mig_state->sectors_per_block;
-
- if(total_sectors - cur_sector < block_mig_state->sectors_per_block) {
+
+ if (total_sectors - cur_sector < block_mig_state->sectors_per_block) {
nr_sectors = (total_sectors - cur_sector);
}
-
- if(bdrv_read(bs, cur_sector, tmp_buf, nr_sectors) < 0) {
+
+ if (bdrv_read(bs, cur_sector, tmp_buf, nr_sectors) < 0) {
printf("Error reading sector %" PRId64 "\n", cur_sector);
}
bdrv_reset_dirty(bs, cur_sector, nr_sectors);
-
+
/* Device name */
- qemu_put_be64(f,(cur_sector << SECTOR_BITS) | BLK_MIG_FLAG_DEVICE_BLOCK);
-
+ qemu_put_be64(f, (cur_sector << SECTOR_BITS) | BLK_MIG_FLAG_DEVICE_BLOCK);
+
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);
-
+
+ qemu_put_buffer(f, tmp_buf, BLOCK_SIZE);
+
bmds->cur_sector = cur_sector + block_mig_state->sectors_per_block;
-
+
qemu_free(tmp_buf);
-
+
return (bmds->cur_sector >= total_sectors);
}
static void send_blk(QEMUFile *f, BlkMigBlock * blk)
{
int len;
-
- /* Device name */
- qemu_put_be64(f,(blk->sector << SECTOR_BITS) | BLK_MIG_FLAG_DEVICE_BLOCK);
-
+
+ /* Device name */
+ qemu_put_be64(f, (blk->sector << SECTOR_BITS) | BLK_MIG_FLAG_DEVICE_BLOCK);
+
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);
-
+
+ qemu_put_buffer(f, blk->buf, BLOCK_SIZE);
+
return;
}
@@ -251,10 +247,10 @@ static void blk_mig_save_dev_info(QEMUFile *f, BlkMigDevState *bmds)
static void set_dirty_tracking(int enable)
{
BlkMigDevState *bmds;
- for(bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) {
- bdrv_set_dirty_tracking(bmds->bs,enable);
+ for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) {
+ bdrv_set_dirty_tracking(bmds->bs, enable);
}
-
+
return;
}
@@ -262,35 +258,35 @@ static void init_blk_migration(QEMUFile *f)
{
BlkMigDevState **pbmds, *bmds;
BlockDriverState *bs;
-
+
for (bs = bdrv_first; bs != NULL; bs = bs->next) {
- if(bs->type == BDRV_TYPE_HD) {
+ if (bs->type == BDRV_TYPE_HD) {
bmds = qemu_mallocz(sizeof(BlkMigDevState));
bmds->bs = bs;
bmds->bulk_completed = 0;
bmds->total_sectors = bdrv_getlength(bs) >> SECTOR_BITS;
bmds->shared_base = block_mig_state->shared_base;
-
- if(bmds->shared_base) {
- printf("Start migration for %s with shared base image\n",
+
+ if (bmds->shared_base) {
+ printf("Start migration for %s with shared base image\n",
bs->device_name);
} else {
printf("Start full migration for %s\n", bs->device_name);
}
-
+
/* insert at the end */
pbmds = &block_mig_state->bmds_first;
- while (*pbmds != NULL)
+ while (*pbmds != NULL) {
pbmds = &(*pbmds)->next;
+ }
*pbmds = bmds;
-
+
blk_mig_save_dev_info(f, bmds);
-
}
- }
-
+ }
+
block_mig_state->sectors_per_block = bdrv_get_sectors_per_chunk();
-
+
return;
}
@@ -299,14 +295,14 @@ static int blk_mig_save_bulked_block(QEMUFile *f, int is_async)
BlkMigDevState *bmds;
for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) {
- if(bmds->bulk_completed == 0) {
- if(is_async) {
- if(mig_read_device_bulk(f, bmds) == 1) {
+ if (bmds->bulk_completed == 0) {
+ if (is_async) {
+ if (mig_read_device_bulk(f, bmds) == 1) {
/* completed bulk section for this device */
bmds->bulk_completed = 1;
}
} else {
- if(mig_save_device_bulk(f,bmds) == 1) {
+ if (mig_save_device_bulk(f, bmds) == 1) {
/* completed bulk section for this device */
bmds->bulk_completed = 1;
}
@@ -314,12 +310,11 @@ static int blk_mig_save_bulked_block(QEMUFile *f, int is_async)
return 1;
}
}
-
+
/* we reached here means bulk is completed */
block_mig_state->bulk_completed = 1;
-
+
return 0;
-
}
#define MAX_NUM_BLOCKS 4
@@ -330,70 +325,70 @@ static void blk_mig_save_dirty_blocks(QEMUFile *f)
uint8_t buf[BLOCK_SIZE];
int64_t sector;
int len;
-
- for(bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) {
- for(sector = 0; sector < bmds->cur_sector;) {
-
- if(bdrv_get_dirty(bmds->bs,sector)) {
-
- if(bdrv_read(bmds->bs, sector, buf,
+
+ for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) {
+ for (sector = 0; sector < bmds->cur_sector;) {
+
+ if (bdrv_get_dirty(bmds->bs, sector)) {
+
+ if (bdrv_read(bmds->bs, sector, buf,
block_mig_state->sectors_per_block) < 0) {
}
-
+
/* device name */
- qemu_put_be64(f,(sector << SECTOR_BITS)
+ qemu_put_be64(f, (sector << SECTOR_BITS)
| BLK_MIG_FLAG_DEVICE_BLOCK);
-
+
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_mig_state->sectors_per_block *
+
+ qemu_put_buffer(f, buf,
+ (block_mig_state->sectors_per_block *
SECTOR_SIZE));
-
- bdrv_reset_dirty(bmds->bs, sector,
+
+ bdrv_reset_dirty(bmds->bs, sector,
block_mig_state->sectors_per_block);
-
+
sector += block_mig_state->sectors_per_block;
} else {
/* sector is clean */
sector += block_mig_state->sectors_per_block;
- }
+ }
}
}
-
+
return;
}
static void flush_blks(QEMUFile* f)
{
BlkMigBlock *blk, *tmp;
-
- dprintf("%s Enter submitted %d read_done %d transfered\n", __FUNCTION__,
+
+ dprintf("%s Enter submitted %d read_done %d transfered\n", __FUNCTION__,
submitted, read_done, transfered);
-
- for(blk = block_mig_state->first_blk;
+
+ for (blk = block_mig_state->first_blk;
blk != NULL && !qemu_file_rate_limit(f); blk = tmp) {
send_blk(f, blk);
-
+
tmp = blk->next;
qemu_free(blk->buf);
qemu_free(blk);
-
+
block_mig_state->read_done--;
block_mig_state->transferred++;
assert(block_mig_state->read_done >= 0);
}
block_mig_state->first_blk = blk;
-
- if(block_mig_state->first_blk == NULL) {
+
+ if (block_mig_state->first_blk == NULL) {
block_mig_state->last_blk = NULL;
}
- dprintf("%s Exit submitted %d read_done %d transferred%d\n", __FUNCTION__,
- block_mig_state->submitted, block_mig_state->read_done,
+ dprintf("%s Exit submitted %d read_done %d transferred%d\n", __FUNCTION__,
+ block_mig_state->submitted, block_mig_state->read_done,
block_mig_state->transferred);
return;
@@ -402,71 +397,72 @@ static void flush_blks(QEMUFile* f)
static int is_stage2_completed(void)
{
BlkMigDevState *bmds;
-
- if(block_mig_state->submitted > 0) {
+
+ if (block_mig_state->submitted > 0) {
return 0;
}
-
+
for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) {
- if(bmds->bulk_completed == 0) {
+ if (bmds->bulk_completed == 0) {
return 0;
}
}
-
+
return 1;
}
static int block_save_live(QEMUFile *f, int stage, void *opaque)
{
int ret = 1;
-
- dprintf("Enter save live stage %d submitted %d transferred %d\n", stage,
+
+ dprintf("Enter save live stage %d submitted %d transferred %d\n", stage,
submitted, transferred);
-
- if(block_mig_state->blk_enable != 1) {
+
+ if (block_mig_state->blk_enable != 1) {
/* no need to migrate storage */
-
- qemu_put_be64(f,BLK_MIG_FLAG_EOS);
+
+ qemu_put_be64(f, BLK_MIG_FLAG_EOS);
return 1;
}
-
- if(stage == 1) {
+
+ if (stage == 1) {
init_blk_migration(f);
-
+
/* start track dirty blocks */
set_dirty_tracking(1);
-
}
flush_blks(f);
-
+
/* control the rate of transfer */
- while ((block_mig_state->submitted + block_mig_state->read_done) *
- (BLOCK_SIZE) <
+ while ((block_mig_state->submitted + block_mig_state->read_done) *
+ (BLOCK_SIZE) <
(qemu_file_get_rate_limit(f))) {
-
+
ret = blk_mig_save_bulked_block(f, 1);
-
- if (ret == 0) /* no more bulk blocks for now*/
+
+ if (ret == 0) {
+ /* no more bulk blocks for now */
break;
+ }
}
-
+
flush_blks(f);
-
- if(stage == 3) {
-
- while(blk_mig_save_bulked_block(f, 0) != 0);
-
+
+ if (stage == 3) {
+
+ while (blk_mig_save_bulked_block(f, 0) != 0);
+
blk_mig_save_dirty_blocks(f);
-
+
/* stop track dirty blocks */
- set_dirty_tracking(0);;
-
- printf("\nBlock migration completed\n");
+ set_dirty_tracking(0);
+
+ printf("\nBlock migration completed\n");
}
-
- qemu_put_be64(f,BLK_MIG_FLAG_EOS);
-
+
+ qemu_put_be64(f, BLK_MIG_FLAG_EOS);
+
return ((stage == 2) && is_stage2_completed());
}
@@ -477,43 +473,40 @@ static int block_load(QEMUFile *f, void *opaque, int version_id)
int64_t addr;
BlockDriverState *bs;
uint8_t *buf;
-
+
block_mig_state->sectors_per_block = bdrv_get_sectors_per_chunk();
buf = qemu_malloc(BLOCK_SIZE);
-
+
do {
-
addr = qemu_get_be64(f);
-
+
flags = addr & ~SECTOR_MASK;
addr &= SECTOR_MASK;
-
- if(flags & BLK_MIG_FLAG_DEVICE_BLOCK) {
-
+
+ if (flags & BLK_MIG_FLAG_DEVICE_BLOCK) {
+
/* get device name */
len = qemu_get_byte(f);
-
+
qemu_get_buffer(f, (uint8_t *)device_name, len);
device_name[len] = '\0';
-
+
bs = bdrv_find(device_name);
-
- qemu_get_buffer(f, buf,
- BLOCK_SIZE);
- if(bs != NULL) {
-
- bdrv_write(bs, (addr >> SECTOR_BITS),
+
+ qemu_get_buffer(f, buf, BLOCK_SIZE);
+ if (bs != NULL) {
+ bdrv_write(bs, (addr >> SECTOR_BITS),
buf, block_mig_state->sectors_per_block);
} else {
printf("Error unknown block device %s\n", device_name);
}
- } else if(flags & BLK_MIG_FLAG_EOS) {
-
+ } else if (flags & BLK_MIG_FLAG_EOS) {
+
} else {
printf("Unknown flags\n");
}
- } while(!(flags & BLK_MIG_FLAG_EOS));
-
+ } while (!(flags & BLK_MIG_FLAG_EOS));
+
qemu_free(buf);
return 0;
@@ -525,33 +518,30 @@ static void block_set_params(int blk_enable, int shared_base, void *opaque)
block_mig_state->blk_enable = blk_enable;
block_mig_state->shared_base = shared_base;
-
+
/* shared base means that blk_enable = 1 */
block_mig_state->blk_enable |= shared_base;
-
+
return;
}
void blk_mig_info(void)
{
BlockDriverState *bs;
-
+
for (bs = bdrv_first; bs != NULL; bs = bs->next) {
printf("Device %s\n", bs->device_name);
- if(bs->type == BDRV_TYPE_HD) {
- printf("device %s format %s\n",
+ if (bs->type == BDRV_TYPE_HD) {
+ printf("device %s format %s\n",
bs->device_name, bs->drv->format_name);
}
}
}
void blk_mig_init(void)
-{
-
+{
block_mig_state = qemu_mallocz(sizeof(BlkMigState));
-
- register_savevm_live("block", 0, 1, block_set_params, block_save_live,
- NULL, block_load, block_mig_state);
-
+ register_savevm_live("block", 0, 1, block_set_params, block_save_live,
+ NULL, block_load, block_mig_state);
}
diff --git a/block-migration.h b/block-migration.h
index c33d3cb..9961abd 100644
--- a/block-migration.h
+++ b/block-migration.h
@@ -23,7 +23,7 @@ typedef struct BlkMigDevState {
int64_t total_sectors;
int64_t dirty;
} BlkMigDevState;
-
+
void blk_mig_init(void);
void blk_mig_info(void);
#endif /* BLOCK_MIGRATION_H */
diff --git a/savevm.c b/savevm.c
index 4668843..e875e16 100644
--- a/savevm.c
+++ b/savevm.c
@@ -264,11 +264,11 @@ QEMUFile *qemu_popen(FILE *stdio_file, const char *mode)
s->stdio_file = stdio_file;
- if(mode[0] == 'r') {
- s->file = qemu_fopen_ops(s, NULL, stdio_get_buffer, stdio_pclose,
+ if (mode[0] == 'r') {
+ s->file = qemu_fopen_ops(s, NULL, stdio_get_buffer, stdio_pclose,
NULL, NULL, NULL);
} else {
- s->file = qemu_fopen_ops(s, stdio_put_buffer, NULL, stdio_pclose,
+ s->file = qemu_fopen_ops(s, stdio_put_buffer, NULL, stdio_pclose,
NULL, NULL, NULL);
}
return s->file;
@@ -279,7 +279,7 @@ QEMUFile *qemu_popen_cmd(const char *command, const char *mode)
FILE *popen_file;
popen_file = popen(command, mode);
- if(popen_file == NULL) {
+ if (popen_file == NULL) {
return NULL;
}
@@ -313,11 +313,11 @@ QEMUFile *qemu_fdopen(int fd, const char *mode)
if (!s->stdio_file)
goto fail;
- if(mode[0] == 'r') {
- s->file = qemu_fopen_ops(s, NULL, stdio_get_buffer, stdio_fclose,
+ if (mode[0] == 'r') {
+ s->file = qemu_fopen_ops(s, NULL, stdio_get_buffer, stdio_fclose,
NULL, NULL, NULL);
} else {
- s->file = qemu_fopen_ops(s, stdio_put_buffer, NULL, stdio_fclose,
+ s->file = qemu_fopen_ops(s, stdio_put_buffer, NULL, stdio_fclose,
NULL, NULL, NULL);
}
return s->file;
@@ -332,7 +332,7 @@ QEMUFile *qemu_fopen_socket(int fd)
QEMUFileSocket *s = qemu_mallocz(sizeof(QEMUFileSocket));
s->fd = fd;
- s->file = qemu_fopen_ops(s, NULL, socket_get_buffer, socket_close,
+ s->file = qemu_fopen_ops(s, NULL, socket_get_buffer, socket_close,
NULL, NULL, NULL);
return s->file;
}
@@ -369,12 +369,12 @@ QEMUFile *qemu_fopen(const char *filename, const char *mode)
s->stdio_file = fopen(filename, mode);
if (!s->stdio_file)
goto fail;
-
- if(mode[0] == 'w') {
- s->file = qemu_fopen_ops(s, file_put_buffer, NULL, stdio_fclose,
+
+ if (mode[0] == 'w') {
+ s->file = qemu_fopen_ops(s, file_put_buffer, NULL, stdio_fclose,
NULL, NULL, NULL);
} else {
- s->file = qemu_fopen_ops(s, NULL, file_get_buffer, stdio_fclose,
+ s->file = qemu_fopen_ops(s, NULL, file_get_buffer, stdio_fclose,
NULL, NULL, NULL);
}
return s->file;
@@ -403,7 +403,7 @@ static int bdrv_fclose(void *opaque)
static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int is_writable)
{
if (is_writable)
- return qemu_fopen_ops(bs, block_put_buffer, NULL, bdrv_fclose,
+ return qemu_fopen_ops(bs, block_put_buffer, NULL, bdrv_fclose,
NULL, NULL, NULL);
return qemu_fopen_ops(bs, NULL, block_get_buffer, bdrv_fclose, NULL, NULL, NULL);
}
@@ -605,8 +605,9 @@ int qemu_file_rate_limit(QEMUFile *f)
size_t qemu_file_get_rate_limit(QEMUFile *f)
{
- if (f->get_rate_limit)
+ if (f->get_rate_limit) {
return f->get_rate_limit(f->opaque);
+ }
return 0;
}
@@ -1125,7 +1126,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
if (ret)
return ret;
}
- while(field->name) {
+ while (field->name) {
if ((field->field_exists &&
field->field_exists(opaque, version_id)) ||
(!field->field_exists &&
@@ -1176,7 +1177,7 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
if (vmsd->pre_save) {
vmsd->pre_save(opaque);
}
- while(field->name) {
+ while (field->name) {
if (!field->field_exists ||
field->field_exists(opaque, vmsd->version_id)) {
void *base_addr = opaque + field->offset;
@@ -1241,12 +1242,12 @@ int qemu_savevm_state_begin(QEMUFile *f, int blk_enable, int shared)
SaveStateEntry *se;
QTAILQ_FOREACH(se, &savevm_handlers, entry) {
- if(se->set_params == NULL) {
+ if (se->set_params == NULL) {
continue;
- }
- se->set_params(blk_enable, shared, se->opaque);
+ }
+ se->set_params(blk_enable, shared, se->opaque);
}
-
+
qemu_put_be32(f, QEMU_VM_FILE_MAGIC);
qemu_put_be32(f, QEMU_VM_FILE_VERSION);
--
1.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 2/6] Import a simple queue implementation from NetBSD
2009-11-26 18:44 ` [Qemu-devel] [PATCH 1/6] Fix coding style Pierre Riteau
@ 2009-11-26 18:44 ` Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 3/6] Switch block migration lists to QSIMPLEQ Pierre Riteau
0 siblings, 1 reply; 7+ messages in thread
From: Pierre Riteau @ 2009-11-26 18:44 UTC (permalink / raw)
To: Liran Schour, qemu-devel; +Cc: Pierre Riteau
Signed-off-by: Pierre Riteau <Pierre.Riteau@irisa.fr>
---
qemu-queue.h | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 105 insertions(+), 4 deletions(-)
diff --git a/qemu-queue.h b/qemu-queue.h
index 8877efd..1d07745 100644
--- a/qemu-queue.h
+++ b/qemu-queue.h
@@ -1,8 +1,9 @@
-/* $NetBSD: queue.h,v 1.45.14.1 2007/07/18 20:13:24 liamjfoy Exp $ */
+/* $NetBSD: queue.h,v 1.52 2009/04/20 09:56:08 mschuett Exp $ */
/*
* Qemu version: Copy from netbsd, removed debug code, removed some of
- * the implementations. Left in lists, tail queues and circular queues.
+ * the implementations. Left in lists, simple queues, tail queues and
+ * circular queues.
*/
/*
@@ -40,8 +41,8 @@
#define QEMU_SYS_QUEUE_H_
/*
- * This file defines three types of data structures:
- * lists, tail queues, and circular queues.
+ * This file defines four types of data structures:
+ * lists, simple queues, tail queues, and circular queues.
*
* A list is headed by a single forward pointer (or an array of forward
* pointers for a hash table header). The elements are doubly linked
@@ -50,6 +51,13 @@
* or after an existing element or at the head of the list. A list
* may only be traversed in the forward direction.
*
+ * A simple queue is headed by a pair of pointers, one the head of the
+ * list and the other to the tail of the list. The elements are singly
+ * linked to save space, so elements can only be removed from the
+ * head of the list. New elements can be added to the list after
+ * an existing element, at the head of the list, or at the end of the
+ * list. A simple queue may only be traversed in the forward direction.
+ *
* A tail queue is headed by a pair of pointers, one to the head of the
* list and the other to the tail of the list. The elements are doubly
* linked so that an arbitrary element can be removed without a need to
@@ -140,6 +148,99 @@ struct { \
/*
+ * Simple queue definitions.
+ */
+#define QSIMPLEQ_HEAD(name, type) \
+struct name { \
+ struct type *sqh_first; /* first element */ \
+ struct type **sqh_last; /* addr of last next element */ \
+}
+
+#define QSIMPLEQ_HEAD_INITIALIZER(head) \
+ { NULL, &(head).sqh_first }
+
+#define QSIMPLEQ_ENTRY(type) \
+struct { \
+ struct type *sqe_next; /* next element */ \
+}
+
+/*
+ * Simple queue functions.
+ */
+#define QSIMPLEQ_INIT(head) do { \
+ (head)->sqh_first = NULL; \
+ (head)->sqh_last = &(head)->sqh_first; \
+} while (/*CONSTCOND*/0)
+
+#define QSIMPLEQ_INSERT_HEAD(head, elm, field) do { \
+ if (((elm)->field.sqe_next = (head)->sqh_first) == NULL) \
+ (head)->sqh_last = &(elm)->field.sqe_next; \
+ (head)->sqh_first = (elm); \
+} while (/*CONSTCOND*/0)
+
+#define QSIMPLEQ_INSERT_TAIL(head, elm, field) do { \
+ (elm)->field.sqe_next = NULL; \
+ *(head)->sqh_last = (elm); \
+ (head)->sqh_last = &(elm)->field.sqe_next; \
+} while (/*CONSTCOND*/0)
+
+#define QSIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do { \
+ if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL) \
+ (head)->sqh_last = &(elm)->field.sqe_next; \
+ (listelm)->field.sqe_next = (elm); \
+} while (/*CONSTCOND*/0)
+
+#define QSIMPLEQ_REMOVE_HEAD(head, field) do { \
+ if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL)\
+ (head)->sqh_last = &(head)->sqh_first; \
+} while (/*CONSTCOND*/0)
+
+#define QSIMPLEQ_REMOVE(head, elm, type, field) do { \
+ if ((head)->sqh_first == (elm)) { \
+ QSIMPLEQ_REMOVE_HEAD((head), field); \
+ } else { \
+ struct type *curelm = (head)->sqh_first; \
+ while (curelm->field.sqe_next != (elm)) \
+ curelm = curelm->field.sqe_next; \
+ if ((curelm->field.sqe_next = \
+ curelm->field.sqe_next->field.sqe_next) == NULL) \
+ (head)->sqh_last = &(curelm)->field.sqe_next; \
+ } \
+} while (/*CONSTCOND*/0)
+
+#define QSIMPLEQ_FOREACH(var, head, field) \
+ for ((var) = ((head)->sqh_first); \
+ (var); \
+ (var) = ((var)->field.sqe_next))
+
+#define QSIMPLEQ_FOREACH_SAFE(var, head, field, next) \
+ for ((var) = ((head)->sqh_first); \
+ (var) && ((next = ((var)->field.sqe_next)), 1); \
+ (var) = (next))
+
+#define QSIMPLEQ_CONCAT(head1, head2) do { \
+ if (!QSIMPLEQ_EMPTY((head2))) { \
+ *(head1)->sqh_last = (head2)->sqh_first; \
+ (head1)->sqh_last = (head2)->sqh_last; \
+ QSIMPLEQ_INIT((head2)); \
+ } \
+} while (/*CONSTCOND*/0)
+
+#define QSIMPLEQ_LAST(head, type, field) \
+ (QSIMPLEQ_EMPTY((head)) ? \
+ NULL : \
+ ((struct type *)(void *) \
+ ((char *)((head)->sqh_last) - offsetof(struct type, field))))
+
+/*
+ * Simple queue access methods.
+ */
+#define QSIMPLEQ_EMPTY(head) ((head)->sqh_first == NULL)
+#define QSIMPLEQ_FIRST(head) ((head)->sqh_first)
+#define QSIMPLEQ_NEXT(elm, field) ((elm)->field.sqe_next)
+
+
+/*
* Tail queue definitions.
*/
#define Q_TAILQ_HEAD(name, type, qual) \
--
1.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 3/6] Switch block migration lists to QSIMPLEQ
2009-11-26 18:44 ` [Qemu-devel] [PATCH 2/6] Import a simple queue implementation from NetBSD Pierre Riteau
@ 2009-11-26 18:44 ` Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 4/6] Fix compilation with DEBUG_BLK_MIGRATION, and improve debug messages Pierre Riteau
0 siblings, 1 reply; 7+ messages in thread
From: Pierre Riteau @ 2009-11-26 18:44 UTC (permalink / raw)
To: Liran Schour, qemu-devel; +Cc: Pierre Riteau
Signed-off-by: Pierre Riteau <Pierre.Riteau@irisa.fr>
---
block-migration.c | 53 +++++++++++++++++++----------------------------------
block-migration.h | 2 +-
2 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index 0cb162a..1626168 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -14,6 +14,7 @@
#include "qemu-common.h"
#include "block_int.h"
#include "hw/hw.h"
+#include "qemu-queue.h"
#include "block-migration.h"
#include <assert.h>
@@ -49,7 +50,7 @@ typedef struct BlkMigBlock {
QEMUIOVector qiov;
BlockDriverAIOCB *aiocb;
int ret;
- struct BlkMigBlock *next;
+ QSIMPLEQ_ENTRY(BlkMigBlock) entries;
} BlkMigBlock;
typedef struct BlkMigState {
@@ -58,10 +59,9 @@ typedef struct BlkMigState {
int shared_base;
int no_dirty;
QEMUFile *load_file;
- BlkMigDevState *bmds_first;
+ QSIMPLEQ_HEAD(, BlkMigDevState) bmds_list;
int sectors_per_block;
- BlkMigBlock *first_blk;
- BlkMigBlock *last_blk;
+ QSIMPLEQ_HEAD(, BlkMigBlock) block_list;
int submitted;
int read_done;
int transferred;
@@ -76,14 +76,7 @@ static void blk_mig_read_cb(void *opaque, int ret)
blk->ret = ret;
- /* insert at the end */
- if (block_mig_state->last_blk == NULL) {
- block_mig_state->first_blk = blk;
- block_mig_state->last_blk = blk;
- } else {
- block_mig_state->last_blk->next = blk;
- block_mig_state->last_blk = blk;
- }
+ QSIMPLEQ_INSERT_TAIL(&block_mig_state->block_list, blk, entries);
block_mig_state->submitted--;
block_mig_state->read_done++;
@@ -139,7 +132,6 @@ static int mig_read_device_bulk(QEMUFile *f, BlkMigDevState *bms)
bms->cur_sector = cur_sector + nr_sectors;
blk->sector = cur_sector;
blk->bmds = bms;
- blk->next = NULL;
blk->iov.iov_base = blk->buf;
blk->iov.iov_len = nr_sectors * SECTOR_SIZE;
@@ -247,7 +239,7 @@ static void blk_mig_save_dev_info(QEMUFile *f, BlkMigDevState *bmds)
static void set_dirty_tracking(int enable)
{
BlkMigDevState *bmds;
- for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) {
+ QSIMPLEQ_FOREACH(bmds, &block_mig_state->bmds_list, entries) {
bdrv_set_dirty_tracking(bmds->bs, enable);
}
@@ -256,7 +248,7 @@ static void set_dirty_tracking(int enable)
static void init_blk_migration(QEMUFile *f)
{
- BlkMigDevState **pbmds, *bmds;
+ BlkMigDevState *bmds;
BlockDriverState *bs;
for (bs = bdrv_first; bs != NULL; bs = bs->next) {
@@ -274,13 +266,7 @@ static void init_blk_migration(QEMUFile *f)
printf("Start full migration for %s\n", bs->device_name);
}
- /* insert at the end */
- pbmds = &block_mig_state->bmds_first;
- while (*pbmds != NULL) {
- pbmds = &(*pbmds)->next;
- }
- *pbmds = bmds;
-
+ QSIMPLEQ_INSERT_TAIL(&block_mig_state->bmds_list, bmds, entries);
blk_mig_save_dev_info(f, bmds);
}
}
@@ -294,7 +280,7 @@ static int blk_mig_save_bulked_block(QEMUFile *f, int is_async)
{
BlkMigDevState *bmds;
- for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) {
+ QSIMPLEQ_FOREACH(bmds, &block_mig_state->bmds_list, entries) {
if (bmds->bulk_completed == 0) {
if (is_async) {
if (mig_read_device_bulk(f, bmds) == 1) {
@@ -326,7 +312,7 @@ static void blk_mig_save_dirty_blocks(QEMUFile *f)
int64_t sector;
int len;
- for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) {
+ QSIMPLEQ_FOREACH(bmds, &block_mig_state->bmds_list, entries) {
for (sector = 0; sector < bmds->cur_sector;) {
if (bdrv_get_dirty(bmds->bs, sector)) {
@@ -364,27 +350,24 @@ static void blk_mig_save_dirty_blocks(QEMUFile *f)
static void flush_blks(QEMUFile* f)
{
- BlkMigBlock *blk, *tmp;
+ BlkMigBlock *blk;
dprintf("%s Enter submitted %d read_done %d transfered\n", __FUNCTION__,
submitted, read_done, transfered);
- for (blk = block_mig_state->first_blk;
- blk != NULL && !qemu_file_rate_limit(f); blk = tmp) {
+ while ((blk = QSIMPLEQ_FIRST(&block_mig_state->block_list)) != NULL) {
send_blk(f, blk);
- tmp = blk->next;
+ QSIMPLEQ_REMOVE_HEAD(&block_mig_state->block_list, entries);
qemu_free(blk->buf);
qemu_free(blk);
block_mig_state->read_done--;
block_mig_state->transferred++;
assert(block_mig_state->read_done >= 0);
- }
- block_mig_state->first_blk = blk;
-
- if (block_mig_state->first_blk == NULL) {
- block_mig_state->last_blk = NULL;
+ if (qemu_file_rate_limit(f)) {
+ break;
+ }
}
dprintf("%s Exit submitted %d read_done %d transferred%d\n", __FUNCTION__,
@@ -402,7 +385,7 @@ static int is_stage2_completed(void)
return 0;
}
- for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) {
+ QSIMPLEQ_FOREACH(bmds, &block_mig_state->bmds_list, entries) {
if (bmds->bulk_completed == 0) {
return 0;
}
@@ -541,6 +524,8 @@ void blk_mig_info(void)
void blk_mig_init(void)
{
block_mig_state = qemu_mallocz(sizeof(BlkMigState));
+ QSIMPLEQ_INIT(&block_mig_state->block_list);
+ QSIMPLEQ_INIT(&block_mig_state->bmds_list);
register_savevm_live("block", 0, 1, block_set_params, block_save_live,
NULL, block_load, block_mig_state);
diff --git a/block-migration.h b/block-migration.h
index 9961abd..2d6a3cc 100644
--- a/block-migration.h
+++ b/block-migration.h
@@ -18,7 +18,7 @@ typedef struct BlkMigDevState {
BlockDriverState *bs;
int bulk_completed;
int shared_base;
- struct BlkMigDevState *next;
+ QSIMPLEQ_ENTRY(BlkMigDevState) entries;
int64_t cur_sector;
int64_t total_sectors;
int64_t dirty;
--
1.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 4/6] Fix compilation with DEBUG_BLK_MIGRATION, and improve debug messages
2009-11-26 18:44 ` [Qemu-devel] [PATCH 3/6] Switch block migration lists to QSIMPLEQ Pierre Riteau
@ 2009-11-26 18:44 ` Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 5/6] Remove duplicated code Pierre Riteau
0 siblings, 1 reply; 7+ messages in thread
From: Pierre Riteau @ 2009-11-26 18:44 UTC (permalink / raw)
To: Liran Schour, qemu-devel; +Cc: Pierre Riteau
Signed-off-by: Pierre Riteau <Pierre.Riteau@irisa.fr>
---
block-migration.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index 1626168..aff4c20 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -352,8 +352,9 @@ static void flush_blks(QEMUFile* f)
{
BlkMigBlock *blk;
- dprintf("%s Enter submitted %d read_done %d transfered\n", __FUNCTION__,
- submitted, read_done, transfered);
+ dprintf("Enter %s submitted %d read_done %d transferred %d\n", __FUNCTION__,
+ block_mig_state->submitted, block_mig_state->read_done,
+ block_mig_state->transferred);
while ((blk = QSIMPLEQ_FIRST(&block_mig_state->block_list)) != NULL) {
send_blk(f, blk);
@@ -370,7 +371,7 @@ static void flush_blks(QEMUFile* f)
}
}
- dprintf("%s Exit submitted %d read_done %d transferred%d\n", __FUNCTION__,
+ dprintf("Exit %s submitted %d read_done %d transferred %d\n", __FUNCTION__,
block_mig_state->submitted, block_mig_state->read_done,
block_mig_state->transferred);
@@ -398,8 +399,9 @@ static int block_save_live(QEMUFile *f, int stage, void *opaque)
{
int ret = 1;
- dprintf("Enter save live stage %d submitted %d transferred %d\n", stage,
- submitted, transferred);
+ dprintf("Enter %s stage %d submitted %d read_done %d transferred %d\n",
+ __FUNCTION__, stage, block_mig_state->submitted,
+ block_mig_state->read_done, block_mig_state->transferred);
if (block_mig_state->blk_enable != 1) {
/* no need to migrate storage */
--
1.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 5/6] Remove duplicated code
2009-11-26 18:44 ` [Qemu-devel] [PATCH 4/6] Fix compilation with DEBUG_BLK_MIGRATION, and improve debug messages Pierre Riteau
@ 2009-11-26 18:44 ` Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 6/6] Merge mig_save_device_bulk and mig_read_device_bulk Pierre Riteau
0 siblings, 1 reply; 7+ messages in thread
From: Pierre Riteau @ 2009-11-26 18:44 UTC (permalink / raw)
To: Liran Schour, qemu-devel; +Cc: Pierre Riteau
Signed-off-by: Pierre Riteau <Pierre.Riteau@irisa.fr>
---
block-migration.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index aff4c20..e09db78 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -313,7 +313,8 @@ static void blk_mig_save_dirty_blocks(QEMUFile *f)
int len;
QSIMPLEQ_FOREACH(bmds, &block_mig_state->bmds_list, entries) {
- for (sector = 0; sector < bmds->cur_sector;) {
+ for (sector = 0; sector < bmds->cur_sector;
+ sector += block_mig_state->sectors_per_block) {
if (bdrv_get_dirty(bmds->bs, sector)) {
@@ -337,10 +338,6 @@ static void blk_mig_save_dirty_blocks(QEMUFile *f)
bdrv_reset_dirty(bmds->bs, sector,
block_mig_state->sectors_per_block);
- sector += block_mig_state->sectors_per_block;
- } else {
- /* sector is clean */
- sector += block_mig_state->sectors_per_block;
}
}
}
--
1.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 6/6] Merge mig_save_device_bulk and mig_read_device_bulk
2009-11-26 18:44 ` [Qemu-devel] [PATCH 5/6] Remove duplicated code Pierre Riteau
@ 2009-11-26 18:44 ` Pierre Riteau
0 siblings, 0 replies; 7+ messages in thread
From: Pierre Riteau @ 2009-11-26 18:44 UTC (permalink / raw)
To: Liran Schour, qemu-devel; +Cc: Pierre Riteau
Signed-off-by: Pierre Riteau <Pierre.Riteau@irisa.fr>
---
block-migration.c | 138 ++++++++++++++++------------------------------------
1 files changed, 43 insertions(+), 95 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index e09db78..558890b 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -85,83 +85,12 @@ static void blk_mig_read_cb(void *opaque, int ret)
return;
}
-static int mig_read_device_bulk(QEMUFile *f, BlkMigDevState *bms)
+static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds, int is_async)
{
int nr_sectors;
- int64_t total_sectors, cur_sector = 0;
- BlockDriverState *bs = bms->bs;
- BlkMigBlock *blk;
-
- blk = qemu_malloc(sizeof(BlkMigBlock));
- blk->buf = qemu_malloc(BLOCK_SIZE);
-
- cur_sector = bms->cur_sector;
- total_sectors = bdrv_getlength(bs) >> SECTOR_BITS;
-
- if (bms->shared_base) {
- while (cur_sector < bms->total_sectors &&
- !bdrv_is_allocated(bms->bs, cur_sector,
- MAX_IS_ALLOCATED_SEARCH, &nr_sectors)) {
- cur_sector += nr_sectors;
- }
- }
-
- if (cur_sector >= total_sectors) {
- bms->cur_sector = total_sectors;
- qemu_free(blk->buf);
- qemu_free(blk);
- return 1;
- }
-
- if (cur_sector >= block_mig_state->print_completion) {
- printf("Completed %" PRId64 " %%\r", cur_sector * 100 / total_sectors);
- fflush(stdout);
- block_mig_state->print_completion +=
- (block_mig_state->sectors_per_block * 10000);
- }
-
- /* we going to transfer BLOCK_SIZE any way even if it is not allocated */
- nr_sectors = block_mig_state->sectors_per_block;
-
- cur_sector &= ~((int64_t)block_mig_state->sectors_per_block - 1);
-
- if (total_sectors - cur_sector < block_mig_state->sectors_per_block) {
- nr_sectors = (total_sectors - cur_sector);
- }
-
- bms->cur_sector = cur_sector + nr_sectors;
- blk->sector = cur_sector;
- blk->bmds = bms;
-
- blk->iov.iov_base = blk->buf;
- blk->iov.iov_len = nr_sectors * SECTOR_SIZE;
- qemu_iovec_init_external(&blk->qiov, &blk->iov, 1);
-
- blk->aiocb = bdrv_aio_readv(bs, cur_sector, &blk->qiov,
- nr_sectors, blk_mig_read_cb, blk);
-
- if (!blk->aiocb) {
- printf("Error reading sector %" PRId64 "\n", cur_sector);
- qemu_free(blk->buf);
- qemu_free(blk);
- return 0;
- }
-
- bdrv_reset_dirty(bms->bs, cur_sector, nr_sectors);
- block_mig_state->submitted++;
-
- return (bms->cur_sector >= total_sectors);
-}
-
-static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds)
-{
- int len, nr_sectors;
int64_t total_sectors = bmds->total_sectors, cur_sector = 0;
- uint8_t *tmp_buf = NULL;
BlockDriverState *bs = bmds->bs;
- tmp_buf = qemu_malloc(BLOCK_SIZE);
-
cur_sector = bmds->cur_sector;
if (bmds->shared_base) {
@@ -174,7 +103,6 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds)
if (cur_sector >= total_sectors) {
bmds->cur_sector = total_sectors;
- qemu_free(tmp_buf);
return 1;
}
@@ -194,24 +122,51 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds)
nr_sectors = (total_sectors - cur_sector);
}
- if (bdrv_read(bs, cur_sector, tmp_buf, nr_sectors) < 0) {
- printf("Error reading sector %" PRId64 "\n", cur_sector);
- }
-
bdrv_reset_dirty(bs, cur_sector, nr_sectors);
- /* Device name */
- qemu_put_be64(f, (cur_sector << SECTOR_BITS) | BLK_MIG_FLAG_DEVICE_BLOCK);
+ if (is_async) {
+ BlkMigBlock *blk = qemu_malloc(sizeof(BlkMigBlock));
+ blk->buf = qemu_malloc(BLOCK_SIZE);
- len = strlen(bs->device_name);
- qemu_put_byte(f, len);
- qemu_put_buffer(f, (uint8_t *)bs->device_name, len);
+ blk->sector = cur_sector;
+ blk->bmds = bmds;
+
+ blk->iov.iov_base = blk->buf;
+ blk->iov.iov_len = nr_sectors * SECTOR_SIZE;
+ qemu_iovec_init_external(&blk->qiov, &blk->iov, 1);
+
+ blk->aiocb = bdrv_aio_readv(bs, cur_sector, &blk->qiov,
+ nr_sectors, blk_mig_read_cb, blk);
+
+ if (!blk->aiocb) {
+ printf("Error reading sector %" PRId64 "\n", cur_sector);
+ qemu_free(blk->buf);
+ qemu_free(blk);
+ return 0;
+ }
+
+ block_mig_state->submitted++;
+ } else {
+ int len;
+ uint8_t *tmp_buf = qemu_malloc(BLOCK_SIZE);
+
+ if (bdrv_read(bs, cur_sector, tmp_buf, nr_sectors) < 0) {
+ printf("Error reading sector %" PRId64 "\n", cur_sector);
+ }
+
+ /* Device name */
+ qemu_put_be64(f, (cur_sector << SECTOR_BITS) | BLK_MIG_FLAG_DEVICE_BLOCK);
- qemu_put_buffer(f, tmp_buf, BLOCK_SIZE);
+ len = strlen(bs->device_name);
+ qemu_put_byte(f, len);
+ qemu_put_buffer(f, (uint8_t *)bs->device_name, len);
- bmds->cur_sector = cur_sector + block_mig_state->sectors_per_block;
+ qemu_put_buffer(f, tmp_buf, BLOCK_SIZE);
+
+ qemu_free(tmp_buf);
+ }
- qemu_free(tmp_buf);
+ bmds->cur_sector = cur_sector + nr_sectors;
return (bmds->cur_sector >= total_sectors);
}
@@ -282,16 +237,9 @@ static int blk_mig_save_bulked_block(QEMUFile *f, int is_async)
QSIMPLEQ_FOREACH(bmds, &block_mig_state->bmds_list, entries) {
if (bmds->bulk_completed == 0) {
- if (is_async) {
- if (mig_read_device_bulk(f, bmds) == 1) {
- /* completed bulk section for this device */
- bmds->bulk_completed = 1;
- }
- } else {
- if (mig_save_device_bulk(f, bmds) == 1) {
- /* completed bulk section for this device */
- bmds->bulk_completed = 1;
- }
+ if (mig_save_device_bulk(f, bmds, is_async) == 1) {
+ /* completed bulk section for this device */
+ bmds->bulk_completed = 1;
}
return 1;
}
--
1.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-11-26 18:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-26 18:44 [Qemu-devel] [PATCH 0/6] block-migration: Various cleanups Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 1/6] Fix coding style Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 2/6] Import a simple queue implementation from NetBSD Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 3/6] Switch block migration lists to QSIMPLEQ Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 4/6] Fix compilation with DEBUG_BLK_MIGRATION, and improve debug messages Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 5/6] Remove duplicated code Pierre Riteau
2009-11-26 18:44 ` [Qemu-devel] [PATCH 6/6] Merge mig_save_device_bulk and mig_read_device_bulk Pierre Riteau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).