diff options
| author | Kevin Wolf | 2017-09-18 07:25:24 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-09-18 12:32:22 +0200 |
| commit | f75637badd76ae0f3bd51a128e1a2da0d2bb1d6b (patch) | |
| tree | 2a41cee5bbce4a38767433deb8139185331add9d | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170917' into staging (diff) | |
| download | qemu-f75637badd76ae0f3bd51a128e1a2da0d2bb1d6b.tar.gz qemu-f75637badd76ae0f3bd51a128e1a2da0d2bb1d6b.tar.xz qemu-f75637badd76ae0f3bd51a128e1a2da0d2bb1d6b.zip | |
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.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 20170918052524.4045-1-kwolf@redhat.com
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | scripts/qemu.py | 4 |
1 files 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, |