From patchwork Fri Jun 28 15:02:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wainer dos Santos Moschetta X-Patchwork-Id: 11022987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9BCC514C0 for ; Fri, 28 Jun 2019 16:21:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AB762884A for ; Fri, 28 Jun 2019 16:21:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D54128857; Fri, 28 Jun 2019 16:21:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 00F292884A for ; Fri, 28 Jun 2019 16:21:35 +0000 (UTC) Received: from localhost ([::1]:34022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgtd0-00067d-T5 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 28 Jun 2019 12:21:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49787) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgsOp-0002I0-V0 for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgsOg-0004mX-JB for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39792) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgsOX-0004i1-5g for qemu-devel@nongnu.org; Fri, 28 Jun 2019 11:02:36 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7099E811A9 for ; Fri, 28 Jun 2019 15:02:32 +0000 (UTC) Received: from virtlab501.virt.lab.eng.bos.redhat.com (virtlab501.virt.lab.eng.bos.redhat.com [10.19.152.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id 959995D704; Fri, 28 Jun 2019 15:02:25 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Fri, 28 Jun 2019 11:02:15 -0400 Message-Id: <20190628150217.32659-2-wainersm@redhat.com> In-Reply-To: <20190628150217.32659-1-wainersm@redhat.com> References: <20190628150217.32659-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 28 Jun 2019 15:02:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] python/qemu: Allow to launch the VM without qmp X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: philmd@redhat.com, jsnow@redhat.com, ehabkost@redhat.com, crosa@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP QEMUMachine launches the VM with a monitor enabled, afterwards a qmp connection is attempted on _post_launch(). In case the QEMU process exits with an error, qmp.accept() reaches timeout and raises an exception. But sometimes you don't need that monitor. As an example, when a test launches the VM expecting its immediate crash, and only intend to check the process's return code. In this case the fact that launch() tries to establish the qmp connection (ending up in an exception) is troublesome. So this patch adds the set_qmp_monitor() that allow to launch the VM without creating the monitor machinery. Signed-off-by: Wainer dos Santos Moschetta --- python/qemu/__init__.py | 72 +++++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/python/qemu/__init__.py b/python/qemu/__init__.py index dbaf8a5311..dd577e9446 100644 --- a/python/qemu/__init__.py +++ b/python/qemu/__init__.py @@ -113,6 +113,7 @@ class QEMUMachine(object): self._events = [] self._iolog = None self._socket_scm_helper = socket_scm_helper + self._qmp_set = True # Enable QMP monitor by default. self._qmp = None self._qemu_full_args = None self._test_dir = test_dir @@ -227,15 +228,7 @@ class QEMUMachine(object): self._iolog = iolog.read() def _base_args(self): - if isinstance(self._monitor_address, tuple): - moncdev = "socket,id=mon,host=%s,port=%s" % ( - self._monitor_address[0], - self._monitor_address[1]) - else: - moncdev = 'socket,id=mon,path=%s' % self._vm_monitor - args = ['-chardev', moncdev, - '-mon', 'chardev=mon,mode=control', - '-display', 'none', '-vga', 'none'] + args = ['-display', 'none', '-vga', 'none'] if self._machine is not None: args.extend(['-machine', self._machine]) if self._console_set: @@ -249,23 +242,33 @@ class QEMUMachine(object): else: device = '%s,chardev=console' % self._console_device_type args.extend(['-device', device]) + if self._qmp_set: + if isinstance(self._monitor_address, tuple): + moncdev = "socket,id=mon,host=%s,port=%s" % ( + self._monitor_address[0], + self._monitor_address[1]) + else: + moncdev = 'socket,id=mon,path=%s' % self._vm_monitor + args.extend(['-chardev', moncdev, '-mon', 'chardev=mon,mode=control']) + return args def _pre_launch(self): self._temp_dir = tempfile.mkdtemp(dir=self._test_dir) - if self._monitor_address is not None: - self._vm_monitor = self._monitor_address - else: - self._vm_monitor = os.path.join(self._temp_dir, - self._name + "-monitor.sock") self._qemu_log_path = os.path.join(self._temp_dir, self._name + ".log") self._qemu_log_file = open(self._qemu_log_path, 'wb') - self._qmp = qmp.QEMUMonitorProtocol(self._vm_monitor, - server=True) - + if self._qmp_set: + if self._monitor_address is not None: + self._vm_monitor = self._monitor_address + else: + self._vm_monitor = os.path.join(self._temp_dir, + self._name + "-monitor.sock") + self._qmp = qmp.QEMUMonitorProtocol(self._vm_monitor, + server=True) def _post_launch(self): - self._qmp.accept() + if self._qmp: + self._qmp.accept() def _post_shutdown(self): if self._qemu_log_file is not None: @@ -328,7 +331,8 @@ class QEMUMachine(object): Wait for the VM to power off """ self._popen.wait() - self._qmp.close() + if self._qmp: + self._qmp.close() self._load_io_log() self._post_shutdown() @@ -337,11 +341,14 @@ class QEMUMachine(object): Terminate the VM and clean up """ if self.is_running(): - try: - self._qmp.cmd('quit') - self._qmp.close() - except: - self._popen.kill() + if self._qmp: + try: + self._qmp.cmd('quit') + self._qmp.close() + except: + self._popen.kill() + else: + self._popen.terminate() self._popen.wait() self._load_io_log() @@ -358,6 +365,23 @@ class QEMUMachine(object): self._launched = False + def set_qmp_monitor(self, disabled=False, monitor_address=None): + """ + Set the QMP monitor. + + @param disabled: if True, qmp monitor options will be removed from the + base arguments of the resulting QEMU command line. + @param monitor_address: address for the QMP monitor. + @note: call this function before launch(). + """ + if disabled: + self._qmp_set = False + self._qmp = None + else: + self._qmp_set = True + if monitor_address: + self._monitor_address = monitor_address + def qmp(self, cmd, conv_keys=True, **args): """ Invoke a QMP command and return the response dict