* [Qemu-devel] [PULL 0/2] migration queue
@ 2018-03-29 13:57 Dr. David Alan Gilbert (git)
2018-03-29 13:57 ` [Qemu-devel] [PULL 1/2] migration: fix pfd leak Dr. David Alan Gilbert (git)
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2018-03-29 13:57 UTC (permalink / raw)
To: qemu-devel, marcandre.lureau, quintela
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
The following changes since commit 47d3b60858d90ac8a0cc3a72af7f95c96781125a:
Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.12-important-fixes' into staging (2018-03-28 22:13:38 +0100)
are available in the Git repository at:
git://github.com/dagrh/qemu.git tags/pull-migration-20180329a
for you to fetch changes up to 0746a92612276aee69e66dfe6782b0f882d221d5:
migration: Don't activate block devices if using -S (2018-03-29 14:53:16 +0100)
----------------------------------------------------------------
Migration pull (small fixes)
A pair of two small fixes for 2.12.
----------------------------------------------------------------
Dr. David Alan Gilbert (1):
migration: Don't activate block devices if using -S
Marc-André Lureau (1):
migration: fix pfd leak
migration/migration.c | 22 +++++++++++++++-------
migration/postcopy-ram.c | 1 +
2 files changed, 16 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 1/2] migration: fix pfd leak
2018-03-29 13:57 [Qemu-devel] [PULL 0/2] migration queue Dr. David Alan Gilbert (git)
@ 2018-03-29 13:57 ` Dr. David Alan Gilbert (git)
2018-03-29 13:57 ` [Qemu-devel] [PULL 2/2] migration: Don't activate block devices if using -S Dr. David Alan Gilbert (git)
2018-04-03 14:58 ` [Qemu-devel] [PULL 0/2] migration queue Peter Maydell
2 siblings, 0 replies; 12+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2018-03-29 13:57 UTC (permalink / raw)
To: qemu-devel, marcandre.lureau, quintela
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Fix leak spotted by ASAN:
Direct leak of 16 byte(s) in 1 object(s) allocated from:
#0 0x7fe1abb80a38 in __interceptor_calloc (/lib64/libasan.so.4+0xdea38)
#1 0x7fe1aaf1bf75 in g_malloc0 ../glib/gmem.c:124
#2 0x7fe1aaf1c249 in g_malloc0_n ../glib/gmem.c:355
#3 0x55f4841cfaa9 in postcopy_ram_fault_thread /home/elmarco/src/qemu/migration/postcopy-ram.c:596
#4 0x55f48479447b in qemu_thread_start /home/elmarco/src/qemu/util/qemu-thread-posix.c:504
#5 0x7fe1a043550a in start_thread (/lib64/libpthread.so.0+0x750a)
Regression introduced with commit 00fa4fc85b00f1a8a810068d158a7a66e88658eb.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180321113644.21899-1-marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/postcopy-ram.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index efd77939af..4a0b33b373 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -754,6 +754,7 @@ static void *postcopy_ram_fault_thread(void *opaque)
}
}
trace_postcopy_ram_fault_thread_exit();
+ g_free(pfd);
return NULL;
}
--
2.14.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 2/2] migration: Don't activate block devices if using -S
2018-03-29 13:57 [Qemu-devel] [PULL 0/2] migration queue Dr. David Alan Gilbert (git)
2018-03-29 13:57 ` [Qemu-devel] [PULL 1/2] migration: fix pfd leak Dr. David Alan Gilbert (git)
@ 2018-03-29 13:57 ` Dr. David Alan Gilbert (git)
2018-04-03 14:58 ` [Qemu-devel] [PULL 0/2] migration queue Peter Maydell
2 siblings, 0 replies; 12+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2018-03-29 13:57 UTC (permalink / raw)
To: qemu-devel, marcandre.lureau, quintela
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Activating the block devices causes the locks to be taken on
the backing file. If we're running with -S and the destination libvirt
hasn't started the destination with 'cont', it's expecting the locks are
still untaken.
Don't activate the block devices if we're not going to autostart the VM;
'cont' already will do that anyway.
bz: https://bugzilla.redhat.com/show_bug.cgi?id=1560854
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20180328170207.49512-1-dgilbert@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/migration.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 52a5092add..58bd382730 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -306,13 +306,21 @@ static void process_incoming_migration_bh(void *opaque)
Error *local_err = NULL;
MigrationIncomingState *mis = opaque;
- /* Make sure all file formats flush their mutable metadata.
- * If we get an error here, just don't restart the VM yet. */
- bdrv_invalidate_cache_all(&local_err);
- if (local_err) {
- error_report_err(local_err);
- local_err = NULL;
- autostart = false;
+ /* Only fire up the block code now if we're going to restart the
+ * VM, else 'cont' will do it.
+ * This causes file locking to happen; so we don't want it to happen
+ * unless we really are starting the VM.
+ */
+ if (autostart && (!global_state_received() ||
+ global_state_get_runstate() == RUN_STATE_RUNNING)) {
+ /* Make sure all file formats flush their mutable metadata.
+ * If we get an error here, just don't restart the VM yet. */
+ bdrv_invalidate_cache_all(&local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ local_err = NULL;
+ autostart = false;
+ }
}
/*
--
2.14.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] migration queue
2018-03-29 13:57 [Qemu-devel] [PULL 0/2] migration queue Dr. David Alan Gilbert (git)
2018-03-29 13:57 ` [Qemu-devel] [PULL 1/2] migration: fix pfd leak Dr. David Alan Gilbert (git)
2018-03-29 13:57 ` [Qemu-devel] [PULL 2/2] migration: Don't activate block devices if using -S Dr. David Alan Gilbert (git)
@ 2018-04-03 14:58 ` Peter Maydell
2 siblings, 0 replies; 12+ messages in thread
From: Peter Maydell @ 2018-04-03 14:58 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git)
Cc: QEMU Developers, Marc-André Lureau, Juan Quintela
On 29 March 2018 at 14:57, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 47d3b60858d90ac8a0cc3a72af7f95c96781125a:
>
> Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.12-important-fixes' into staging (2018-03-28 22:13:38 +0100)
>
> are available in the Git repository at:
>
> git://github.com/dagrh/qemu.git tags/pull-migration-20180329a
>
> for you to fetch changes up to 0746a92612276aee69e66dfe6782b0f882d221d5:
>
> migration: Don't activate block devices if using -S (2018-03-29 14:53:16 +0100)
>
> ----------------------------------------------------------------
> Migration pull (small fixes)
>
> A pair of two small fixes for 2.12.
>
> ----------------------------------------------------------------
> Dr. David Alan Gilbert (1):
> migration: Don't activate block devices if using -S
>
> Marc-André Lureau (1):
> migration: fix pfd leak
>
> migration/migration.c | 22 +++++++++++++++-------
> migration/postcopy-ram.c | 1 +
> 2 files changed, 16 insertions(+), 7 deletions(-)
>
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] migration queue
@ 2019-04-07 13:54 ` Peter Maydell
0 siblings, 0 replies; 12+ messages in thread
From: Peter Maydell @ 2019-04-07 13:54 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git)
Cc: QEMU Developers, Zhang Chen, Juan Quintela, Peter Xu
On Fri, 5 Apr 2019 at 16:51, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
>
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 10546e09e174e0bb185b66a4c397aa845efcd36e:
>
> Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.0-rc3-v2' into staging (2019-04-05 04:50:30 +0100)
>
> are available in the Git repository at:
>
> git://github.com/dagrh/qemu.git tags/pull-migration-20190405a
>
> for you to fetch changes up to d013283a46e1f197594e76ed320f867067ab80b3:
>
> migration: Fix migrate_set_parameter (2019-04-05 15:32:13 +0100)
>
> ----------------------------------------------------------------
> Migration fixes pull for 4.0
>
> A couple of fixes for crashes in colo and
> migration parameters.
>
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] 12+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] migration queue
@ 2019-04-07 13:54 ` Peter Maydell
0 siblings, 0 replies; 12+ messages in thread
From: Peter Maydell @ 2019-04-07 13:54 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git)
Cc: Zhang Chen, QEMU Developers, Peter Xu, Juan Quintela
On Fri, 5 Apr 2019 at 16:51, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
>
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 10546e09e174e0bb185b66a4c397aa845efcd36e:
>
> Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.0-rc3-v2' into staging (2019-04-05 04:50:30 +0100)
>
> are available in the Git repository at:
>
> git://github.com/dagrh/qemu.git tags/pull-migration-20190405a
>
> for you to fetch changes up to d013283a46e1f197594e76ed320f867067ab80b3:
>
> migration: Fix migrate_set_parameter (2019-04-05 15:32:13 +0100)
>
> ----------------------------------------------------------------
> Migration fixes pull for 4.0
>
> A couple of fixes for crashes in colo and
> migration parameters.
>
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] 12+ messages in thread
* [Qemu-devel] [PULL 0/2] migration queue
@ 2019-04-05 15:49 Dr. David Alan Gilbert (git)
2019-04-07 13:54 ` Peter Maydell
0 siblings, 1 reply; 12+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2019-04-05 15:49 UTC (permalink / raw)
To: qemu-devel, chen.zhang, quintela, peterx
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
The following changes since commit 10546e09e174e0bb185b66a4c397aa845efcd36e:
Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.0-rc3-v2' into staging (2019-04-05 04:50:30 +0100)
are available in the Git repository at:
git://github.com/dagrh/qemu.git tags/pull-migration-20190405a
for you to fetch changes up to d013283a46e1f197594e76ed320f867067ab80b3:
migration: Fix migrate_set_parameter (2019-04-05 15:32:13 +0100)
----------------------------------------------------------------
Migration fixes pull for 4.0
A couple of fixes for crashes in colo and
migration parameters.
----------------------------------------------------------------
Juan Quintela (1):
migration: Fix migrate_set_parameter
Zhang Chen (1):
migration/ram.c: Fix codes conflict about bitmap_mutex
hmp.c | 6 ++++--
migration/ram.c | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] migration queue
2018-11-21 13:04 Dr. David Alan Gilbert (git)
@ 2018-11-22 16:37 ` Peter Maydell
0 siblings, 0 replies; 12+ messages in thread
From: Peter Maydell @ 2018-11-22 16:37 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git)
Cc: QEMU Developers, Zhang Chen, Zhang Chen, Juan Quintela, Peter Xu
On 21 November 2018 at 13:04, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 47c1cc30e440860aa695358f7c2dd0b9d7b53d16:
>
> Update version for v3.1.0-rc2 release (2018-11-20 18:10:26 +0000)
>
> are available in the Git repository at:
>
> git://github.com/dagrh/qemu.git tags/pull-migration-20181121a
>
> for you to fetch changes up to 7e934f5b27eee1b0d77be3dcf1fd18d4ccc602cc:
>
> migration/migration.c: Add COLO dependency checks (2018-11-21 11:38:12 +0000)
>
> ----------------------------------------------------------------
> Migration fixes 2018-11-21
>
> Notably the fix for building with --disable-replication
>
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 0/2] migration queue
@ 2018-11-21 13:04 Dr. David Alan Gilbert (git)
2018-11-22 16:37 ` Peter Maydell
0 siblings, 1 reply; 12+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2018-11-21 13:04 UTC (permalink / raw)
To: qemu-devel, chen.zhang, zhangckid, quintela; +Cc: peterx
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
The following changes since commit 47c1cc30e440860aa695358f7c2dd0b9d7b53d16:
Update version for v3.1.0-rc2 release (2018-11-20 18:10:26 +0000)
are available in the Git repository at:
git://github.com/dagrh/qemu.git tags/pull-migration-20181121a
for you to fetch changes up to 7e934f5b27eee1b0d77be3dcf1fd18d4ccc602cc:
migration/migration.c: Add COLO dependency checks (2018-11-21 11:38:12 +0000)
----------------------------------------------------------------
Migration fixes 2018-11-21
Notably the fix for building with --disable-replication
----------------------------------------------------------------
Zhang Chen (2):
migration/colo.c: Fix compilation issue when disable replication
migration/migration.c: Add COLO dependency checks
migration/colo.c | 28 +++++++++++++++++++++++++++-
migration/migration.c | 9 +++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] migration queue
2013-01-03 0:19 ` Anthony Liguori
@ 2013-01-03 0:22 ` Anthony Liguori
0 siblings, 0 replies; 12+ messages in thread
From: Anthony Liguori @ 2013-01-03 0:22 UTC (permalink / raw)
To: Juan Quintela, qemu-devel
Anthony Liguori <aliguori@us.ibm.com> writes:
> Thanks, applied.
Please disregard. That's a bug in my script. Sorry for the noise.
Regards,
Anthony Liguori
>
> Regards,
>
> Anthony Liguori
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] migration queue
2012-12-11 12:34 Juan Quintela
@ 2013-01-03 0:19 ` Anthony Liguori
2013-01-03 0:22 ` Anthony Liguori
0 siblings, 1 reply; 12+ messages in thread
From: Anthony Liguori @ 2013-01-03 0:19 UTC (permalink / raw)
To: Juan Quintela, qemu-devel
Thanks, applied.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 0/2] migration queue
@ 2012-12-11 12:34 Juan Quintela
2013-01-03 0:19 ` Anthony Liguori
0 siblings, 1 reply; 12+ messages in thread
From: Juan Quintela @ 2012-12-11 12:34 UTC (permalink / raw)
To: qemu-devel
Hi
Anthony, this fixes two errors on the migration code, could you pull?
Thanks, Juan.
The following changes since commit 1c97e303d4ea80a2691334b0febe87a50660f99d:
Merge remote-tracking branch 'afaerber/qom-cpu' into staging (2012-12-10 08:35:15 -0600)
are available in the git repository at:
git://repo.or.cz/qemu/quintela.git migration.next
for you to fetch changes up to 77db8657048f233edf21e1a9ebdc30a367fbdc36:
migration: Fix madvise breakage if host and guest have different page sizes (2012-12-11 12:45:56 +0100)
----------------------------------------------------------------
David Gibson (2):
Fix off-by-1 error in RAM migration code
migration: Fix madvise breakage if host and guest have different page sizes
arch_init.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-04-07 13:55 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-29 13:57 [Qemu-devel] [PULL 0/2] migration queue Dr. David Alan Gilbert (git)
2018-03-29 13:57 ` [Qemu-devel] [PULL 1/2] migration: fix pfd leak Dr. David Alan Gilbert (git)
2018-03-29 13:57 ` [Qemu-devel] [PULL 2/2] migration: Don't activate block devices if using -S Dr. David Alan Gilbert (git)
2018-04-03 14:58 ` [Qemu-devel] [PULL 0/2] migration queue Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2019-04-05 15:49 Dr. David Alan Gilbert (git)
2019-04-07 13:54 ` Peter Maydell
2019-04-07 13:54 ` Peter Maydell
2018-11-21 13:04 Dr. David Alan Gilbert (git)
2018-11-22 16:37 ` Peter Maydell
2012-12-11 12:34 Juan Quintela
2013-01-03 0:19 ` Anthony Liguori
2013-01-03 0:22 ` Anthony Liguori
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.