* [Qemu-devel] [PULL 0/9] migration queue
@ 2017-07-10 17:10 Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 1/9] migration: fix handling for --only-migratable Dr. David Alan Gilbert (git)
` (9 more replies)
0 siblings, 10 replies; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-07-10 17:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, lvivier, peterx
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
The following changes since commit 6b06e3e49eb8c91cc286c16d6bf3181ac296f33d:
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-10-v2' into staging (2017-07-10 16:12:47 +0100)
are available in the git repository at:
git://github.com/dagrh/qemu.git tags/pull-migration-20170710a
for you to fetch changes up to f0afa331ce670ba39bde3f5620d75dcd56890cb6:
migration: Make compression_threads use save/load_setup/cleanup() (2017-07-10 17:52:21 +0100)
----------------------------------------------------------------
Migration pull 2017-07-10
----------------------------------------------------------------
Juan Quintela (5):
migration: Rename save_live_setup() to save_setup()
migration: Rename cleanup() to save_cleanup()
migration: Create load_setup()/cleanup() methods
migration: Convert ram to use new load_setup()/load_cleanup()
migration: Make compression_threads use save/load_setup/cleanup()
Peter Xu (4):
migration: fix handling for --only-migratable
vl: move global property, migrate init earlier
doc: add item for "-M enforce-config-section"
doc: update TYPE_MIGRATION documents
hw/ppc/spapr.c | 6 ++---
include/migration/misc.h | 1 -
include/migration/register.h | 6 +++--
migration/block.c | 4 +--
migration/colo.c | 2 +-
migration/migration.c | 27 +++++--------------
migration/ram.c | 63 +++++++++++++++++++++++++++++++-------------
migration/ram.h | 6 -----
migration/savevm.c | 61 +++++++++++++++++++++++++++++++++++-------
migration/savevm.h | 3 ++-
migration/trace-events | 4 ++-
qemu-options.hx | 6 +++++
vl.c | 26 +++++++++---------
13 files changed, 138 insertions(+), 77 deletions(-)
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 1/9] migration: fix handling for --only-migratable
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
@ 2017-07-10 17:10 ` Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 2/9] vl: move global property, migrate init earlier Dr. David Alan Gilbert (git)
` (8 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-07-10 17:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, lvivier, peterx
From: Peter Xu <peterx@redhat.com>
MigrateState object is not ready at that time, so we'll get an
assertion. Use qemu_global_option() instead.
Reported-by: Eduardo Habkost <ehabkost@redhat.com>
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Fixes: 3df663e ("migration: move only_migratable to MigrationState")
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <1499242883-2184-2-git-send-email-peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
include/migration/misc.h | 1 -
migration/migration.c | 5 -----
vl.c | 2 +-
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/migration/misc.h b/include/migration/misc.h
index 22551216bb..c079b7771b 100644
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -53,7 +53,6 @@ bool migration_has_finished(MigrationState *);
bool migration_has_failed(MigrationState *);
/* ...and after the device transmission */
bool migration_in_postcopy_after_devices(MigrationState *);
-void migration_only_migratable_set(void);
void migration_global_dump(Monitor *mon);
#endif
diff --git a/migration/migration.c b/migration/migration.c
index 51ccd1a4c5..dbdc121838 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -128,11 +128,6 @@ MigrationState *migrate_get_current(void)
return current_migration;
}
-void migration_only_migratable_set(void)
-{
- migrate_get_current()->only_migratable = true;
-}
-
MigrationIncomingState *migration_incoming_get_current(void)
{
static bool once;
diff --git a/vl.c b/vl.c
index d17c863409..7a015eccc6 100644
--- a/vl.c
+++ b/vl.c
@@ -3962,7 +3962,7 @@ int main(int argc, char **argv, char **envp)
*
* "-global migration.only-migratable=true"
*/
- migration_only_migratable_set();
+ qemu_global_option("migration.only-migratable=true");
break;
case QEMU_OPTION_nodefaults:
has_defaults = 0;
--
2.13.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 2/9] vl: move global property, migrate init earlier
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 1/9] migration: fix handling for --only-migratable Dr. David Alan Gilbert (git)
@ 2017-07-10 17:10 ` Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 3/9] doc: add item for "-M enforce-config-section" Dr. David Alan Gilbert (git)
` (7 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-07-10 17:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, lvivier, peterx
From: Peter Xu <peterx@redhat.com>
Currently drive_init_func() may call migrate_get_current() while the
migrate object is still not ready yet at that time. Move the migration
object init earlier, along with the global properties, right after
acceleration init.
This fixes a breakage for iotest 055, which caused an assertion failure.
Reported-by: Max Reitz <mreitz@redhat.com>
Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: QingFeng Hao <haoqf@linux.vnet.ibm.com>
Fixes: 3df663 ("migration: move only_migratable to MigrationState")
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <1499242883-2184-3-git-send-email-peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
vl.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/vl.c b/vl.c
index 7a015eccc6..f7560de622 100644
--- a/vl.c
+++ b/vl.c
@@ -4418,6 +4418,18 @@ int main(int argc, char **argv, char **envp)
configure_accelerator(current_machine);
+ /*
+ * Register all the global properties, including accel properties,
+ * machine properties, and user-specified ones.
+ */
+ register_global_properties(current_machine);
+
+ /*
+ * Migration object can only be created after global properties
+ * are applied correctly.
+ */
+ migration_object_init();
+
if (qtest_chrdev) {
qtest_init(qtest_chrdev, qtest_log, &error_fatal);
}
@@ -4601,18 +4613,6 @@ int main(int argc, char **argv, char **envp)
exit (i == 1 ? 1 : 0);
}
- /*
- * Register all the global properties, including accel properties,
- * machine properties, and user-specified ones.
- */
- register_global_properties(current_machine);
-
- /*
- * Migration object can only be created after global properties
- * are applied correctly.
- */
- migration_object_init();
-
/* This checkpoint is required by replay to separate prior clock
reading from the other reads, because timer polling functions query
clock values from the log. */
--
2.13.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 3/9] doc: add item for "-M enforce-config-section"
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 1/9] migration: fix handling for --only-migratable Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 2/9] vl: move global property, migrate init earlier Dr. David Alan Gilbert (git)
@ 2017-07-10 17:10 ` Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 4/9] doc: update TYPE_MIGRATION documents Dr. David Alan Gilbert (git)
` (6 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-07-10 17:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, lvivier, peterx
From: Peter Xu <peterx@redhat.com>
It's never documented, and now we have one more parameter for it (which
obsoletes this one). Document it properly.
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <1499396048-21657-1-git-send-email-peterx@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Removed 'Although now' commit message as per Eduardo's review
---
qemu-options.hx | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
index ddab656eb3..76b1c67737 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -85,6 +85,12 @@ Enables or disables NVDIMM support. The default is off.
@item s390-squash-mcss=on|off
Enables or disables squashing subchannels into the default css.
The default is off.
+@item enforce-config-section=on|off
+If @option{enforce-config-section} is set to @var{on}, force migration
+code to send configuration section even if the machine-type sets the
+@option{migration.send-configuration} property to @var{off}.
+NOTE: this parameter is deprecated. Please use @option{-global}
+@option{migration.send-configuration}=@var{on|off} instead.
@end table
ETEXI
--
2.13.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 4/9] doc: update TYPE_MIGRATION documents
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
` (2 preceding siblings ...)
2017-07-10 17:10 ` [Qemu-devel] [PULL 3/9] doc: add item for "-M enforce-config-section" Dr. David Alan Gilbert (git)
@ 2017-07-10 17:10 ` Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 5/9] migration: Rename save_live_setup() to save_setup() Dr. David Alan Gilbert (git)
` (5 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-07-10 17:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, lvivier, peterx
From: Peter Xu <peterx@redhat.com>
[Peter collected Eduardo's patch comment and formatted into patch]
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <1499242883-2184-5-git-send-email-peterx@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/migration.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index dbdc121838..31d46d1343 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2052,12 +2052,12 @@ static void migration_instance_init(Object *obj)
static const TypeInfo migration_type = {
.name = TYPE_MIGRATION,
/*
- * NOTE: "migration" itself is not really a device. We used
- * TYPE_DEVICE here only to leverage some existing QDev features
- * like "-global" properties, and HW_COMPAT_* fields (which are
- * finally applied as global properties as well). If one day the
- * global property feature can be migrated from QDev to QObject in
- * general, then we can switch to QObject as well.
+ * NOTE: TYPE_MIGRATION is not really a device, as the object is
+ * not created using qdev_create(), it is not attached to the qdev
+ * device tree, and it is never realized.
+ *
+ * TODO: Make this TYPE_OBJECT once QOM provides something like
+ * TYPE_DEVICE's "-global" properties.
*/
.parent = TYPE_DEVICE,
.class_init = migration_class_init,
--
2.13.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 5/9] migration: Rename save_live_setup() to save_setup()
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
` (3 preceding siblings ...)
2017-07-10 17:10 ` [Qemu-devel] [PULL 4/9] doc: update TYPE_MIGRATION documents Dr. David Alan Gilbert (git)
@ 2017-07-10 17:10 ` Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 6/9] migration: Rename cleanup() to save_cleanup() Dr. David Alan Gilbert (git)
` (4 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-07-10 17:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, lvivier, peterx
From: Juan Quintela <quintela@redhat.com>
We are going to use it now for more than save live regions.
Once there rename qemu_savevm_state_begin() to qemu_savevm_state_setup().
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20170628095228.4661-2-quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
hw/ppc/spapr.c | 2 +-
include/migration/register.h | 2 +-
migration/block.c | 2 +-
migration/colo.c | 2 +-
migration/migration.c | 2 +-
migration/ram.c | 2 +-
migration/savevm.c | 12 ++++++------
migration/savevm.h | 2 +-
migration/trace-events | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 0ee9fac50b..ba87be5d48 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1953,7 +1953,7 @@ static void htab_cleanup(void *opaque)
}
static SaveVMHandlers savevm_htab_handlers = {
- .save_live_setup = htab_save_setup,
+ .save_setup = htab_save_setup,
.save_live_iterate = htab_save_iterate,
.save_live_complete_precopy = htab_save_complete,
.cleanup = htab_cleanup,
diff --git a/include/migration/register.h b/include/migration/register.h
index d9498d95eb..f607769e83 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -33,7 +33,7 @@ typedef struct SaveVMHandlers {
int (*save_live_iterate)(QEMUFile *f, void *opaque);
/* This runs outside the iothread lock! */
- int (*save_live_setup)(QEMUFile *f, void *opaque);
+ int (*save_setup)(QEMUFile *f, void *opaque);
void (*save_live_pending)(QEMUFile *f, void *opaque,
uint64_t threshold_size,
uint64_t *non_postcopiable_pending,
diff --git a/migration/block.c b/migration/block.c
index 86c0b96cd1..7a7e83a268 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -1008,7 +1008,7 @@ static bool block_is_active(void *opaque)
}
static SaveVMHandlers savevm_block_handlers = {
- .save_live_setup = block_save_setup,
+ .save_setup = block_save_setup,
.save_live_iterate = block_save_iterate,
.save_live_complete_precopy = block_save_complete,
.save_live_pending = block_save_pending,
diff --git a/migration/colo.c b/migration/colo.c
index c4ba4c328b..ef35f00c9a 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -350,7 +350,7 @@ static int colo_do_checkpoint_transaction(MigrationState *s,
/* Disable block migration */
migrate_set_block_enabled(false, &local_err);
qemu_savevm_state_header(fb);
- qemu_savevm_state_begin(fb);
+ qemu_savevm_state_setup(fb);
qemu_mutex_lock_iothread();
qemu_savevm_state_complete_precopy(fb, false, false);
qemu_mutex_unlock_iothread();
diff --git a/migration/migration.c b/migration/migration.c
index 31d46d1343..beea01ce63 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1835,7 +1835,7 @@ static void *migration_thread(void *opaque)
qemu_savevm_send_postcopy_advise(s->to_dst_file);
}
- qemu_savevm_state_begin(s->to_dst_file);
+ qemu_savevm_state_setup(s->to_dst_file);
s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
diff --git a/migration/ram.c b/migration/ram.c
index 0baa1e0d56..480248a00f 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2623,7 +2623,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
}
static SaveVMHandlers savevm_ram_handlers = {
- .save_live_setup = ram_save_setup,
+ .save_setup = ram_save_setup,
.save_live_iterate = ram_save_iterate,
.save_live_complete_postcopy = ram_save_complete,
.save_live_complete_precopy = ram_save_complete,
diff --git a/migration/savevm.c b/migration/savevm.c
index be3f885119..66f816040e 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -596,7 +596,7 @@ int register_savevm_live(DeviceState *dev,
se->opaque = opaque;
se->vmsd = NULL;
/* if this is a live_savem then set is_ram */
- if (ops->save_live_setup != NULL) {
+ if (ops->save_setup != NULL) {
se->is_ram = 1;
}
@@ -955,14 +955,14 @@ void qemu_savevm_state_header(QEMUFile *f)
}
}
-void qemu_savevm_state_begin(QEMUFile *f)
+void qemu_savevm_state_setup(QEMUFile *f)
{
SaveStateEntry *se;
int ret;
- trace_savevm_state_begin();
+ trace_savevm_state_setup();
QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
- if (!se->ops || !se->ops->save_live_setup) {
+ if (!se->ops || !se->ops->save_setup) {
continue;
}
if (se->ops && se->ops->is_active) {
@@ -972,7 +972,7 @@ void qemu_savevm_state_begin(QEMUFile *f)
}
save_section_header(f, se, QEMU_VM_SECTION_START);
- ret = se->ops->save_live_setup(f, se->opaque);
+ ret = se->ops->save_setup(f, se->opaque);
save_section_footer(f, se);
if (ret < 0) {
qemu_file_set_error(f, ret);
@@ -1241,7 +1241,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
qemu_mutex_unlock_iothread();
qemu_savevm_state_header(f);
- qemu_savevm_state_begin(f);
+ qemu_savevm_state_setup(f);
qemu_mutex_lock_iothread();
while (qemu_file_get_error(f) == 0) {
diff --git a/migration/savevm.h b/migration/savevm.h
index 5a2ed1161d..6babc6221a 100644
--- a/migration/savevm.h
+++ b/migration/savevm.h
@@ -30,7 +30,7 @@
#define QEMU_VM_SECTION_FOOTER 0x7e
bool qemu_savevm_state_blocked(Error **errp);
-void qemu_savevm_state_begin(QEMUFile *f);
+void qemu_savevm_state_setup(QEMUFile *f);
void qemu_savevm_state_header(QEMUFile *f);
int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy);
void qemu_savevm_state_cleanup(void);
diff --git a/migration/trace-events b/migration/trace-events
index 38345be9c3..9669e94ddc 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -32,7 +32,7 @@ savevm_send_open_return_path(void) ""
savevm_send_ping(uint32_t val) "%x"
savevm_send_postcopy_listen(void) ""
savevm_send_postcopy_run(void) ""
-savevm_state_begin(void) ""
+savevm_state_setup(void) ""
savevm_state_header(void) ""
savevm_state_iterate(void) ""
savevm_state_cleanup(void) ""
--
2.13.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 6/9] migration: Rename cleanup() to save_cleanup()
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
` (4 preceding siblings ...)
2017-07-10 17:10 ` [Qemu-devel] [PULL 5/9] migration: Rename save_live_setup() to save_setup() Dr. David Alan Gilbert (git)
@ 2017-07-10 17:10 ` Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 7/9] migration: Create load_setup()/cleanup() methods Dr. David Alan Gilbert (git)
` (3 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-07-10 17:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, lvivier, peterx
From: Juan Quintela <quintela@redhat.com>
We need a cleanup for loads, so we rename here to be consistent.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
--
Rename htab_cleanup to htap_save_cleanup as dave suggestion
Message-Id: <20170628095228.4661-3-quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
hw/ppc/spapr.c | 4 ++--
include/migration/register.h | 2 +-
migration/block.c | 2 +-
migration/ram.c | 2 +-
migration/savevm.c | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index ba87be5d48..990772b633 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1945,7 +1945,7 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id)
return 0;
}
-static void htab_cleanup(void *opaque)
+static void htab_save_cleanup(void *opaque)
{
sPAPRMachineState *spapr = opaque;
@@ -1956,7 +1956,7 @@ static SaveVMHandlers savevm_htab_handlers = {
.save_setup = htab_save_setup,
.save_live_iterate = htab_save_iterate,
.save_live_complete_precopy = htab_save_complete,
- .cleanup = htab_cleanup,
+ .save_cleanup = htab_save_cleanup,
.load_state = htab_load,
};
diff --git a/include/migration/register.h b/include/migration/register.h
index f607769e83..938ea2bc3d 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -18,7 +18,7 @@ typedef struct SaveVMHandlers {
/* This runs inside the iothread lock. */
SaveStateHandler *save_state;
- void (*cleanup)(void *opaque);
+ void (*save_cleanup)(void *opaque);
int (*save_live_complete_postcopy)(QEMUFile *f, void *opaque);
int (*save_live_complete_precopy)(QEMUFile *f, void *opaque);
diff --git a/migration/block.c b/migration/block.c
index 7a7e83a268..9171f60028 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -1013,7 +1013,7 @@ static SaveVMHandlers savevm_block_handlers = {
.save_live_complete_precopy = block_save_complete,
.save_live_pending = block_save_pending,
.load_state = block_load,
- .cleanup = block_migration_cleanup,
+ .save_cleanup = block_migration_cleanup,
.is_active = block_is_active,
};
diff --git a/migration/ram.c b/migration/ram.c
index 480248a00f..649f76cb52 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2629,7 +2629,7 @@ static SaveVMHandlers savevm_ram_handlers = {
.save_live_complete_precopy = ram_save_complete,
.save_live_pending = ram_save_pending,
.load_state = ram_load,
- .cleanup = ram_migration_cleanup,
+ .save_cleanup = ram_migration_cleanup,
};
void ram_mig_init(void)
diff --git a/migration/savevm.c b/migration/savevm.c
index 66f816040e..fee11c5d28 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1215,8 +1215,8 @@ void qemu_savevm_state_cleanup(void)
trace_savevm_state_cleanup();
QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
- if (se->ops && se->ops->cleanup) {
- se->ops->cleanup(se->opaque);
+ if (se->ops && se->ops->save_cleanup) {
+ se->ops->save_cleanup(se->opaque);
}
}
}
--
2.13.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 7/9] migration: Create load_setup()/cleanup() methods
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
` (5 preceding siblings ...)
2017-07-10 17:10 ` [Qemu-devel] [PULL 6/9] migration: Rename cleanup() to save_cleanup() Dr. David Alan Gilbert (git)
@ 2017-07-10 17:10 ` Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 8/9] migration: Convert ram to use new load_setup()/load_cleanup() Dr. David Alan Gilbert (git)
` (2 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-07-10 17:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, lvivier, peterx
From: Juan Quintela <quintela@redhat.com>
We need to do things at load time and at cleanup time.
Signed-off-by: Juan Quintela <quintela@redhat.com>
--
Move the printing of the error message so we can print the device
giving the error.
Add call to postcopy stuff
Message-Id: <20170628095228.4661-4-quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
include/migration/register.h | 2 ++
migration/savevm.c | 45 +++++++++++++++++++++++++++++++++++++++++++-
migration/savevm.h | 1 +
migration/trace-events | 2 ++
4 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/include/migration/register.h b/include/migration/register.h
index 938ea2bc3d..a0f1edd8c7 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -39,6 +39,8 @@ typedef struct SaveVMHandlers {
uint64_t *non_postcopiable_pending,
uint64_t *postcopiable_pending);
LoadStateHandler *load_state;
+ int (*load_setup)(QEMUFile *f, void *opaque);
+ int (*load_cleanup)(void *opaque);
} SaveVMHandlers;
int register_savevm_live(DeviceState *dev,
diff --git a/migration/savevm.c b/migration/savevm.c
index fee11c5d28..fdd15fa0a7 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1541,7 +1541,7 @@ static void *postcopy_ram_listen_thread(void *opaque)
* got a bad migration state).
*/
migration_incoming_state_destroy();
-
+ qemu_loadvm_state_cleanup();
return NULL;
}
@@ -1901,6 +1901,44 @@ qemu_loadvm_section_part_end(QEMUFile *f, MigrationIncomingState *mis)
return 0;
}
+static int qemu_loadvm_state_setup(QEMUFile *f)
+{
+ SaveStateEntry *se;
+ int ret;
+
+ trace_loadvm_state_setup();
+ QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
+ if (!se->ops || !se->ops->load_setup) {
+ continue;
+ }
+ if (se->ops && se->ops->is_active) {
+ if (!se->ops->is_active(se->opaque)) {
+ continue;
+ }
+ }
+
+ ret = se->ops->load_setup(f, se->opaque);
+ if (ret < 0) {
+ qemu_file_set_error(f, ret);
+ error_report("Load state of device %s failed", se->idstr);
+ return ret;
+ }
+ }
+ return 0;
+}
+
+void qemu_loadvm_state_cleanup(void)
+{
+ SaveStateEntry *se;
+
+ trace_loadvm_state_cleanup();
+ QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
+ if (se->ops && se->ops->load_cleanup) {
+ se->ops->load_cleanup(se->opaque);
+ }
+ }
+}
+
static int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis)
{
uint8_t section_type;
@@ -1973,6 +2011,10 @@ int qemu_loadvm_state(QEMUFile *f)
return -ENOTSUP;
}
+ if (qemu_loadvm_state_setup(f) != 0) {
+ return -EINVAL;
+ }
+
if (migrate_get_current()->send_configuration) {
if (qemu_get_byte(f) != QEMU_VM_CONFIGURATION) {
error_report("Configuration section missing");
@@ -2036,6 +2078,7 @@ int qemu_loadvm_state(QEMUFile *f)
}
}
+ qemu_loadvm_state_cleanup();
cpu_synchronize_all_post_init();
return ret;
diff --git a/migration/savevm.h b/migration/savevm.h
index 6babc6221a..295c4a1f2c 100644
--- a/migration/savevm.h
+++ b/migration/savevm.h
@@ -53,5 +53,6 @@ void qemu_savevm_send_postcopy_ram_discard(QEMUFile *f, const char *name,
uint64_t *length_list);
int qemu_loadvm_state(QEMUFile *f);
+void qemu_loadvm_state_cleanup(void);
#endif
diff --git a/migration/trace-events b/migration/trace-events
index 9669e94ddc..cb2c4b5b40 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -7,6 +7,8 @@ qemu_loadvm_state_section_partend(uint32_t section_id) "%u"
qemu_loadvm_state_post_main(int ret) "%d"
qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint32_t instance_id, uint32_t version_id) "%u(%s) %u %u"
qemu_savevm_send_packaged(void) ""
+loadvm_state_setup(void) ""
+loadvm_state_cleanup(void) ""
loadvm_handle_cmd_packaged(unsigned int length) "%u"
loadvm_handle_cmd_packaged_main(int ret) "%d"
loadvm_handle_cmd_packaged_received(int ret) "%d"
--
2.13.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 8/9] migration: Convert ram to use new load_setup()/load_cleanup()
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
` (6 preceding siblings ...)
2017-07-10 17:10 ` [Qemu-devel] [PULL 7/9] migration: Create load_setup()/cleanup() methods Dr. David Alan Gilbert (git)
@ 2017-07-10 17:10 ` Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 9/9] migration: Make compression_threads use save/load_setup/cleanup() Dr. David Alan Gilbert (git)
2017-07-11 9:00 ` [Qemu-devel] [PULL 0/9] migration queue Peter Maydell
9 siblings, 0 replies; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-07-10 17:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, lvivier, peterx
From: Juan Quintela <quintela@redhat.com>
Once there, I rename ram_migration_cleanup() to ram_save_cleanup().
Notice that this is the first pass, and I only passed XBZRLE to the
new scheme. Moved decoded_buf to inside XBZRLE struct.
As a bonus, I don't have to export xbzrle functions from ram.c.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
--
loaded_data pointer was needed because called can change it (dave)
spell loaded correctly in comment (dave)
Message-Id: <20170628095228.4661-5-quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/migration.c | 3 ---
migration/ram.c | 49 ++++++++++++++++++++++++++++++++++++-------------
migration/ram.h | 1 -
3 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index beea01ce63..7e5dbd9b92 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -352,9 +352,6 @@ static void process_incoming_migration_co(void *opaque)
migrate_decompress_threads_join();
exit(EXIT_FAILURE);
}
-
- free_xbzrle_decoded_buf();
-
mis->bh = qemu_bh_new(process_incoming_migration_bh, mis);
qemu_bh_schedule(mis->bh);
}
diff --git a/migration/ram.c b/migration/ram.c
index 649f76cb52..73aec34161 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -85,11 +85,10 @@ static struct {
QemuMutex lock;
/* it will store a page full of zeros */
uint8_t *zero_target_page;
+ /* buffer used for XBZRLE decoding */
+ uint8_t *decoded_buf;
} XBZRLE;
-/* buffer used for XBZRLE decoding */
-static uint8_t *xbzrle_decoded_buf;
-
static void XBZRLE_cache_lock(void)
{
if (migrate_use_xbzrle())
@@ -1350,13 +1349,18 @@ uint64_t ram_bytes_total(void)
return total;
}
-void free_xbzrle_decoded_buf(void)
+static void xbzrle_load_setup(void)
{
- g_free(xbzrle_decoded_buf);
- xbzrle_decoded_buf = NULL;
+ XBZRLE.decoded_buf = g_malloc(TARGET_PAGE_SIZE);
}
-static void ram_migration_cleanup(void *opaque)
+static void xbzrle_load_cleanup(void)
+{
+ g_free(XBZRLE.decoded_buf);
+ XBZRLE.decoded_buf = NULL;
+}
+
+static void ram_save_cleanup(void *opaque)
{
RAMState **rsp = opaque;
RAMBlock *block;
@@ -2078,11 +2082,6 @@ static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host)
int xh_flags;
uint8_t *loaded_data;
- if (!xbzrle_decoded_buf) {
- xbzrle_decoded_buf = g_malloc(TARGET_PAGE_SIZE);
- }
- loaded_data = xbzrle_decoded_buf;
-
/* extract RLE header */
xh_flags = qemu_get_byte(f);
xh_len = qemu_get_be16(f);
@@ -2096,7 +2095,9 @@ static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host)
error_report("Failed to load XBZRLE page - len overflow!");
return -1;
}
+ loaded_data = XBZRLE.decoded_buf;
/* load data and decode */
+ /* it can change loaded_data to point to an internal buffer */
qemu_get_buffer_in_place(f, &loaded_data, xh_len);
/* decode RLE */
@@ -2310,6 +2311,26 @@ static void decompress_data_with_multi_threads(QEMUFile *f,
}
/**
+ * ram_load_setup: Setup RAM for migration incoming side
+ *
+ * Returns zero to indicate success and negative for error
+ *
+ * @f: QEMUFile where to receive the data
+ * @opaque: RAMState pointer
+ */
+static int ram_load_setup(QEMUFile *f, void *opaque)
+{
+ xbzrle_load_setup();
+ return 0;
+}
+
+static int ram_load_cleanup(void *opaque)
+{
+ xbzrle_load_cleanup();
+ return 0;
+}
+
+/**
* ram_postcopy_incoming_init: allocate postcopy data structures
*
* Returns 0 for success and negative if there was one error
@@ -2629,7 +2650,9 @@ static SaveVMHandlers savevm_ram_handlers = {
.save_live_complete_precopy = ram_save_complete,
.save_live_pending = ram_save_pending,
.load_state = ram_load,
- .save_cleanup = ram_migration_cleanup,
+ .save_cleanup = ram_save_cleanup,
+ .load_setup = ram_load_setup,
+ .load_cleanup = ram_load_cleanup,
};
void ram_mig_init(void)
diff --git a/migration/ram.h b/migration/ram.h
index 6272eb0007..a8b79a4d4c 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -47,7 +47,6 @@ void migrate_decompress_threads_join(void);
uint64_t ram_pagesize_summary(void);
int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
void acct_update_position(QEMUFile *f, size_t size, bool zero);
-void free_xbzrle_decoded_buf(void);
void ram_debug_dump_bitmap(unsigned long *todump, bool expected,
unsigned long pages);
void ram_postcopy_migrated_memory_release(MigrationState *ms);
--
2.13.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 9/9] migration: Make compression_threads use save/load_setup/cleanup()
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
` (7 preceding siblings ...)
2017-07-10 17:10 ` [Qemu-devel] [PULL 8/9] migration: Convert ram to use new load_setup()/load_cleanup() Dr. David Alan Gilbert (git)
@ 2017-07-10 17:10 ` Dr. David Alan Gilbert (git)
2017-07-11 9:00 ` [Qemu-devel] [PULL 0/9] migration queue Peter Maydell
9 siblings, 0 replies; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2017-07-10 17:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, lvivier, peterx
From: Juan Quintela <quintela@redhat.com>
Once there, be consistent and use
compress_thread_{save,load}_{setup,cleanup}.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20170628095228.4661-6-quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/migration.c | 5 -----
migration/ram.c | 12 ++++++++----
migration/ram.h | 5 -----
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 7e5dbd9b92..a0db40d364 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -286,7 +286,6 @@ static void process_incoming_migration_bh(void *opaque)
} else {
runstate_set(global_state_get_runstate());
}
- migrate_decompress_threads_join();
/*
* This must happen after any state changes since as soon as an external
* observer sees this event they might start to prod at the VM assuming
@@ -349,7 +348,6 @@ static void process_incoming_migration_co(void *opaque)
migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
MIGRATION_STATUS_FAILED);
error_report("load of migration failed: %s", strerror(-ret));
- migrate_decompress_threads_join();
exit(EXIT_FAILURE);
}
mis->bh = qemu_bh_new(process_incoming_migration_bh, mis);
@@ -360,7 +358,6 @@ void migration_fd_process_incoming(QEMUFile *f)
{
Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, f);
- migrate_decompress_threads_create();
qemu_file_set_blocking(f, false);
qemu_coroutine_enter(co);
}
@@ -827,7 +824,6 @@ static void migrate_fd_cleanup(void *opaque)
}
qemu_mutex_lock_iothread();
- migrate_compress_threads_join();
qemu_fclose(s->to_dst_file);
s->to_dst_file = NULL;
}
@@ -1990,7 +1986,6 @@ void migrate_fd_connect(MigrationState *s)
}
}
- migrate_compress_threads_create();
qemu_thread_create(&s->thread, "live_migration", migration_thread, s,
QEMU_THREAD_JOINABLE);
s->migration_thread_running = true;
diff --git a/migration/ram.c b/migration/ram.c
index 73aec34161..1b08296d1b 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -306,7 +306,7 @@ static inline void terminate_compression_threads(void)
}
}
-void migrate_compress_threads_join(void)
+static void compress_threads_save_cleanup(void)
{
int i, thread_count;
@@ -329,7 +329,7 @@ void migrate_compress_threads_join(void)
comp_param = NULL;
}
-void migrate_compress_threads_create(void)
+static void compress_threads_save_setup(void)
{
int i, thread_count;
@@ -1390,6 +1390,7 @@ static void ram_save_cleanup(void *opaque)
}
XBZRLE_cache_unlock();
migration_page_queue_free(*rsp);
+ compress_threads_save_cleanup();
g_free(*rsp);
*rsp = NULL;
}
@@ -1923,6 +1924,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
}
rcu_read_unlock();
+ compress_threads_save_setup();
ram_control_before_iterate(f, RAM_CONTROL_SETUP);
ram_control_after_iterate(f, RAM_CONTROL_SETUP);
@@ -2231,7 +2233,7 @@ static void wait_for_decompress_done(void)
qemu_mutex_unlock(&decomp_done_lock);
}
-void migrate_decompress_threads_create(void)
+static void compress_threads_load_setup(void)
{
int i, thread_count;
@@ -2255,7 +2257,7 @@ void migrate_decompress_threads_create(void)
}
}
-void migrate_decompress_threads_join(void)
+static void compress_threads_load_cleanup(void)
{
int i, thread_count;
@@ -2321,12 +2323,14 @@ static void decompress_data_with_multi_threads(QEMUFile *f,
static int ram_load_setup(QEMUFile *f, void *opaque)
{
xbzrle_load_setup();
+ compress_threads_load_setup();
return 0;
}
static int ram_load_cleanup(void *opaque)
{
xbzrle_load_cleanup();
+ compress_threads_load_cleanup();
return 0;
}
diff --git a/migration/ram.h b/migration/ram.h
index a8b79a4d4c..c081fde86c 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -39,11 +39,6 @@ int64_t xbzrle_cache_resize(int64_t new_size);
uint64_t ram_bytes_remaining(void);
uint64_t ram_bytes_total(void);
-void migrate_compress_threads_create(void);
-void migrate_compress_threads_join(void);
-void migrate_decompress_threads_create(void);
-void migrate_decompress_threads_join(void);
-
uint64_t ram_pagesize_summary(void);
int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
void acct_update_position(QEMUFile *f, size_t size, bool zero);
--
2.13.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [PULL 0/9] migration queue
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
` (8 preceding siblings ...)
2017-07-10 17:10 ` [Qemu-devel] [PULL 9/9] migration: Make compression_threads use save/load_setup/cleanup() Dr. David Alan Gilbert (git)
@ 2017-07-11 9:00 ` Peter Maydell
9 siblings, 0 replies; 14+ messages in thread
From: Peter Maydell @ 2017-07-11 9:00 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git)
Cc: QEMU Developers, Laurent Vivier, Peter Xu, Juan Quintela
On 10 July 2017 at 18:10, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 6b06e3e49eb8c91cc286c16d6bf3181ac296f33d:
>
> Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-10-v2' into staging (2017-07-10 16:12:47 +0100)
>
> are available in the git repository at:
>
> git://github.com/dagrh/qemu.git tags/pull-migration-20170710a
>
> for you to fetch changes up to f0afa331ce670ba39bde3f5620d75dcd56890cb6:
>
> migration: Make compression_threads use save/load_setup/cleanup() (2017-07-10 17:52:21 +0100)
>
> ----------------------------------------------------------------
> Migration pull 2017-07-10
>
> ----------------------------------------------------------------
> Juan Quintela (5):
> migration: Rename save_live_setup() to save_setup()
> migration: Rename cleanup() to save_cleanup()
> migration: Create load_setup()/cleanup() methods
> migration: Convert ram to use new load_setup()/load_cleanup()
> migration: Make compression_threads use save/load_setup/cleanup()
>
> Peter Xu (4):
> migration: fix handling for --only-migratable
> vl: move global property, migrate init earlier
> doc: add item for "-M enforce-config-section"
> doc: update TYPE_MIGRATION documents
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [PULL 0/9] migration queue
2019-01-23 15:58 Dr. David Alan Gilbert (git)
@ 2019-01-24 15:04 ` Peter Maydell
0 siblings, 0 replies; 14+ messages in thread
From: Peter Maydell @ 2019-01-24 15:04 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git)
Cc: QEMU Developers, Juan Quintela, lifei1214, xiaoguangrong,
Peter Xu, shirley17fei, Marc-André Lureau
On Wed, 23 Jan 2019 at 16:05, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
>
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 9f33051abce238ab43a23125e237aac8b0931b88:
>
> Merge remote-tracking branch 'remotes/kraxel/tags/ipxe-20190122-pull-request' into staging (2019-01-22 19:24:10 +0000)
>
> are available in the Git repository at:
>
> git://github.com/dagrh/qemu.git tags/pull-migration-20190123a
>
> for you to fetch changes up to aecbfe9c64a6005f57b2132eb29db2ba7c0993fe:
>
> migration: introduce pages-per-second (2019-01-23 15:51:47 +0000)
>
> ----------------------------------------------------------------
> Migration pull 2019-01-23
>
> New pages-per-second stat, a new test, and a bunch
> of fixes and tidy ups.
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 0/9] migration queue
@ 2019-01-23 15:58 Dr. David Alan Gilbert (git)
2019-01-24 15:04 ` Peter Maydell
0 siblings, 1 reply; 14+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2019-01-23 15:58 UTC (permalink / raw)
To: qemu-devel
Cc: quintela, peterx, xiaoguangrong, marcandre.lureau, shirley17fei,
lifei1214
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
The following changes since commit 9f33051abce238ab43a23125e237aac8b0931b88:
Merge remote-tracking branch 'remotes/kraxel/tags/ipxe-20190122-pull-request' into staging (2019-01-22 19:24:10 +0000)
are available in the Git repository at:
git://github.com/dagrh/qemu.git tags/pull-migration-20190123a
for you to fetch changes up to aecbfe9c64a6005f57b2132eb29db2ba7c0993fe:
migration: introduce pages-per-second (2019-01-23 15:51:47 +0000)
----------------------------------------------------------------
Migration pull 2019-01-23
New pages-per-second stat, a new test, and a bunch
of fixes and tidy ups.
----------------------------------------------------------------
Dr. David Alan Gilbert (1):
migration/rdma: unregister fd handler
Fei Li (5):
Fix segmentation fault when qemu_signal_init fails
migration: fix the multifd code when receiving less channels
migration: multifd_save_cleanup() can't fail, simplify
migration: add more error handling for postcopy_ram_enable_notify
migration: unify error handling for process_incoming_migration_co
Marc-André Lureau (2):
tests: add /vmstate/simple/array
vmstate: constify SaveVMHandlers
Xiao Guangrong (1):
migration: introduce pages-per-second
hmp.c | 2 ++
include/migration/register.h | 2 +-
migration/channel.c | 11 +++++-----
migration/migration.c | 51 +++++++++++++++++++++++++++-----------------
migration/migration.h | 12 +++++++++--
migration/postcopy-ram.c | 1 +
migration/ram.c | 34 ++++++++++++++++++++---------
migration/ram.h | 4 ++--
migration/rdma.c | 1 +
migration/savevm.c | 5 +++--
qapi/migration.json | 5 ++++-
tests/test-vmstate.c | 50 +++++++++++++++++++++++++++++++++++++++++++
util/main-loop.c | 8 +++----
13 files changed, 139 insertions(+), 47 deletions(-)
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Qemu-devel] [PULL 0/9] migration queue
@ 2013-09-24 12:03 Juan Quintela
0 siblings, 0 replies; 14+ messages in thread
From: Juan Quintela @ 2013-09-24 12:03 UTC (permalink / raw)
To: qemu-devel; +Cc: anthony
Hi Anthony
This are the migration patches on the list at the moment, could you apply?
* cleanup patches from Isaku
* change is_zero_page() prototype
* cleanups from Lei Li
* cleanup from Christoffer Dall
* new VMSTATE macro from Alexey
They are quite easy, passed virt-test without trouble.
Thanks, Juan.
The following changes since commit f828a4c8faa118e0ebab3e353ac6840f3b2a0318:
Merge remote-tracking branch 'stefanha/tracing' into staging (2013-09-23 11:53:22 -0500)
are available in the git repository at:
git://github.com/juanquintela/qemu.git migration.next
for you to fetch changes up to d613a56f845788412a442c6b5aff88b38244f99a:
migration: ram_handle_compressed (2013-09-24 13:22:50 +0200)
----------------------------------------------------------------
Alexey Kardashevskiy (1):
migration: add version supporting macros for struct pointer
Christoffer Dall (1):
migration: Fix debug print type
Isaku Yamahata (4):
rdma: clean up of qemu_rdma_cleanup()
rdma: constify ram_chunk_{index, start, end}
arch_init: make is_zero_page accept size
migration: ram_handle_compressed
Lei Li (3):
savevm: add comments for qemu_file_get_error()
savevm: fix wrong initialization by ram_control_load_hook
arch_init: right return for ram_save_iterate
arch_init.c | 33 +++++++++++++++++++--------------
include/migration/vmstate.h | 17 +++++++++++++++--
migration-rdma.c | 17 +++++++++++------
migration.c | 3 ++-
savevm.c | 9 ++++++++-
5 files changed, 55 insertions(+), 24 deletions(-)
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-01-24 15:04 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-10 17:10 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 1/9] migration: fix handling for --only-migratable Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 2/9] vl: move global property, migrate init earlier Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 3/9] doc: add item for "-M enforce-config-section" Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 4/9] doc: update TYPE_MIGRATION documents Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 5/9] migration: Rename save_live_setup() to save_setup() Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 6/9] migration: Rename cleanup() to save_cleanup() Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 7/9] migration: Create load_setup()/cleanup() methods Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 8/9] migration: Convert ram to use new load_setup()/load_cleanup() Dr. David Alan Gilbert (git)
2017-07-10 17:10 ` [Qemu-devel] [PULL 9/9] migration: Make compression_threads use save/load_setup/cleanup() Dr. David Alan Gilbert (git)
2017-07-11 9:00 ` [Qemu-devel] [PULL 0/9] migration queue Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2019-01-23 15:58 Dr. David Alan Gilbert (git)
2019-01-24 15:04 ` Peter Maydell
2013-09-24 12:03 Juan Quintela
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.