* [PULL 0/2] Migration 20211106 patches
@ 2021-11-06 23:29 Juan Quintela
2021-11-06 23:29 ` [PULL 1/2] migration: Check that postcopy fd's are not NULL Juan Quintela
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Juan Quintela @ 2021-11-06 23:29 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Eric Blake, Dr. David Alan Gilbert, Juan Quintela
The following changes since commit c39deb218178d1fb814dd2138ceff4b541a03d85:
Merge remote-tracking branch 'remotes/kraxel/tags/egl-20211105-pull-request' into staging (2021-11-05 11:42:06 -0400)
are available in the Git repository at:
https://github.com/juanquintela/qemu.git tags/migration-20211106-pull-request
for you to fetch changes up to f78d4ed701454f10079461b981ba2a61a95762ab:
docs: fix qemu incorrect tag (2021-11-06 12:35:38 +0100)
----------------------------------------------------------------
Migration Pull request
- fix vhost-user crash when using postcopy (me)
- fix incorrect tag for docs (hyman)
Please apply, Juan.
----------------------------------------------------------------
Hyman Huang(黄勇) (1):
docs: fix qemu incorrect tag
Juan Quintela (1):
migration: Check that postcopy fd's are not NULL
qapi/migration.json | 10 +++++-----
migration/postcopy-ram.c | 4 ++++
2 files changed, 9 insertions(+), 5 deletions(-)
--
2.33.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PULL 1/2] migration: Check that postcopy fd's are not NULL
2021-11-06 23:29 [PULL 0/2] Migration 20211106 patches Juan Quintela
@ 2021-11-06 23:29 ` Juan Quintela
2021-11-06 23:29 ` [PULL 2/2] docs: fix qemu incorrect tag Juan Quintela
2021-11-07 3:20 ` [PULL 0/2] Migration 20211106 patches Richard Henderson
2 siblings, 0 replies; 5+ messages in thread
From: Juan Quintela @ 2021-11-06 23:29 UTC (permalink / raw)
To: qemu-devel
Cc: Markus Armbruster, Eric Blake, Dr. David Alan Gilbert, Juan Quintela
If postcopy has finished, it frees the array.
But vhost-user unregister it at cleanup time.
fixes: c4f7538
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/postcopy-ram.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index e721f69d0f..d18b5d05b2 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -1457,6 +1457,10 @@ void postcopy_unregister_shared_ufd(struct PostCopyFD *pcfd)
MigrationIncomingState *mis = migration_incoming_get_current();
GArray *pcrfds = mis->postcopy_remote_fds;
+ if (!pcrfds) {
+ /* migration has already finished and freed the array */
+ return;
+ }
for (i = 0; i < pcrfds->len; i++) {
struct PostCopyFD *cur = &g_array_index(pcrfds, struct PostCopyFD, i);
if (cur->fd == pcfd->fd) {
--
2.33.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PULL 2/2] docs: fix qemu incorrect tag
2021-11-06 23:29 [PULL 0/2] Migration 20211106 patches Juan Quintela
2021-11-06 23:29 ` [PULL 1/2] migration: Check that postcopy fd's are not NULL Juan Quintela
@ 2021-11-06 23:29 ` Juan Quintela
2021-11-08 5:41 ` Markus Armbruster
2021-11-07 3:20 ` [PULL 0/2] Migration 20211106 patches Richard Henderson
2 siblings, 1 reply; 5+ messages in thread
From: Juan Quintela @ 2021-11-06 23:29 UTC (permalink / raw)
To: qemu-devel
Cc: Juan Quintela, Eric Blake, Hyman Huang(黄勇),
Markus Armbruster, Dr. David Alan Gilbert,
Philippe Mathieu-Daudé
From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
The patchset merged in 71864eadd9a ("migration/dirtyrate:
introduce struct and adjust DirtyRateStat") was targeting
QEMU 6.1 but got merged later, so correct the tag for 6.2.
Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
qapi/migration.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/qapi/migration.json b/qapi/migration.json
index 87146ceea2..f0aefdab64 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1740,7 +1740,7 @@
#
# @dirty-rate: dirty rate.
#
-# Since: 6.1
+# Since: 6.2
#
##
{ 'struct': 'DirtyRateVcpu',
@@ -1774,7 +1774,7 @@
#
# @dirty-bitmap: calculate dirtyrate by dirty bitmap.
#
-# Since: 6.1
+# Since: 6.2
#
##
{ 'enum': 'DirtyRateMeasureMode',
@@ -1796,13 +1796,13 @@
# @calc-time: time in units of second for sample dirty pages
#
# @sample-pages: page count per GB for sample dirty pages
-# the default value is 512 (since 6.1)
+# the default value is 512 (since 6.2)
#
# @mode: mode containing method of calculate dirtyrate includes
-# 'page-sampling' and 'dirty-ring' (Since 6.1)
+# 'page-sampling' and 'dirty-ring' (Since 6.2)
#
# @vcpu-dirty-rate: dirtyrate for each vcpu if dirty-ring
-# mode specified (Since 6.1)
+# mode specified (Since 6.2)
#
# Since: 5.2
#
--
2.33.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PULL 0/2] Migration 20211106 patches
2021-11-06 23:29 [PULL 0/2] Migration 20211106 patches Juan Quintela
2021-11-06 23:29 ` [PULL 1/2] migration: Check that postcopy fd's are not NULL Juan Quintela
2021-11-06 23:29 ` [PULL 2/2] docs: fix qemu incorrect tag Juan Quintela
@ 2021-11-07 3:20 ` Richard Henderson
2 siblings, 0 replies; 5+ messages in thread
From: Richard Henderson @ 2021-11-07 3:20 UTC (permalink / raw)
To: Juan Quintela, qemu-devel
Cc: Eric Blake, Markus Armbruster, Dr. David Alan Gilbert
On 11/6/21 7:29 PM, Juan Quintela wrote:
> The following changes since commit c39deb218178d1fb814dd2138ceff4b541a03d85:
>
> Merge remote-tracking branch 'remotes/kraxel/tags/egl-20211105-pull-request' into staging (2021-11-05 11:42:06 -0400)
>
> are available in the Git repository at:
>
> https://github.com/juanquintela/qemu.git tags/migration-20211106-pull-request
>
> for you to fetch changes up to f78d4ed701454f10079461b981ba2a61a95762ab:
>
> docs: fix qemu incorrect tag (2021-11-06 12:35:38 +0100)
>
> ----------------------------------------------------------------
> Migration Pull request
>
> - fix vhost-user crash when using postcopy (me)
> - fix incorrect tag for docs (hyman)
>
> Please apply, Juan.
>
> ----------------------------------------------------------------
>
> Hyman Huang(黄勇) (1):
> docs: fix qemu incorrect tag
>
> Juan Quintela (1):
> migration: Check that postcopy fd's are not NULL
>
> qapi/migration.json | 10 +++++-----
> migration/postcopy-ram.c | 4 ++++
> 2 files changed, 9 insertions(+), 5 deletions(-)
Applied, thanks.
r~
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PULL 2/2] docs: fix qemu incorrect tag
2021-11-06 23:29 ` [PULL 2/2] docs: fix qemu incorrect tag Juan Quintela
@ 2021-11-08 5:41 ` Markus Armbruster
0 siblings, 0 replies; 5+ messages in thread
From: Markus Armbruster @ 2021-11-08 5:41 UTC (permalink / raw)
To: Juan Quintela
Cc: Hyman Huang(黄勇), Philippe Mathieu-Daudé,
Eric Blake, qemu-devel, Dr. David Alan Gilbert
Juan Quintela <quintela@redhat.com> writes:
> From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
>
> The patchset merged in 71864eadd9a ("migration/dirtyrate:
> introduce struct and adjust DirtyRateStat") was targeting
> QEMU 6.1 but got merged later, so correct the tag for 6.2.
>
> Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Reviewed-by: Juan Quintela <quintela@redhat.com>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> qapi/migration.json | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/qapi/migration.json b/qapi/migration.json
> index 87146ceea2..f0aefdab64 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -1740,7 +1740,7 @@
> #
> # @dirty-rate: dirty rate.
> #
> -# Since: 6.1
> +# Since: 6.2
> #
> ##
> { 'struct': 'DirtyRateVcpu',
> @@ -1774,7 +1774,7 @@
> #
> # @dirty-bitmap: calculate dirtyrate by dirty bitmap.
> #
> -# Since: 6.1
> +# Since: 6.2
> #
> ##
> { 'enum': 'DirtyRateMeasureMode',
> @@ -1796,13 +1796,13 @@
> # @calc-time: time in units of second for sample dirty pages
> #
> # @sample-pages: page count per GB for sample dirty pages
> -# the default value is 512 (since 6.1)
> +# the default value is 512 (since 6.2)
This one got merged into 6.1 in commit 7afa08cd8fd. Please revert this
line.
> #
> # @mode: mode containing method of calculate dirtyrate includes
> -# 'page-sampling' and 'dirty-ring' (Since 6.1)
> +# 'page-sampling' and 'dirty-ring' (Since 6.2)
> #
> # @vcpu-dirty-rate: dirtyrate for each vcpu if dirty-ring
> -# mode specified (Since 6.1)
> +# mode specified (Since 6.2)
> #
> # Since: 5.2
> #
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-08 5:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-06 23:29 [PULL 0/2] Migration 20211106 patches Juan Quintela
2021-11-06 23:29 ` [PULL 1/2] migration: Check that postcopy fd's are not NULL Juan Quintela
2021-11-06 23:29 ` [PULL 2/2] docs: fix qemu incorrect tag Juan Quintela
2021-11-08 5:41 ` Markus Armbruster
2021-11-07 3:20 ` [PULL 0/2] Migration 20211106 patches Richard Henderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).