From: Michael Goldish Subject: [KVM-AUTOTEST PATCH 1/1] KVM test: kvm_vm.py: shorten VM.destroy() Date: Wed, 3 Feb 2010 13:21:12 +0200 Message-ID: <1265196072-14395-1-git-send-email-mgoldish@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: autotest@test.kernel.org, kvm@vger.kernel.org Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org Call self.pci_assignable.release_devs() in the finally block. Signed-off-by: Michael Goldish --- client/tests/kvm/kvm_vm.py | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index 6731927..db903a0 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -598,8 +598,6 @@ class VM: # Is it already dead? if self.is_dead(): logging.debug("VM is already down") - if self.pci_assignable: - self.pci_assignable.release_devs() return logging.debug("Destroying VM with PID %d..." % @@ -620,9 +618,6 @@ class VM: return finally: session.close() - if self.pci_assignable: - self.pci_assignable.release_devs() - # Try to destroy with a monitor command logging.debug("Trying to kill VM with monitor command...") @@ -632,8 +627,6 @@ class VM: # Wait for the VM to be really dead if kvm_utils.wait_for(self.is_dead, 5, 0.5, 0.5): logging.debug("VM is down") - if self.pci_assignable: - self.pci_assignable.release_devs() return # If the VM isn't dead yet... @@ -643,13 +636,13 @@ class VM: # Wait for the VM to be really dead if kvm_utils.wait_for(self.is_dead, 5, 0.5, 0.5): logging.debug("VM is down") - if self.pci_assignable: - self.pci_assignable.release_devs() return logging.error("Process %s is a zombie!" % self.process.get_pid()) finally: + if self.pci_assignable: + self.pci_assignable.release_devs() if self.process: self.process.close() try: -- 1.5.4.1