From patchwork Thu Mar 29 21:38:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 893021 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Byt5090Wz9s2b for ; Fri, 30 Mar 2018 08:43:24 +1100 (AEDT) Received: from localhost ([::1]:60163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1fKM-0004rT-Ao for incoming@patchwork.ozlabs.org; Thu, 29 Mar 2018 17:43:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1fGt-0002BJ-RX for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:39:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1fGt-00014R-1t for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:39:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57166) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f1fGs-000132-Rg for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:39:46 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2339BC036757; Thu, 29 Mar 2018 21:39:46 +0000 (UTC) Received: from localhost (ovpn-116-15.gru2.redhat.com [10.97.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B6C65D9CA; Thu, 29 Mar 2018 21:39:40 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 29 Mar 2018 18:38:46 -0300 Message-Id: <20180329213857.15499-8-ehabkost@redhat.com> In-Reply-To: <20180329213857.15499-1-ehabkost@redhat.com> References: <20180329213857.15499-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 29 Mar 2018 21:39:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC 07/18] qemu.py: Use wait() logic inside shutdown() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Amador Pahim , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Cleber Rosa , Marcel Apfelbaum , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This way we will have a single method where we wait for the QEMU process to finish. Signed-off-by: Eduardo Habkost --- scripts/qemu.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 84bb3da613..4a71542c6b 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -258,12 +258,10 @@ class QEMUMachine(object): if self.is_running(): try: self._qmp.cmd('quit') - self._qmp.close() except: self._popen.kill() - self._popen.wait() - self._post_shutdown() + self.wait() exitcode = self.exitcode() if exitcode is not None and exitcode < 0: