From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtuZ5-00065h-BL for qemu-devel@nongnu.org; Mon, 18 Sep 2017 07:50:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtuZ4-0002dk-Fr for qemu-devel@nongnu.org; Mon, 18 Sep 2017 07:50:15 -0400 Date: Mon, 18 Sep 2017 08:49:59 -0300 From: Eduardo Habkost Message-ID: <20170918114959.GH10621@localhost.localdomain> References: <20170918052524.4045-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170918052524.4045-1-kwolf@redhat.com> Subject: Re: [Qemu-devel] [PATCH] qemu.py: Fix syntax error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-block@nongnu.org, mreitz@redhat.com, famz@redhat.com, apahim@redhat.com, ldoktor@redhat.com, stefanha@gmail.com, armbru@redhat.com, crosa@redhat.com, qemu-devel@nongnu.org On Mon, Sep 18, 2017 at 07:25:24AM +0200, Kevin Wolf wrote: > Python requires parentheses around multiline expression. This fixes the > breakage of all Python-based qemu-iotests cases that was introduced in > commit dab91d9aa0. > > Signed-off-by: Kevin Wolf > --- > > Eduardo, I think I'm going to include this patch in a block layer pull > request today, just to stop the CI spam I'm getting, so the CC is just > FYI. No problem, thanks for fixing it. I incorrectly assumed "make check" was covering that code path. Sorry for the mess. > > scripts/qemu.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/qemu.py b/scripts/qemu.py > index 8c67595ec8..5e02dd8e78 100644 > --- a/scripts/qemu.py > +++ b/scripts/qemu.py > @@ -193,8 +193,8 @@ class QEMUMachine(object): > qemulog = open(self._qemu_log_path, 'wb') > try: > self._pre_launch() > - self._qemu_full_args = self._wrapper + [self._binary] + > - self._base_args() + self._args > + self._qemu_full_args = (self._wrapper + [self._binary] + > + self._base_args() + self._args) > self._popen = subprocess.Popen(self._qemu_full_args, > stdin=devnull, > stdout=qemulog, > -- > 2.13.5 > -- Eduardo