Commit e999fa47b2 for qemu.org

commit e999fa47b220274082cb238d5ccb2c9bacd42bf1
Author: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
Date:   Tue Mar 23 23:43:58 2021 +0800

    tests/migration: fix parameter of auto-converge migration

    when execute the following test command:
    $ ./guestperf-batch.py --auto-converge \
        --auto-converge-step {percent} ...
    test aborts and error message be throwed as the following:
    "Parameter 'x-cpu-throttle-increment' is unexpected"

    The reason is that 'x-cpu-throttle-increment' has been
    deprecated and 'cpu-throttle-increment' was introduced
    Since v2.7. Use the new parameter instead.

    Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
    Message-Id: <0195d34a317ce3cc417b3efd275e30cad35a7618.1616513998.git.huangy81@chinatelecom.cn>
    Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
    Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
index e399447940..6b49aed579 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -102,7 +102,7 @@ def _migrate_progress(self, vm):
             info.get("downtime", 0),
             info.get("expected-downtime", 0),
             info.get("setup-time", 0),
-            info.get("x-cpu-throttle-percentage", 0),
+            info.get("cpu-throttle-percentage", 0),
         )

     def _migrate(self, hardware, scenario, src, dst, connect_uri):
@@ -135,7 +135,7 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
                                      "state": True }
                                ])
             resp = src.command("migrate-set-parameters",
-                               x_cpu_throttle_increment=scenario._auto_converge_step)
+                               cpu_throttle_increment=scenario._auto_converge_step)

         if scenario._post_copy:
             resp = src.command("migrate-set-capabilities",