From cbe6f86570cd7024c914186236fd40fbbc941bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=BDupka?= Date: Thu, 11 Oct 2012 14:19:10 +0200 Subject: [PATCH] virt: Adds multi_host_migration early boot tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiří Župka --- kvm/cfg/multi-host-tests.cfg.sample | 2 ++ kvm/tests/migration_multi_host_fd.py | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kvm/cfg/multi-host-tests.cfg.sample b/kvm/cfg/multi-host-tests.cfg.sample index d47e7567..20bc3853 100644 --- a/kvm/cfg/multi-host-tests.cfg.sample +++ b/kvm/cfg/multi-host-tests.cfg.sample @@ -23,6 +23,8 @@ variants: only smallpages only pc only Fedora.17.64 + cpu_model = "core2duo" + cpu_model_flags = "+sse3" only migrate_multi_host # Runs qemu, f16 64 bit guest OS, install, boot, shutdown diff --git a/kvm/tests/migration_multi_host_fd.py b/kvm/tests/migration_multi_host_fd.py index 7f08205d..0cc13756 100644 --- a/kvm/tests/migration_multi_host_fd.py +++ b/kvm/tests/migration_multi_host_fd.py @@ -34,8 +34,11 @@ def run_migration_multi_host_fd(test, params, env): fd_src=mig_data.params['migration_fd']) def _check_vms_source(self, mig_data): - for vm in mig_data.vms: - vm.wait_for_login(timeout=self.login_timeout) + start_mig_tout = mig_data.params.get("start_migration_timeout", + None) + if start_mig_tout is None: + for vm in mig_data.vms: + vm.wait_for_login(timeout=self.login_timeout) self._hosts_barrier(mig_data.hosts, mig_data.mig_id, 'prepare_VMS', 60) -- GitLab