[KVM-AUTOTEST PATCH] VM.create(): always destroy() the VM before attempting to start it

[Michael Goldish <mgoldish@xxxxxxxxxx>]

Also, don't do it in kvm_preprocessing.py since it's now done in kvm_vm.py.

Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx>
---
 client/tests/kvm_runtest_2/kvm_preprocessing.py |    1 -
 client/tests/kvm_runtest_2/kvm_vm.py            |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/client/tests/kvm_runtest_2/kvm_preprocessing.py b/client/tests/kvm_runtest_2/kvm_preprocessing.py
index bcabf5a..9ccaf78 100644
--- a/client/tests/kvm_runtest_2/kvm_preprocessing.py
+++ b/client/tests/kvm_runtest_2/kvm_preprocessing.py
@@ -84,7 +84,6 @@ def preprocess_vm(test, params, env, name):
             start_vm = True
 
     if start_vm:
-        vm.destroy()
         if not vm.create(name, params, qemu_path, image_dir, iso_dir, for_migration):
             message = "Could not start VM"
             kvm_log.error(message)
diff --git a/client/tests/kvm_runtest_2/kvm_vm.py b/client/tests/kvm_runtest_2/kvm_vm.py
index df99859..a1462c6 100644
--- a/client/tests/kvm_runtest_2/kvm_vm.py
+++ b/client/tests/kvm_runtest_2/kvm_vm.py
@@ -238,6 +238,8 @@ class VM:
         stored in the class attributes is used, and if it is supplied, it is stored
         for later use.
         """
+        self.destroy()
+
         if name != None:
             self.name = name
         if params != None:
-- 
1.5.4.1

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html