OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Purge migration of (almost) everything to do with monitors 

The Monitor object is passed back and forth within the migration/savevm
code so that it can print errors and progress to the user.

However, that approach assumes a HMP monitor, being completely invalid
in QMP.

This commit drops almost every single usage of the Monitor object, all
monitor_printf() calls have been converted into DPRINTF() ones.

There are a few remaining Monitor objects, those are going to be dropped
by the next commit.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2011-12-05 14:06:56 -02:00
parent 79020cfcbb
commit 539de1246d
7 changed files with 50 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch_init.c
View File

@ -260,7 +260,7 @@ static void sort_ram_list(void)
g_free(blocks); g_free(blocks);
} }
int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) int ram_save_live(QEMUFile *f, int stage, void *opaque)
{ {
ram_addr_t addr; ram_addr_t addr;
uint64_t bytes_transferred_last; uint64_t bytes_transferred_last;

58
block-migration.c
View File

@ -18,7 +18,6 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "qemu-queue.h" #include "qemu-queue.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "monitor.h"
#include "block-migration.h" #include "block-migration.h"
#include "migration.h" #include "migration.h"
#include "blockdev.h" #include "blockdev.h"
@ -204,8 +203,7 @@ static void blk_mig_read_cb(void *opaque, int ret)
assert(block_mig_state.submitted >= 0); assert(block_mig_state.submitted >= 0);
} }
static int mig_save_device_bulk(Monitor *mon, QEMUFile *f, static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds)
BlkMigDevState *bmds)
{ {
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;
@ -272,7 +270,6 @@ static void set_dirty_tracking(int enable)
static void init_blk_migration_it(void *opaque, BlockDriverState *bs) static void init_blk_migration_it(void *opaque, BlockDriverState *bs)
{ {
Monitor *mon = opaque;
BlkMigDevState *bmds; BlkMigDevState *bmds;
int64_t sectors; int64_t sectors;
@ -295,19 +292,17 @@ static void init_blk_migration_it(void *opaque, BlockDriverState *bs)
block_mig_state.total_sector_sum += sectors; block_mig_state.total_sector_sum += sectors;
if (bmds->shared_base) { if (bmds->shared_base) {
monitor_printf(mon, "Start migration for %s with shared base " DPRINTF("Start migration for %s with shared base image\n",
"image\n", bs->device_name);
bs->device_name);
} else { } else {
monitor_printf(mon, "Start full migration for %s\n", DPRINTF("Start full migration for %s\n", bs->device_name);
bs->device_name);
} }
QSIMPLEQ_INSERT_TAIL(&block_mig_state.bmds_list, bmds, entry); QSIMPLEQ_INSERT_TAIL(&block_mig_state.bmds_list, bmds, entry);
} }
} }
static void init_blk_migration(Monitor *mon, QEMUFile *f) static void init_blk_migration(QEMUFile *f)
{ {
block_mig_state.submitted = 0; block_mig_state.submitted = 0;
block_mig_state.read_done = 0; block_mig_state.read_done = 0;
@ -318,10 +313,10 @@ static void init_blk_migration(Monitor *mon, QEMUFile *f)
block_mig_state.total_time = 0; block_mig_state.total_time = 0;
block_mig_state.reads = 0; block_mig_state.reads = 0;
bdrv_iterate(init_blk_migration_it, mon); bdrv_iterate(init_blk_migration_it, NULL);
} }
static int blk_mig_save_bulked_block(Monitor *mon, QEMUFile *f) static int blk_mig_save_bulked_block(QEMUFile *f)
{ {
int64_t completed_sector_sum = 0; int64_t completed_sector_sum = 0;
BlkMigDevState *bmds; BlkMigDevState *bmds;
@ -330,7 +325,7 @@ static int blk_mig_save_bulked_block(Monitor *mon, QEMUFile *f)
QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) { QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
if (bmds->bulk_completed == 0) { if (bmds->bulk_completed == 0) {
if (mig_save_device_bulk(mon, f, bmds) == 1) { if (mig_save_device_bulk(f, bmds) == 1) {
/* completed bulk section for this device */ /* completed bulk section for this device */
bmds->bulk_completed = 1; bmds->bulk_completed = 1;
} }
@ -352,8 +347,7 @@ static int blk_mig_save_bulked_block(Monitor *mon, QEMUFile *f)
block_mig_state.prev_progress = progress; block_mig_state.prev_progress = progress;
qemu_put_be64(f, (progress << BDRV_SECTOR_BITS) qemu_put_be64(f, (progress << BDRV_SECTOR_BITS)
| BLK_MIG_FLAG_PROGRESS); | BLK_MIG_FLAG_PROGRESS);
monitor_printf(mon, "Completed %d %%\r", progress); DPRINTF("Completed %d %%\r", progress);
monitor_flush(mon);
} }
return ret; return ret;
@ -368,8 +362,8 @@ static void blk_mig_reset_dirty_cursor(void)
} }
} }
static int mig_save_device_dirty(Monitor *mon, QEMUFile *f, static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds,
BlkMigDevState *bmds, int is_async) int is_async)
{ {
BlkMigBlock *blk; BlkMigBlock *blk;
int64_t total_sectors = bmds->total_sectors; int64_t total_sectors = bmds->total_sectors;
@ -428,20 +422,20 @@ static int mig_save_device_dirty(Monitor *mon, QEMUFile *f,
return (bmds->cur_dirty >= bmds->total_sectors); return (bmds->cur_dirty >= bmds->total_sectors);
error: error:
monitor_printf(mon, "Error reading sector %" PRId64 "\n", sector); DPRINTF("Error reading sector %" PRId64 "\n", sector);
qemu_file_set_error(f, ret); qemu_file_set_error(f, ret);
g_free(blk->buf); g_free(blk->buf);
g_free(blk); g_free(blk);
return 0; return 0;
} }
static int blk_mig_save_dirty_block(Monitor *mon, QEMUFile *f, int is_async) static int blk_mig_save_dirty_block(QEMUFile *f, int is_async)
{ {
BlkMigDevState *bmds; BlkMigDevState *bmds;
int ret = 0; int ret = 0;
QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) { QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
if (mig_save_device_dirty(mon, f, bmds, is_async) == 0) { if (mig_save_device_dirty(f, bmds, is_async) == 0) {
ret = 1; ret = 1;
break; break;
} }
@ -520,7 +514,7 @@ static int is_stage2_completed(void)
return 0; return 0;
} }
static void blk_mig_cleanup(Monitor *mon) static void blk_mig_cleanup(void)
{ {
BlkMigDevState *bmds; BlkMigDevState *bmds;
BlkMigBlock *blk; BlkMigBlock *blk;
@ -540,11 +534,9 @@ static void blk_mig_cleanup(Monitor *mon)
g_free(blk->buf); g_free(blk->buf);
g_free(blk); g_free(blk);
} }
monitor_printf(mon, "\n");
} }
static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) static int block_save_live(QEMUFile *f, int stage, void *opaque)
{ {
int ret; int ret;
@ -552,7 +544,7 @@ static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
stage, block_mig_state.submitted, block_mig_state.transferred); stage, block_mig_state.submitted, block_mig_state.transferred);
if (stage < 0) { if (stage < 0) {
blk_mig_cleanup(mon); blk_mig_cleanup();
return 0; return 0;
} }
@ -563,7 +555,7 @@ static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
} }
if (stage == 1) { if (stage == 1) {
init_blk_migration(mon, f); init_blk_migration(f);
/* start track dirty blocks */ /* start track dirty blocks */
set_dirty_tracking(1); set_dirty_tracking(1);
@ -573,7 +565,7 @@ static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
if (ret) { if (ret) {
blk_mig_cleanup(mon); blk_mig_cleanup();
return ret; return ret;
} }
@ -586,12 +578,12 @@ static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
qemu_file_get_rate_limit(f)) { qemu_file_get_rate_limit(f)) {
if (block_mig_state.bulk_completed == 0) { if (block_mig_state.bulk_completed == 0) {
/* first finish the bulk phase */ /* first finish the bulk phase */
if (blk_mig_save_bulked_block(mon, f) == 0) { if (blk_mig_save_bulked_block(f) == 0) {
/* finished saving bulk on all devices */ /* finished saving bulk on all devices */
block_mig_state.bulk_completed = 1; block_mig_state.bulk_completed = 1;
} }
} else { } else {
if (blk_mig_save_dirty_block(mon, f, 1) == 0) { if (blk_mig_save_dirty_block(f, 1) == 0) {
/* no more dirty blocks */ /* no more dirty blocks */
break; break;
} }
@ -602,7 +594,7 @@ static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
if (ret) { if (ret) {
blk_mig_cleanup(mon); blk_mig_cleanup();
return ret; return ret;
} }
} }
@ -612,8 +604,8 @@ static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
all async read completed */ all async read completed */
assert(block_mig_state.submitted == 0); assert(block_mig_state.submitted == 0);
while (blk_mig_save_dirty_block(mon, f, 0) != 0); while (blk_mig_save_dirty_block(f, 0) != 0);
blk_mig_cleanup(mon); blk_mig_cleanup();
/* report completion */ /* report completion */
qemu_put_be64(f, (100 << BDRV_SECTOR_BITS) | BLK_MIG_FLAG_PROGRESS); qemu_put_be64(f, (100 << BDRV_SECTOR_BITS) | BLK_MIG_FLAG_PROGRESS);
@ -623,7 +615,7 @@ static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
return ret; return ret;
} }
monitor_printf(mon, "Block migration completed\n"); DPRINTF("Block migration completed\n");
} }
qemu_put_be64(f, BLK_MIG_FLAG_EOS); qemu_put_be64(f, BLK_MIG_FLAG_EOS);

8
migration.c
View File

@ -258,7 +258,7 @@ static void migrate_fd_put_ready(void *opaque)
} }
DPRINTF("iterate\n"); DPRINTF("iterate\n");
ret = qemu_savevm_state_iterate(s->mon, s->file); ret = qemu_savevm_state_iterate(s->file);
if (ret < 0) { if (ret < 0) {
migrate_fd_error(s); migrate_fd_error(s);
} else if (ret == 1) { } else if (ret == 1) {
@ -267,7 +267,7 @@ static void migrate_fd_put_ready(void *opaque)
DPRINTF("done iterating\n"); DPRINTF("done iterating\n");
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
if (qemu_savevm_state_complete(s->mon, s->file) < 0) { if (qemu_savevm_state_complete(s->file) < 0) {
migrate_fd_error(s); migrate_fd_error(s);
} else { } else {
migrate_fd_completed(s); migrate_fd_completed(s);
@ -289,7 +289,7 @@ static void migrate_fd_cancel(MigrationState *s)
s->state = MIG_STATE_CANCELLED; s->state = MIG_STATE_CANCELLED;
notifier_list_notify(&migration_state_notifiers, s); notifier_list_notify(&migration_state_notifiers, s);
qemu_savevm_state_cancel(s->mon, s->file); qemu_savevm_state_cancel(s->file);
migrate_fd_cleanup(s); migrate_fd_cleanup(s);
} }
@ -367,7 +367,7 @@ void migrate_fd_connect(MigrationState *s)
migrate_fd_close); migrate_fd_close);
DPRINTF("beginning savevm\n"); DPRINTF("beginning savevm\n");
ret = qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shared); ret = qemu_savevm_state_begin(s->file, s->blk, s->shared);
if (ret < 0) { if (ret < 0) {
DPRINTF("failed, %d\n", ret); DPRINTF("failed, %d\n", ret);
migrate_fd_error(s); migrate_fd_error(s);

2
migration.h
View File

@ -78,7 +78,7 @@ uint64_t ram_bytes_remaining(void);
uint64_t ram_bytes_transferred(void); uint64_t ram_bytes_transferred(void);
uint64_t ram_bytes_total(void); uint64_t ram_bytes_total(void);
int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque); int ram_save_live(QEMUFile *f, int stage, void *opaque);
int ram_load(QEMUFile *f, void *opaque, int version_id); int ram_load(QEMUFile *f, void *opaque, int version_id);
/** /**

29
savevm.c
View File

@ -1554,8 +1554,7 @@ bool qemu_savevm_state_blocked(Monitor *mon)
return false; return false;
} }
int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, int qemu_savevm_state_begin(QEMUFile *f, int blk_enable, int shared)
int shared)
{ {
SaveStateEntry *se; SaveStateEntry *se;
int ret; int ret;
@ -1588,15 +1587,15 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable,
qemu_put_be32(f, se->instance_id); qemu_put_be32(f, se->instance_id);
qemu_put_be32(f, se->version_id); qemu_put_be32(f, se->version_id);
ret = se->save_live_state(mon, f, QEMU_VM_SECTION_START, se->opaque); ret = se->save_live_state(f, QEMU_VM_SECTION_START, se->opaque);
if (ret < 0) { if (ret < 0) {
qemu_savevm_state_cancel(mon, f); qemu_savevm_state_cancel(f);
return ret; return ret;
} }
} }
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
if (ret != 0) { if (ret != 0) {
qemu_savevm_state_cancel(mon, f); qemu_savevm_state_cancel(f);
} }
return ret; return ret;
@ -1609,7 +1608,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable,
* 0 : We haven't finished, caller have to go again * 0 : We haven't finished, caller have to go again
* 1 : We have finished, we can go to complete phase * 1 : We have finished, we can go to complete phase
*/ */
int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f) int qemu_savevm_state_iterate(QEMUFile *f)
{ {
SaveStateEntry *se; SaveStateEntry *se;
int ret = 1; int ret = 1;
@ -1622,7 +1621,7 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f)
qemu_put_byte(f, QEMU_VM_SECTION_PART); qemu_put_byte(f, QEMU_VM_SECTION_PART);
qemu_put_be32(f, se->section_id); qemu_put_be32(f, se->section_id);
ret = se->save_live_state(mon, f, QEMU_VM_SECTION_PART, se->opaque); ret = se->save_live_state(f, QEMU_VM_SECTION_PART, se->opaque);
if (ret <= 0) { if (ret <= 0) {
/* Do not proceed to the next vmstate before this one reported /* Do not proceed to the next vmstate before this one reported
completion of the current stage. This serializes the migration completion of the current stage. This serializes the migration
@ -1636,12 +1635,12 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f)
} }
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
if (ret != 0) { if (ret != 0) {
qemu_savevm_state_cancel(mon, f); qemu_savevm_state_cancel(f);
} }
return ret; return ret;
} }
int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) int qemu_savevm_state_complete(QEMUFile *f)
{ {
SaveStateEntry *se; SaveStateEntry *se;
int ret; int ret;
@ -1656,7 +1655,7 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f)
qemu_put_byte(f, QEMU_VM_SECTION_END); qemu_put_byte(f, QEMU_VM_SECTION_END);
qemu_put_be32(f, se->section_id); qemu_put_be32(f, se->section_id);
ret = se->save_live_state(mon, f, QEMU_VM_SECTION_END, se->opaque); ret = se->save_live_state(f, QEMU_VM_SECTION_END, se->opaque);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -1688,13 +1687,13 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f)
return qemu_file_get_error(f); return qemu_file_get_error(f);
} }
void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f) void qemu_savevm_state_cancel(QEMUFile *f)
{ {
SaveStateEntry *se; SaveStateEntry *se;
QTAILQ_FOREACH(se, &savevm_handlers, entry) { QTAILQ_FOREACH(se, &savevm_handlers, entry) {
if (se->save_live_state) { if (se->save_live_state) {
se->save_live_state(mon, f, -1, se->opaque); se->save_live_state(f, -1, se->opaque);
} }
} }
} }
@ -1708,17 +1707,17 @@ static int qemu_savevm_state(Monitor *mon, QEMUFile *f)
goto out; goto out;
} }
ret = qemu_savevm_state_begin(mon, f, 0, 0); ret = qemu_savevm_state_begin(f, 0, 0);
if (ret < 0) if (ret < 0)
goto out; goto out;
do { do {
ret = qemu_savevm_state_iterate(mon, f); ret = qemu_savevm_state_iterate(f);
if (ret < 0) if (ret < 0)
goto out; goto out;
} while (ret == 0); } while (ret == 0);
ret = qemu_savevm_state_complete(mon, f); ret = qemu_savevm_state_complete(f);
out: out:
if (ret == 0) { if (ret == 0) {

9
sysemu.h
View File

@ -77,11 +77,10 @@ void do_info_snapshots(Monitor *mon);
void qemu_announce_self(void); void qemu_announce_self(void);
bool qemu_savevm_state_blocked(Monitor *mon); bool qemu_savevm_state_blocked(Monitor *mon);
int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, int qemu_savevm_state_begin(QEMUFile *f, int blk_enable, int shared);
int shared); int qemu_savevm_state_iterate(QEMUFile *f);
int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f); int qemu_savevm_state_complete(QEMUFile *f);
int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f); void qemu_savevm_state_cancel(QEMUFile *f);
void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f);
int qemu_loadvm_state(QEMUFile *f); int qemu_loadvm_state(QEMUFile *f);
/* SLIRP */ /* SLIRP */

3
vmstate.h
View File

@ -28,8 +28,7 @@
typedef void SaveSetParamsHandler(int blk_enable, int shared, void * opaque); typedef void SaveSetParamsHandler(int blk_enable, int shared, void * opaque);
typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef void SaveStateHandler(QEMUFile *f, void *opaque);
typedef int SaveLiveStateHandler(Monitor *mon, QEMUFile *f, int stage, typedef int SaveLiveStateHandler(QEMUFile *f, int stage, void *opaque);
void *opaque);
typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
int register_savevm(DeviceState *dev, int register_savevm(DeviceState *dev,