From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dp48n-0001fw-Cj for qemu-devel@nongnu.org; Mon, 04 Sep 2017 23:03:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dp48i-0007Os-KZ for qemu-devel@nongnu.org; Mon, 04 Sep 2017 23:03:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42116) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dp48i-0007OW-Bn for qemu-devel@nongnu.org; Mon, 04 Sep 2017 23:03:00 -0400 Date: Tue, 5 Sep 2017 11:02:55 +0800 From: Fam Zheng Message-ID: <20170905030255.GH22515@lemon.lan> References: <20170901112829.2571-1-apahim@redhat.com> <20170901112829.2571-5-apahim@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170901112829.2571-5-apahim@redhat.com> Subject: Re: [Qemu-devel] [PATCH v8 04/13] qemu.py: improve message on negative exit code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amador Pahim Cc: qemu-devel@nongnu.org, kwolf@redhat.com, ldoktor@redhat.com, ehabkost@redhat.com, stefanha@gmail.com, armbru@redhat.com, mreitz@redhat.com, crosa@redhat.com On Fri, 09/01 13:28, Amador Pahim wrote: > The current message shows 'self._args', which contains only part of the > options used in the Qemu command line. > > This patch makes the qemu full args list an instance variable and then > uses it in the negative exit code message. > > Message was moved outside the 'if is_running' block to make sure it will > be logged if the VM finishes before the call to shutdown(). > > Signed-off-by: Amador Pahim > --- > scripts/qemu.py | 26 +++++++++++++++++++------- > 1 file changed, 19 insertions(+), 7 deletions(-) > > diff --git a/scripts/qemu.py b/scripts/qemu.py > index a6e06291ea..670c048569 100644 > --- a/scripts/qemu.py > +++ b/scripts/qemu.py > @@ -49,6 +49,7 @@ class QEMUMachine(object): > self._iolog = None > self._socket_scm_helper = socket_scm_helper > self._debug = debug > + self._qemu_full_args = None > > # This can be used to add an unused monitor instance. > def add_monitor_telnet(self, ip, port): > @@ -140,13 +141,18 @@ class QEMUMachine(object): > > def launch(self): > '''Launch the VM and establish a QMP connection''' > + self._qemu_full_args = None > devnull = open(os.path.devnull, 'rb') > qemulog = open(self._qemu_log_path, 'wb') > try: > self._pre_launch() > - args = self._wrapper + [self._binary] + self._base_args() + self._args > - self._popen = subprocess.Popen(args, stdin=devnull, stdout=qemulog, > - stderr=subprocess.STDOUT, shell=False) > + self._qemu_full_args = (self._wrapper + [self._binary] + > + self._base_args() + self._args) The parentheses seem superfluous. With those removed: Reviewed-by: Fam Zheng > + self._popen = subprocess.Popen(self._qemu_full_args, > + stdin=devnull, > + stdout=qemulog, > + stderr=subprocess.STDOUT, > + shell=False) > self._post_launch() > except: > if self.is_running(): > @@ -164,14 +170,20 @@ class QEMUMachine(object): > self._qmp.close() > except: > self._popen.kill() > + self._popen.wait() > > - exitcode = self._popen.wait() > - if exitcode < 0: > - LOG.warn('qemu received signal %i: %s', -exitcode, > - ' '.join(self._args)) > self._load_io_log() > self._post_shutdown() > > + exitcode = self.exitcode() > + if exitcode is not None and exitcode < 0: > + msg = 'qemu received signal %i: %s' > + if self._qemu_full_args: > + command = ' '.join(self._qemu_full_args) > + else: > + command = '' > + LOG.warn(msg, exitcode, command) > + > underscore_to_dash = string.maketrans('_', '-') > def qmp(self, cmd, conv_keys=True, **args): > '''Invoke a QMP command and return the result dict''' > -- > 2.13.5 > >