From mboxrd@z Thu Jan 1 00:00:00 1970 From: Isaku Yamahata Subject: [PATCH 15/21] migration: factor out parameters into MigrationParams Date: Thu, 29 Dec 2011 10:25:54 +0900 Message-ID: References: Cc: yamahata@valinux.co.jp, t.hirofuchi@aist.go.jp, satoshi.itoh@aist.go.jp To: kvm@vger.kernel.org, qemu-devel@nongnu.org Return-path: Received: from mail.valinux.co.jp ([210.128.90.3]:47836 "EHLO mail.valinux.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754729Ab1L2B0F (ORCPT ); Wed, 28 Dec 2011 20:26:05 -0500 In-Reply-To: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org List-ID: Introduce MigrationParams for parameters of migration. Signed-off-by: Isaku Yamahata --- block-migration.c | 8 ++++---- hw/hw.h | 2 +- migration.c | 16 +++++++++------- migration.h | 8 ++++++-- qemu-common.h | 1 + savevm.c | 12 ++++++++---- sysemu.h | 4 ++-- 7 files changed, 31 insertions(+), 20 deletions(-) diff --git a/block-migration.c b/block-migration.c index 2b7edbc..c320913 100644 --- a/block-migration.c +++ b/block-migration.c @@ -706,13 +706,13 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void block_set_params(int blk_enable, int shared_base, void *opaque) +static void block_set_params(const MigrationParams *params, void *opaque) { - block_mig_state.blk_enable = blk_enable; - block_mig_state.shared_base = shared_base; + block_mig_state.blk_enable = params->blk; + block_mig_state.shared_base = params->shared; /* shared base means that blk_enable = 1 */ - block_mig_state.blk_enable |= shared_base; + block_mig_state.blk_enable |= params->shared; } void blk_mig_init(void) diff --git a/hw/hw.h b/hw/hw.h index a59b770..c17f837 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -250,7 +250,7 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv) int64_t qemu_ftell(QEMUFile *f); int64_t qemu_fseek(QEMUFile *f, int64_t pos, int whence); -typedef void SaveSetParamsHandler(int blk_enable, int shared, void * opaque); +typedef void SaveSetParamsHandler(const MigrationParams *params, void * opaque); typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef int SaveLiveStateHandler(Monitor *mon, QEMUFile *f, int stage, void *opaque); diff --git a/migration.c b/migration.c index 057dde7..2cef246 100644 --- a/migration.c +++ b/migration.c @@ -365,7 +365,7 @@ void migrate_fd_connect(MigrationState *s) migrate_fd_close); DPRINTF("beginning savevm\n"); - ret = qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shared); + ret = qemu_savevm_state_begin(s->mon, s->file, &s->params); if (ret < 0) { DPRINTF("failed, %d\n", ret); migrate_fd_error(s); @@ -374,15 +374,15 @@ void migrate_fd_connect(MigrationState *s) migrate_fd_put_ready(s); } -static MigrationState *migrate_init(Monitor *mon, int detach, int blk, int inc) +static MigrationState *migrate_init(Monitor *mon, int detach, + const MigrationParams *params) { MigrationState *s = migrate_get_current(); int64_t bandwidth_limit = s->bandwidth_limit; memset(s, 0, sizeof(*s)); s->bandwidth_limit = bandwidth_limit; - s->blk = blk; - s->shared = inc; + s->params = *params; /* s->mon is used for two things: - pass fd in fd migration @@ -414,13 +414,15 @@ void migrate_del_blocker(Error *reason) int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) { MigrationState *s = migrate_get_current(); + MigrationParams params; const char *p; int detach = qdict_get_try_bool(qdict, "detach", 0); - int blk = qdict_get_try_bool(qdict, "blk", 0); - int inc = qdict_get_try_bool(qdict, "inc", 0); const char *uri = qdict_get_str(qdict, "uri"); int ret; + params.blk = qdict_get_try_bool(qdict, "blk", 0); + params.shared = qdict_get_try_bool(qdict, "inc", 0); + if (s->state == MIG_STATE_ACTIVE) { monitor_printf(mon, "migration already in progress\n"); return -1; @@ -436,7 +438,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) return -1; } - s = migrate_init(mon, detach, blk, inc); + s = migrate_init(mon, detach, ¶ms); if (strstart(uri, "tcp:", &p)) { ret = tcp_start_outgoing_migration(s, p); diff --git a/migration.h b/migration.h index 0a5e66f..2e79779 100644 --- a/migration.h +++ b/migration.h @@ -19,6 +19,11 @@ #include "notify.h" #include "error.h" +struct MigrationParams { + int blk; + int shared; +}; + typedef struct MigrationState MigrationState; struct MigrationState @@ -32,8 +37,7 @@ struct MigrationState int (*close)(MigrationState *s); int (*write)(MigrationState *s, const void *buff, size_t size); void *opaque; - int blk; - int shared; + MigrationParams params; }; void process_incoming_migration(QEMUFile *f); diff --git a/qemu-common.h b/qemu-common.h index b2de015..725922b 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -240,6 +240,7 @@ typedef struct SSIBus SSIBus; typedef struct EventNotifier EventNotifier; typedef struct VirtIODevice VirtIODevice; typedef struct QEMUSGList QEMUSGList; +typedef struct MigrationParams MigrationParams; typedef uint64_t pcibus_t; diff --git a/savevm.c b/savevm.c index 891c4fd..2d8e09f 100644 --- a/savevm.c +++ b/savevm.c @@ -1564,8 +1564,8 @@ bool qemu_savevm_state_blocked(Monitor *mon) return false; } -int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, - int shared) +int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, + const MigrationParams *params) { SaveStateEntry *se; int ret; @@ -1574,7 +1574,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, if(se->set_params == NULL) { continue; } - se->set_params(blk_enable, shared, se->opaque); + se->set_params(params, se->opaque); } qemu_put_be32(f, QEMU_VM_FILE_MAGIC); @@ -1712,13 +1712,17 @@ void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f) static int qemu_savevm_state(Monitor *mon, QEMUFile *f) { int ret; + MigrationParams params = { + .blk = 0, + .shared = 0, + }; if (qemu_savevm_state_blocked(mon)) { ret = -EINVAL; goto out; } - ret = qemu_savevm_state_begin(mon, f, 0, 0); + ret = qemu_savevm_state_begin(mon, f, ¶ms); if (ret < 0) goto out; diff --git a/sysemu.h b/sysemu.h index 3806901..d606525 100644 --- a/sysemu.h +++ b/sysemu.h @@ -66,8 +66,8 @@ void do_info_snapshots(Monitor *mon); void qemu_announce_self(void); bool qemu_savevm_state_blocked(Monitor *mon); -int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, - int shared); +int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, + const MigrationParams *params); int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f); int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f); void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f); -- 1.7.1.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rg4lF-0005RC-9r for qemu-devel@nongnu.org; Wed, 28 Dec 2011 20:26:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rg4l1-0004Kx-8r for qemu-devel@nongnu.org; Wed, 28 Dec 2011 20:26:20 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:42986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rg4l0-0004Jc-I4 for qemu-devel@nongnu.org; Wed, 28 Dec 2011 20:26:11 -0500 From: Isaku Yamahata Date: Thu, 29 Dec 2011 10:25:54 +0900 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 15/21] migration: factor out parameters into MigrationParams List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: yamahata@valinux.co.jp, t.hirofuchi@aist.go.jp, satoshi.itoh@aist.go.jp Introduce MigrationParams for parameters of migration. Signed-off-by: Isaku Yamahata --- block-migration.c | 8 ++++---- hw/hw.h | 2 +- migration.c | 16 +++++++++------- migration.h | 8 ++++++-- qemu-common.h | 1 + savevm.c | 12 ++++++++---- sysemu.h | 4 ++-- 7 files changed, 31 insertions(+), 20 deletions(-) diff --git a/block-migration.c b/block-migration.c index 2b7edbc..c320913 100644 --- a/block-migration.c +++ b/block-migration.c @@ -706,13 +706,13 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void block_set_params(int blk_enable, int shared_base, void *opaque) +static void block_set_params(const MigrationParams *params, void *opaque) { - block_mig_state.blk_enable = blk_enable; - block_mig_state.shared_base = shared_base; + block_mig_state.blk_enable = params->blk; + block_mig_state.shared_base = params->shared; /* shared base means that blk_enable = 1 */ - block_mig_state.blk_enable |= shared_base; + block_mig_state.blk_enable |= params->shared; } void blk_mig_init(void) diff --git a/hw/hw.h b/hw/hw.h index a59b770..c17f837 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -250,7 +250,7 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv) int64_t qemu_ftell(QEMUFile *f); int64_t qemu_fseek(QEMUFile *f, int64_t pos, int whence); -typedef void SaveSetParamsHandler(int blk_enable, int shared, void * opaque); +typedef void SaveSetParamsHandler(const MigrationParams *params, void * opaque); typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef int SaveLiveStateHandler(Monitor *mon, QEMUFile *f, int stage, void *opaque); diff --git a/migration.c b/migration.c index 057dde7..2cef246 100644 --- a/migration.c +++ b/migration.c @@ -365,7 +365,7 @@ void migrate_fd_connect(MigrationState *s) migrate_fd_close); DPRINTF("beginning savevm\n"); - ret = qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shared); + ret = qemu_savevm_state_begin(s->mon, s->file, &s->params); if (ret < 0) { DPRINTF("failed, %d\n", ret); migrate_fd_error(s); @@ -374,15 +374,15 @@ void migrate_fd_connect(MigrationState *s) migrate_fd_put_ready(s); } -static MigrationState *migrate_init(Monitor *mon, int detach, int blk, int inc) +static MigrationState *migrate_init(Monitor *mon, int detach, + const MigrationParams *params) { MigrationState *s = migrate_get_current(); int64_t bandwidth_limit = s->bandwidth_limit; memset(s, 0, sizeof(*s)); s->bandwidth_limit = bandwidth_limit; - s->blk = blk; - s->shared = inc; + s->params = *params; /* s->mon is used for two things: - pass fd in fd migration @@ -414,13 +414,15 @@ void migrate_del_blocker(Error *reason) int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) { MigrationState *s = migrate_get_current(); + MigrationParams params; const char *p; int detach = qdict_get_try_bool(qdict, "detach", 0); - int blk = qdict_get_try_bool(qdict, "blk", 0); - int inc = qdict_get_try_bool(qdict, "inc", 0); const char *uri = qdict_get_str(qdict, "uri"); int ret; + params.blk = qdict_get_try_bool(qdict, "blk", 0); + params.shared = qdict_get_try_bool(qdict, "inc", 0); + if (s->state == MIG_STATE_ACTIVE) { monitor_printf(mon, "migration already in progress\n"); return -1; @@ -436,7 +438,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) return -1; } - s = migrate_init(mon, detach, blk, inc); + s = migrate_init(mon, detach, ¶ms); if (strstart(uri, "tcp:", &p)) { ret = tcp_start_outgoing_migration(s, p); diff --git a/migration.h b/migration.h index 0a5e66f..2e79779 100644 --- a/migration.h +++ b/migration.h @@ -19,6 +19,11 @@ #include "notify.h" #include "error.h" +struct MigrationParams { + int blk; + int shared; +}; + typedef struct MigrationState MigrationState; struct MigrationState @@ -32,8 +37,7 @@ struct MigrationState int (*close)(MigrationState *s); int (*write)(MigrationState *s, const void *buff, size_t size); void *opaque; - int blk; - int shared; + MigrationParams params; }; void process_incoming_migration(QEMUFile *f); diff --git a/qemu-common.h b/qemu-common.h index b2de015..725922b 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -240,6 +240,7 @@ typedef struct SSIBus SSIBus; typedef struct EventNotifier EventNotifier; typedef struct VirtIODevice VirtIODevice; typedef struct QEMUSGList QEMUSGList; +typedef struct MigrationParams MigrationParams; typedef uint64_t pcibus_t; diff --git a/savevm.c b/savevm.c index 891c4fd..2d8e09f 100644 --- a/savevm.c +++ b/savevm.c @@ -1564,8 +1564,8 @@ bool qemu_savevm_state_blocked(Monitor *mon) return false; } -int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, - int shared) +int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, + const MigrationParams *params) { SaveStateEntry *se; int ret; @@ -1574,7 +1574,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, if(se->set_params == NULL) { continue; } - se->set_params(blk_enable, shared, se->opaque); + se->set_params(params, se->opaque); } qemu_put_be32(f, QEMU_VM_FILE_MAGIC); @@ -1712,13 +1712,17 @@ void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f) static int qemu_savevm_state(Monitor *mon, QEMUFile *f) { int ret; + MigrationParams params = { + .blk = 0, + .shared = 0, + }; if (qemu_savevm_state_blocked(mon)) { ret = -EINVAL; goto out; } - ret = qemu_savevm_state_begin(mon, f, 0, 0); + ret = qemu_savevm_state_begin(mon, f, ¶ms); if (ret < 0) goto out; diff --git a/sysemu.h b/sysemu.h index 3806901..d606525 100644 --- a/sysemu.h +++ b/sysemu.h @@ -66,8 +66,8 @@ void do_info_snapshots(Monitor *mon); void qemu_announce_self(void); bool qemu_savevm_state_blocked(Monitor *mon); -int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, - int shared); +int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, + const MigrationParams *params); int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f); int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f); void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f); -- 1.7.1.1