Skip to content

Commit 89b8007

Browse files
authored
Merge pull request #6435 from autotest/revert-6431-fix_arm_migration_params
Revert "migration_postcopy_bandwidth: fix bandwidth"
2 parents 1050eae + 0b1c43d commit 89b8007

30 files changed

+7
-110
lines changed

libvirt/tests/cfg/migration/async_ops/destroy_vm_during_performphase.cfg

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
virsh_migrate_extra_mig_again = " "
4848
- destroy_dst_vm_after_vm_paused:
4949
migrate_speed = "10"
50-
aarch64:
51-
migrate_speed = "15"
5250
action_during_mig = [{"func": "virsh.destroy", "after_event": "Suspended Migrated", "func_param": {"name": "${main_vm}", "uri": "${virsh_migrate_desturi}"}}]
5351
virsh_migrate_extra = "--timeout 2 --timeout-suspend"
5452
expected_event_src = ["lifecycle.*Suspended Migrated", "lifecycle.*Resumed Migrated"]
@@ -58,8 +56,6 @@
5856
err_msg = "domain is no longer running|Unable to read from socket: Connection reset by peer|domain.* is not processing incoming migration"
5957
- destroy_src_vm:
6058
migrate_speed = "10"
61-
aarch64:
62-
migrate_speed = "15"
6359
virsh_migrate_extra = "--timeout 2 --timeout-suspend"
6460
expected_event_src = ["lifecycle.*Stopped Destroyed"]
6561
expected_event_target = ["lifecycle.*Started Migrated", "lifecycle.*Stopped Failed"]

libvirt/tests/cfg/migration/async_ops/pause_resume_vm_during_migration.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
migrate_desturi_type = "tcp"
2828
virsh_migrate_desturi = "qemu+tcp://${migrate_dest_host}/system"
2929
migrate_speed = "5"
30-
aarch64:
31-
migrate_speed = "15"
3230
action_during_mig = [{"func": "virsh.suspend", "after_event": "iteration: '1'", "func_param": {"name": "${main_vm}"}}, {"func": "check_resume", "func_param": "params"}]
3331
variants:
3432
- p2p:

libvirt/tests/cfg/migration/destructive_operations_around_live_migration/kill_qemu_during_performphase.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
service_name = "qemu-kvm"
3131
migrate_again_status_error = "no"
3232
migrate_speed = "10"
33-
aarch64:
34-
migrate_speed = "15"
3533
simple_disk_check_after_mig = "yes"
3634
variants:
3735
- p2p:

libvirt/tests/cfg/migration/destructive_operations_around_live_migration/migration_kill_libvirt_daemon.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
stress_package = "stress"
3434
stress_args = "--cpu 8 --io 4 --vm 2 --vm-bytes 128M --timeout 20s"
3535
migrate_speed = "10"
36-
aarch64:
37-
migrate_speed = "15"
3836
expected_dest_state = "nonexist"
3937
expected_src_state = "running"
4038
simple_disk_check_after_mig = "yes"

libvirt/tests/cfg/migration/live_migration.cfg

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,23 +191,17 @@
191191
vm_state_after_abort = "{'source': 'shutoff', 'target': 'nonexist'}"
192192
poweroff_src_vm = 'yes'
193193
migrate_speed = 10
194-
aarch64:
195-
migrate_speed = "20"
196194
migrate_again = 'yes'
197195
migrate_again_status_error = 'no'
198196
action_during_mig = '[{"func": "poweroff_vm", "after_event": "iteration: '1'", "func_param": "params"}]'
199197
- non_live_migration:
200198
vm_state_after_abort = "{'source': 'shutoff', 'target': 'running'}"
201199
migrate_speed = 10
202-
aarch64:
203-
migrate_speed = "20"
204200
check_network_accessibility_after_mig = 'yes'
205201
action_during_mig = '[{"func": "libvirt_network.check_established", "after_event": "Suspended Migrated", "func_param": "params"}]'
206202
- suspend_virsh:
207203
vm_state_after_abort = "{'source': 'shutoff', 'target': 'running'}"
208204
migrate_speed = 10
209-
aarch64:
210-
migrate_speed = "20"
211205
status_error = 'no'
212206
migrate_speed_high = '8796093022207'
213207
action_during_mig = '[{"func": "MigrationTest().do_cancel", "after_event": "migration-iteration", "before_event": "job-completed", "func_param": "signal.SIGTSTP"}, {"func": "set_migrate_speed_to_high", "func_param": "params"}]'
@@ -216,8 +210,6 @@
216210
err_msg = 'error: operation failed: domain is not running'
217211
vm_state_after_abort = "{'source': 'shutoff', 'target': 'nonexist'}"
218212
migrate_speed = 10
219-
aarch64:
220-
migrate_speed = "20"
221213
migrate_again = 'yes'
222214
migrate_again_status_error = 'no'
223215
action_during_mig = '[{"func": "virsh.destroy", "after_event": "iteration: '1'", "func_param": "'%s' % params.get('migrate_main_vm')"}]'
@@ -226,8 +218,6 @@
226218
min_port = 49152
227219
qemu_conf_list = '["migration_port_min", "migration_port_max"]'
228220
migrate_speed = 10
229-
aarch64:
230-
migrate_speed = "20"
231221
action_during_mig = '[{"func": "libvirt_network.check_established", "after_event": "iteration: '1'", "func_param": 'params'}]'
232222
- unreachable_migrateuri:
233223
virsh_migrate_extra = "tcp://192.168.5.123"
@@ -269,6 +259,4 @@
269259
loop_disk_type = 'block'
270260
exec_statistics_cmd = 'yes'
271261
migrate_speed = 10
272-
aarch64:
273-
migrate_speed = "20"
274262
action_during_mig = '[{"func": "execute_statistics_command", "after_event": "iteration: '1'", "func_param": "params"}]'

libvirt/tests/cfg/migration/memory_copy_mode/precopy.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
migrate_desturi_type = "tcp"
2828
virsh_migrate_desturi = "qemu+tcp://${migrate_dest_host}/system"
2929
migrate_speed = "10"
30-
aarch64:
31-
migrate_speed = "15"
3230
stress_package = "stress"
3331
stress_args = "--cpu 8 --io 4 --vm 2 --vm-bytes 128M --timeout 20s"
3432
port_to_check = "16509"

libvirt/tests/cfg/migration/migrate_service_control.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
kill_service = 'yes'
2828
vm_state_after_abort = "{'source': 'running', 'target': 'nonexist'}"
2929
migrate_speed = 10
30-
aarch64:
31-
migrate_speed = "15"
3230
status_error = 'yes'
3331
action_during_mig = '[{"func": "libvirt_service.kill_service", "after_event": "migration-iteration", "before_event": "Suspended Migrated", "func_param": "params"}]'
3432
migrate_again = 'yes'

libvirt/tests/cfg/migration/migrate_vm_in_various_status/migrate_paused_vm.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,5 @@
3838
- cancel_migration:
3939
status_error = "yes"
4040
migrate_speed = "5"
41-
aarch64:
42-
migrate_speed = "15"
4341
action_during_mig = '[{"func": "virsh.domjobabort", "after_event": "iteration: '1'", "func_param": "'%s' % params.get('migrate_main_vm')"}]'
4442
virsh_migrate_src_state = "paused"

libvirt/tests/cfg/migration/migration_performance_tuning/migration_precopy_bandwidth.cfg

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@
3333
jobinfo_item = "Memory bandwidth:"
3434
diff_rate = '0.5'
3535
compare_to_value = "10"
36-
aarch64:
37-
compare_to_value = "20"
3836
check_str_local_log = '['migrate-set-parameters.*"max-bandwidth":10485760']'
39-
aarch64:
40-
check_str_local_log = '['migrate-set-parameters.*"max-bandwidth":20971520']'
4137
precopy_bandwidth = "${compare_to_value}"
4238
variants:
4339
- p2p:

libvirt/tests/cfg/migration/migration_performance_tuning/migration_timeout_action.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
virsh_migrate_desturi = "qemu+tcp://${migrate_dest_host}/system"
2929
test_case = "timeout_action"
3030
migrate_speed = "5"
31-
aarch64:
32-
migrate_speed = "15"
3331
timeout_value = "8"
3432
action_during_mig = '[{"func": "check_vm_status_during_mig", "after_event": "iteration: '1'", "func_param": {"vm_name": "${main_vm}", "dest_state": "paused", "src_state":"paused", "dest_uri": "${virsh_migrate_desturi}"}, "need_sleep_time": "${timeout_value}"}, {"func": "set_migrate_speed_to_high", "func_param": "params"}]'
3533
stress_package = "stress"

0 commit comments

Comments
 (0)