diff options
| author | Peter Maydell | 2018-03-13 17:26:44 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-03-13 17:26:44 +0100 |
| commit | 026aaf47c02b79036feb830206cfebb2a726510d (patch) | |
| tree | 60f01ed4169ce4b7b2c58d27e6d5acdf54433562 /scripts/qemu.py | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' in... (diff) | |
| parent | device-crash-test: Use 'python' binary (diff) | |
| download | qemu-026aaf47c02b79036feb830206cfebb2a726510d.tar.gz qemu-026aaf47c02b79036feb830206cfebb2a726510d.tar.xz qemu-026aaf47c02b79036feb830206cfebb2a726510d.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2018-03-12
# gpg: Signature made Mon 12 Mar 2018 22:10:36 GMT
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/python-next-pull-request:
device-crash-test: Use 'python' binary
qmp.py: Encode json data before sending
qemu.py: Use items() instead of iteritems()
device-crash-test: New known crashes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qemu.py')
| -rw-r--r-- | scripts/qemu.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qemu.py b/scripts/qemu.py index 305a946562..08a3e9af5a 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -277,7 +277,7 @@ class QEMUMachine(object): def qmp(self, cmd, conv_keys=True, **args): '''Invoke a QMP command and return the response dict''' qmp_args = dict() - for key, value in args.iteritems(): + for key, value in args.items(): if conv_keys: qmp_args[key.replace('_', '-')] = value else: |