[Qemu-devel] [PULL 0/2] migration queue

[Qemu-devel] [PULL 0/2] migration queue

[Dr. David Alan Gilbert (git)]

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(-)

[Qemu-devel] [PULL 0/2] migration queue

[Dr. David Alan Gilbert (git)]

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(-)

[Qemu-devel] [PULL 1/2] migration/ram.c: Fix codes conflict about bitmap_mutex

[Dr. David Alan Gilbert (git)]

From: Zhang Chen <chen.zhang@intel.com>

I found upstream codes conflict with COLO and lead to crash,
and I located to this patch:

commit 386a907b37a9321bc5d699bc37104d6ffba1b34d
Author: Wei Wang <wei.w.wang@intel.com>
Date:   Tue Dec 11 16:24:49 2018 +0800

migration: use bitmap_mutex in migration_bitmap_clear_dirty

My colleague Wei's patch add bitmap_mutex in migration_bitmap_clear_dirty,
but COLO didn't initialize the bitmap_mutex. So we always get an error
when COLO start up. like that:
qemu-system-x86_64: util/qemu-thread-posix.c:64: qemu_mutex_lock_impl: Assertion `mutex->initialized' failed.

This patch add the bitmap_mutex initialize and destroy in COLO
lifecycle.

Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Message-Id: <20190329222951.28945-1-chen.zhang@intel.com>
Reviewed-by: Wei Wang <wei.w.wang@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 migration/ram.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/migration/ram.c b/migration/ram.c
index d7f8fe45a8..f68beeeeff 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3918,6 +3918,7 @@ int colo_init_ram_cache(void)
     }
     ram_state = g_new0(RAMState, 1);
     ram_state->migration_dirty_pages = 0;
+    qemu_mutex_init(&ram_state->bitmap_mutex);
     memory_global_dirty_log_start();
 
     return 0;
@@ -3956,6 +3957,7 @@ void colo_release_ram_cache(void)
     }
 
     rcu_read_unlock();
+    qemu_mutex_destroy(&ram_state->bitmap_mutex);
     g_free(ram_state);
     ram_state = NULL;
 }
-- 
2.21.0

[Qemu-devel] [PULL 1/2] migration/ram.c: Fix codes conflict about bitmap_mutex

[Dr. David Alan Gilbert (git)]

From: Zhang Chen <chen.zhang@intel.com>

I found upstream codes conflict with COLO and lead to crash,
and I located to this patch:

commit 386a907b37a9321bc5d699bc37104d6ffba1b34d
Author: Wei Wang <wei.w.wang@intel.com>
Date:   Tue Dec 11 16:24:49 2018 +0800

migration: use bitmap_mutex in migration_bitmap_clear_dirty

My colleague Wei's patch add bitmap_mutex in migration_bitmap_clear_dirty,
but COLO didn't initialize the bitmap_mutex. So we always get an error
when COLO start up. like that:
qemu-system-x86_64: util/qemu-thread-posix.c:64: qemu_mutex_lock_impl: Assertion `mutex->initialized' failed.

This patch add the bitmap_mutex initialize and destroy in COLO
lifecycle.

Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Message-Id: <20190329222951.28945-1-chen.zhang@intel.com>
Reviewed-by: Wei Wang <wei.w.wang@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 migration/ram.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/migration/ram.c b/migration/ram.c
index d7f8fe45a8..f68beeeeff 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3918,6 +3918,7 @@ int colo_init_ram_cache(void)
     }
     ram_state = g_new0(RAMState, 1);
     ram_state->migration_dirty_pages = 0;
+    qemu_mutex_init(&ram_state->bitmap_mutex);
     memory_global_dirty_log_start();
 
     return 0;
@@ -3956,6 +3957,7 @@ void colo_release_ram_cache(void)
     }
 
     rcu_read_unlock();
+    qemu_mutex_destroy(&ram_state->bitmap_mutex);
     g_free(ram_state);
     ram_state = NULL;
 }
-- 
2.21.0

[Qemu-devel] [PULL 2/2] migration: Fix migrate_set_parameter

[Dr. David Alan Gilbert (git)]

From: Juan Quintela <quintela@redhat.com>

Otherwise we are setting err twice, what is wrong and causes an abort.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20190403114958.3705-2-quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 hmp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hmp.c b/hmp.c
index 92941142af..8eec768088 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1825,8 +1825,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
     case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE:
         p->has_xbzrle_cache_size = true;
         visit_type_size(v, param, &cache_size, &err);
-        if (err || cache_size > INT64_MAX
-            || (size_t)cache_size != cache_size) {
+        if (err) {
+            break;
+        }
+        if (cache_size > INT64_MAX || (size_t)cache_size != cache_size) {
             error_setg(&err, "Invalid size %s", valuestr);
             break;
         }
-- 
2.21.0

[Qemu-devel] [PULL 2/2] migration: Fix migrate_set_parameter

[Dr. David Alan Gilbert (git)]

From: Juan Quintela <quintela@redhat.com>

Otherwise we are setting err twice, what is wrong and causes an abort.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20190403114958.3705-2-quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 hmp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hmp.c b/hmp.c
index 92941142af..8eec768088 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1825,8 +1825,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
     case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE:
         p->has_xbzrle_cache_size = true;
         visit_type_size(v, param, &cache_size, &err);
-        if (err || cache_size > INT64_MAX
-            || (size_t)cache_size != cache_size) {
+        if (err) {
+            break;
+        }
+        if (cache_size > INT64_MAX || (size_t)cache_size != cache_size) {
             error_setg(&err, "Invalid size %s", valuestr);
             break;
         }
-- 
2.21.0

Re: [Qemu-devel] [PULL 0/2] migration queue

[Peter Maydell]

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

Re: [Qemu-devel] [PULL 0/2] migration queue

[Peter Maydell]

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

[Qemu-devel] [PULL 0/2] migration queue

[Dr. David Alan Gilbert (git)]

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(-)

Re: [Qemu-devel] [PULL 0/2] migration queue

[Peter Maydell]

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

[Qemu-devel] [PULL 0/2] migration queue

[Dr. David Alan Gilbert (git)]

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(-)

Re: [Qemu-devel] [PULL 0/2] migration queue

[Peter Maydell]

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

[Qemu-devel] [PULL 0/2] migration queue

[Juan Quintela]

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(-)

Re: [Qemu-devel] [PULL 0/2] migration queue

[Anthony Liguori]

Thanks, applied.

Regards,

Anthony Liguori

Re: [Qemu-devel] [PULL 0/2] migration queue

[Anthony Liguori]

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