Move the kill-Qemu and unload-modules code from reload_modules() to unload_modules().
Signed-off-by: Eduardo Habkost <[email protected]> --- client/tests/kvm/kvm/installer.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/tests/kvm/kvm/installer.py b/client/tests/kvm/kvm/installer.py index 75d3eda..4e0c6b9 100644 --- a/client/tests/kvm/kvm/installer.py +++ b/client/tests/kvm/kvm/installer.py @@ -224,11 +224,16 @@ class BaseInstaller(object): """ _load_kvm_modules(self.cpu_vendor, load_stock=self.load_stock_modules, extra_modules=self.extra_modules) - def reload_modules(self): - """Reload the KVM modules after killing Qemu and unloading the current modules + def unload_modules(self): + """Kill Qemu and unload the KVM modules """ kill_qemu_processes() _unload_kvm_modules(self.cpu_vendor, self.extra_modules) + + def reload_modules(self): + """Reload the KVM modules after killing Qemu and unloading the current modules + """ + self.unload_modules() self.load_modules() class YumInstaller(BaseInstaller): -- 1.7.3.2 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
