* [Qemu-devel] [PATCH] qemu.py: Fix syntax error
@ 2017-09-18 5:25 Kevin Wolf
2017-09-18 9:34 ` Stefan Hajnoczi
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Kevin Wolf @ 2017-09-18 5:25 UTC (permalink / raw)
To: qemu-block
Cc: kwolf, mreitz, famz, apahim, ldoktor, ehabkost, stefanha, armbru,
crosa, qemu-devel
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 <kwolf@redhat.com>
---
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.
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu.py: Fix syntax error
2017-09-18 5:25 [Qemu-devel] [PATCH] qemu.py: Fix syntax error Kevin Wolf
@ 2017-09-18 9:34 ` Stefan Hajnoczi
2017-09-18 9:40 ` Alex Bennée
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Stefan Hajnoczi @ 2017-09-18 9:34 UTC (permalink / raw)
To: Kevin Wolf
Cc: qemu-block, mreitz, famz, apahim, ldoktor, ehabkost, armbru,
crosa, qemu-devel
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 <kwolf@redhat.com>
> ---
>
> 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.
>
> scripts/qemu.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu.py: Fix syntax error
2017-09-18 5:25 [Qemu-devel] [PATCH] qemu.py: Fix syntax error Kevin Wolf
2017-09-18 9:34 ` Stefan Hajnoczi
@ 2017-09-18 9:40 ` Alex Bennée
2017-09-18 10:32 ` Peter Maydell
2017-09-18 11:49 ` Eduardo Habkost
3 siblings, 0 replies; 5+ messages in thread
From: Alex Bennée @ 2017-09-18 9:40 UTC (permalink / raw)
To: Kevin Wolf
Cc: qemu-block, ldoktor, famz, ehabkost, qemu-devel, stefanha, apahim,
armbru, mreitz, crosa
Kevin Wolf <kwolf@redhat.com> writes:
> 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 <kwolf@redhat.com>
Heh, just sent an identical patch.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>
> 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.
>
> 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,
--
Alex Bennée
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu.py: Fix syntax error
2017-09-18 5:25 [Qemu-devel] [PATCH] qemu.py: Fix syntax error Kevin Wolf
2017-09-18 9:34 ` Stefan Hajnoczi
2017-09-18 9:40 ` Alex Bennée
@ 2017-09-18 10:32 ` Peter Maydell
2017-09-18 11:49 ` Eduardo Habkost
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2017-09-18 10:32 UTC (permalink / raw)
To: Kevin Wolf
Cc: Qemu-block, Lukas Doktor, Fam Zheng, Eduardo Habkost,
QEMU Developers, Stefan Hajnoczi, Amador Pahim, Markus Armbruster,
Max Reitz, Cleber Rosa
On 18 September 2017 at 06:25, Kevin Wolf <kwolf@redhat.com> 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 <kwolf@redhat.com>
> ---
>
> 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.
Applied to master as a buildfix; thanks.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu.py: Fix syntax error
2017-09-18 5:25 [Qemu-devel] [PATCH] qemu.py: Fix syntax error Kevin Wolf
` (2 preceding siblings ...)
2017-09-18 10:32 ` Peter Maydell
@ 2017-09-18 11:49 ` Eduardo Habkost
3 siblings, 0 replies; 5+ messages in thread
From: Eduardo Habkost @ 2017-09-18 11:49 UTC (permalink / raw)
To: Kevin Wolf
Cc: qemu-block, mreitz, famz, apahim, ldoktor, stefanha, armbru,
crosa, qemu-devel
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 <kwolf@redhat.com>
> ---
>
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-09-18 11:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-18 5:25 [Qemu-devel] [PATCH] qemu.py: Fix syntax error Kevin Wolf
2017-09-18 9:34 ` Stefan Hajnoczi
2017-09-18 9:40 ` Alex Bennée
2017-09-18 10:32 ` Peter Maydell
2017-09-18 11:49 ` Eduardo Habkost
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).