Skip to contentSkip to conversation

qemu.py: Fix syntax error

PATCH In review Kevin Wolf 5 participants 5 messages Sep 18, 2017

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

PATCH 1/1 qemu.py: Fix syntax error

Python requires parentheses around multiline expression. This fixes the breakage of all Python-based qemu-iotests cases that was introduced in commit dab91d9aa0.

---

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(-)
scripts/qemu.py +2 -2
index 8c67595ec8..5e02dd8e78 100644
@@ -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,
Signature · 1 line
2.13.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Kevin Wolf

Python requires parentheses around multiline expression. This fixes the breakage of all Python-based qemu-iotests cases that was introduced in commit dab91d9aa0.

Quoted 8 lines

---

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 Tested-by on v1 1/1
#2 lore raw
In reply to Kevin Wolf
Quoted 5 lines · Kevin Wolf

Python requires parentheses around multiline expression. This fixes the breakage of all Python-based qemu-iotests cases that was introduced in commit dab91d9aa0.

Heh, just sent an identical patch.

Quoted 14 lines

---

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(-)
scripts/qemu.py +0 -0
index 8c67595ec8..5e02dd8e78 100644

scripts/qemu.py class QEMUMachine(object): · line 200

Quoted 10 lines
scripts/qemu.py +2 -2
@@ -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

#3 lore raw
In reply to Kevin Wolf
Quoted 10 lines · Kevin Wolf

Python requires parentheses around multiline expression. This fixes the breakage of all Python-based qemu-iotests cases that was introduced in commit dab91d9aa0.

---

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

#4 lore raw
In reply to Kevin Wolf
Quoted 10 lines · Kevin Wolf

Python requires parentheses around multiline expression. This fixes the breakage of all Python-based qemu-iotests cases that was introduced in commit dab91d9aa0.

---

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.

Quoted 22 lines
 scripts/qemu.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/qemu.py +2 -2
index 8c67595ec8..5e02dd8e78 100644
@@ -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,
Signature · 1 line
2.13.5
Signature · 1 line
Eduardo