[PULL 0/3] Migration patches for 2026-03-30

[PULL 0/3] Migration patches for 2026-03-30

[Fabiano Rosas]

The following changes since commit e389503e73f1726c997531447288ce154394d07a:

  Merge tag 'pull-request-2026-03-30' of https://gitlab.com/thuth/qemu into staging (2026-03-30 11:50:24 +0100)

are available in the Git repository at:

  https://gitlab.com/farosas/qemu.git tags/migration-20260330-pull-request

for you to fetch changes up to 6f33b6eebb7d406871150b0285c36454a1b4d0d3:

  tests/qtest/migration: Fix slow test dirty_limit (2026-03-30 10:48:12 -0300)

----------------------------------------------------------------
Migration pull request

- Fix dirty limit (-m thorough) test
- Fix a few error message strings

----------------------------------------------------------------

Fabiano Rosas (1):
  tests/qtest/migration: Fix slow test dirty_limit

Markus Armbruster (2):
  migration: Fix up error message for max-cpu-throttle
  migration: Fix references to parameter names in error messages

 migration/options.c                   | 36 +++++++++++++--------------
 tests/qtest/migration/precopy-tests.c |  4 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

-- 
2.51.0

[PULL 1/3] migration: Fix up error message for max-cpu-throttle

[Fabiano Rosas]

From: Markus Armbruster <armbru@redhat.com>

Fixes: 1a739d301232 (migration: Do away with usage of QERR_INVALID_PARAMETER_VALUE)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20260326074247.188674-2-armbru@redhat.com
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 migration/options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/options.c b/migration/options.c
index 658c578191..3eb5b39186 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -1207,7 +1207,7 @@ bool migrate_params_check(MigrationParameters *params, Error **errp)
 
     if (params->max_cpu_throttle < params->cpu_throttle_initial ||
         params->max_cpu_throttle > 99) {
-        error_setg(errp, "max_Option cpu_throttle expects "
+        error_setg(errp, "Option max_cpu_throttle expects "
                    "an integer in the range of cpu_throttle_initial to 99");
         return false;
     }
-- 
2.51.0

[PULL 2/3] migration: Fix references to parameter names in error messages

[Fabiano Rosas]

From: Markus Armbruster <armbru@redhat.com>

Migration parameter names separate words with hyphens.  A number of
error messages in migrate_params_check() use underscores instead.
Wrong since day one.  Fix them.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20260326074247.188674-3-armbru@redhat.com
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 migration/options.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/migration/options.c b/migration/options.c
index 3eb5b39186..7556fbc06b 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -1133,103 +1133,103 @@ bool migrate_params_check(MigrationParameters *params, Error **errp)
 
     if (params->throttle_trigger_threshold < 1 ||
         params->throttle_trigger_threshold > 100) {
-        error_setg(errp, "Option throttle_trigger_threshold expects "
+        error_setg(errp, "Option throttle-trigger-threshold expects "
                    "an integer in the range of 1 to 100");
         return false;
     }
 
     if (params->cpu_throttle_initial < 1 ||
         params->cpu_throttle_initial > 99) {
-        error_setg(errp, "Option cpu_throttle_initial expects "
+        error_setg(errp, "Option cpu-throttle-initial expects "
                    "an integer in the range of 1 to 99");
         return false;
     }
 
     if (params->cpu_throttle_increment < 1 ||
         params->cpu_throttle_increment > 99) {
-        error_setg(errp, "Option cpu_throttle_increment expects "
+        error_setg(errp, "Option cpu-throttle-increment expects "
                    "an integer in the range of 1 to 99");
         return false;
     }
 
     if (params->max_bandwidth > SIZE_MAX) {
-        error_setg(errp, "Option max_bandwidth expects "
+        error_setg(errp, "Option max-bandwidth expects "
                    "an integer in the range of 0 to "stringify(SIZE_MAX)
                    " bytes/second");
         return false;
     }
 
     if (params->avail_switchover_bandwidth > SIZE_MAX) {
-        error_setg(errp, "Option avail_switchover_bandwidth expects "
+        error_setg(errp, "Option avail-switchover-bandwidth expects "
                    "an integer in the range of 0 to "stringify(SIZE_MAX)
                    " bytes/second");
         return false;
     }
 
     if (params->downtime_limit > MAX_MIGRATE_DOWNTIME) {
-        error_setg(errp, "Option downtime_limit expects "
+        error_setg(errp, "Option downtime-limit expects "
                    "an integer in the range of 0 to "
                     stringify(MAX_MIGRATE_DOWNTIME)" ms");
         return false;
     }
 
     if (params->multifd_channels < 1) {
-        error_setg(errp, "Option multifd_channels expects "
+        error_setg(errp, "Option multifd-channels expects "
                    "a value between 1 and 255");
         return false;
     }
 
     if (params->multifd_zlib_level > 9) {
-        error_setg(errp, "Option multifd_zlib_level expects "
+        error_setg(errp, "Option multifd-zlib-level expects "
                    "a value between 0 and 9");
         return false;
     }
 
     if (params->multifd_qatzip_level > 9 ||
         params->multifd_qatzip_level < 1) {
-        error_setg(errp, "Option multifd_qatzip_level expects "
+        error_setg(errp, "Option multifd-qatzip-level expects "
                    "a value between 1 and 9");
         return false;
     }
 
     if (params->multifd_zstd_level > 20) {
-        error_setg(errp, "Option multifd_zstd_level expects "
+        error_setg(errp, "Option multifd-zstd-level expects "
                    "a value between 0 and 20");
         return false;
     }
 
     if (params->xbzrle_cache_size < qemu_target_page_size() ||
         !is_power_of_2(params->xbzrle_cache_size)) {
-        error_setg(errp, "Option xbzrle_cache_size expects "
+        error_setg(errp, "Option xbzrle-cache-size expects "
                    "a power of two no less than the target page size");
         return false;
     }
 
     if (params->max_cpu_throttle < params->cpu_throttle_initial ||
         params->max_cpu_throttle > 99) {
-        error_setg(errp, "Option max_cpu_throttle expects "
-                   "an integer in the range of cpu_throttle_initial to 99");
+        error_setg(errp, "Option max-cpu-throttle expects "
+                   "an integer in the range of cpu-throttle-initial to 99");
         return false;
     }
 
     if (params->announce_initial > 100000) {
-        error_setg(errp, "Option announce_initial expects "
+        error_setg(errp, "Option announce-initial expects "
                    "a value between 0 and 100000");
         return false;
     }
     if (params->announce_max > 100000) {
-        error_setg(errp, "Option announce_max expects "
+        error_setg(errp, "Option announce-max expects "
                    "a value between 0 and 100000");
         return false;
     }
     if (params->announce_rounds > 1000) {
-        error_setg(errp, "Option announce_rounds expects "
+        error_setg(errp, "Option announce-rounds expects "
                    "a value between 0 and 1000");
         return false;
     }
     if (params->announce_step < 1 ||
         params->announce_step > 10000) {
-        error_setg(errp, "Option announce_step expects "
+        error_setg(errp, "Option announce-step expects "
                    "a value between 0 and 10000");
         return false;
     }
@@ -1264,7 +1264,7 @@ bool migrate_params_check(MigrationParameters *params, Error **errp)
 
     if (params->vcpu_dirty_limit < 1) {
         error_setg(errp,
-                   "Parameter 'vcpu_dirty_limit' must be greater than 1 MB/s");
+                   "Parameter 'vcpu-dirty-limit' must be greater than 1 MB/s");
         return false;
     }
 
-- 
2.51.0

[PULL 3/3] tests/qtest/migration: Fix slow test dirty_limit

[Fabiano Rosas]

After the referenced commit, the incoming side doesn't exit
automatically after a failure. Tests that expect the destination to
fail should use -incoming defer, issue QMP migrate-incoming, wait for
the failure event and issue QMP quit.

Fix the dirty_limit test which wasn't updated properly.

Fixes: 4e8c4dda97 ("tests/qtest/migration: Force exit-on-error=false")
Reported-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20260326164405.1626-1-farosas@suse.de
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 tests/qtest/migration/precopy-tests.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/precopy-tests.c
index c6c8ae3004..a0e3ff0547 100644
--- a/tests/qtest/migration/precopy-tests.c
+++ b/tests/qtest/migration/precopy-tests.c
@@ -1070,11 +1070,10 @@ static void test_dirty_limit(char *name, MigrateCommon *args)
     args->start.hide_stderr = true;
     args->start.use_dirty_ring = true;
 
-    args->listen_uri = uri;
     args->connect_uri = uri;
 
     /* Start src, dst vm */
-    if (migrate_start(&from, &to, args->listen_uri, &args->start)) {
+    if (migrate_start(&from, &to, "defer", &args->start)) {
         return;
     }
 
@@ -1082,6 +1081,7 @@ static void test_dirty_limit(char *name, MigrateCommon *args)
     migrate_dirty_limit_wait_showup(from, dirtylimit_period, dirtylimit_value);
 
     /* Start migrate */
+    migrate_incoming_qmp(to, args->connect_uri, NULL, "{}");
     migrate_qmp(from, to, args->connect_uri, NULL, "{}");
 
     /* Wait for dirty limit throttle begin */
-- 
2.51.0

Re: [PULL 0/3] Migration patches for 2026-03-30

[Peter Maydell]

On Mon, 30 Mar 2026 at 20:06, Fabiano Rosas <farosas@suse.de> wrote:
>
> The following changes since commit e389503e73f1726c997531447288ce154394d07a:
>
>   Merge tag 'pull-request-2026-03-30' of https://gitlab.com/thuth/qemu into staging (2026-03-30 11:50:24 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/farosas/qemu.git tags/migration-20260330-pull-request
>
> for you to fetch changes up to 6f33b6eebb7d406871150b0285c36454a1b4d0d3:
>
>   tests/qtest/migration: Fix slow test dirty_limit (2026-03-30 10:48:12 -0300)
>
> ----------------------------------------------------------------
> Migration pull request
>
> - Fix dirty limit (-m thorough) test
> - Fix a few error message strings
>
> ----------------------------------------------------------------



Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/11.0
for any user-visible changes.

-- PMM