diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2019-02-25 15:16:57 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2019-02-25 15:16:57 +0100 |
| commit | 1b967e9f348d48788a2ab481d45398b80ce71fa6 (patch) | |
| tree | 2e82fcbdb5617c9b7741ec4a9676904507356a94 /scripts/qemu.py | |
| parent | 83c68e149a9365a3db6de751f219ad1d79928462 (diff) | |
| parent | 6a4e88e17966a963ee818daab3d0c9fa6bf73903 (diff) | |
| download | qemu-1b967e9f348d48788a2ab481d45398b80ce71fa6.zip qemu-1b967e9f348d48788a2ab481d45398b80ce71fa6.tar.gz qemu-1b967e9f348d48788a2ab481d45398b80ce71fa6.tar.bz2 | |
Merge remote-tracking branch 'mreitz/tags/pull-block-2019-02-25' into queue-block
Block patches:
- Fix various issues with bdrv_refresh_filename()
- Fix various iotests
- Include LUKS overhead in qemu-img measure for qcow2
- A fix for vmdk's image creation interface
# gpg: Signature made Mon Feb 25 15:13:43 2019 CET
# gpg: using RSA key F407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* mreitz/tags/pull-block-2019-02-25: (45 commits)
iotests: Skip 211 on insufficient memory
vmdk: false positive of compat6 with hwversion not set
iotests: add LUKS payload overhead to 178 qemu-img measure test
qcow2: include LUKS payload overhead in qemu-img measure
iotests.py: s/_/-/g on keys in qmp_log()
iotests: Let 045 be run concurrently
iotests: Filter SSH paths
iotests.py: Filter filename in any string value
iotests.py: Add is_str()
iotests: Fix 207 to use QMP filters for qmp_log
iotests: Fix 232 for LUKS
iotests: Remove superfluous rm from 232
iotests: Fix 237 for Python 2.x
iotests: Re-add filename filters
iotests: Test json:{} filenames of internal BDSs
block: BDS options may lack the "driver" option
block/null: Generate filename even with latency-ns
block/curl: Implement bdrv_refresh_filename()
block/curl: Harmonize option defaults
block/nvme: Fix bdrv_refresh_filename()
...
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'scripts/qemu.py')
| -rw-r--r-- | scripts/qemu.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/qemu.py b/scripts/qemu.py index 32b00af..f7269ee 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -144,10 +144,9 @@ class QEMUMachine(object): return False # This can be used to add an unused monitor instance. - def add_monitor_telnet(self, ip, port): - args = 'tcp:%s:%d,server,nowait,telnet' % (ip, port) + def add_monitor_null(self): self._args.append('-monitor') - self._args.append(args) + self._args.append('null') def add_fd(self, fd, fdset, opaque, opts=''): """ |