diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-12-07 07:35:31 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-12-07 07:35:31 -0800 |
| commit | 93531372f0f74bb4d886480c0c8aa0e4ca6f5423 (patch) | |
| tree | be13df35b2e689f031eef40bc06311b91bfc3548 /tests/qemu-iotests/common.filter | |
| parent | 0c0cb6a2378f937410f5f55cbf3e3b2c20f293c6 (diff) | |
| parent | ac9524dc55dc32e492ac3e6fbc9785be7168f8a2 (diff) | |
| download | focaccia-qemu-93531372f0f74bb4d886480c0c8aa0e4ca6f5423.tar.gz focaccia-qemu-93531372f0f74bb4d886480c0c8aa0e4ca6f5423.zip | |
Merge remote-tracking branch 'stefanha/block' into staging
# By Paolo Bonzini (17) and others # Via Stefan Hajnoczi * stefanha/block: (48 commits) qemu-iotests: filter QEMU monitor \r\n aio: make aio_poll(ctx, true) block with no fds block: clean up bdrv_drain_all() throttling comments qcow2: use start_of_cluster() and offset_into_cluster() everywhere qemu-img: decrease progress update interval on convert qemu-img: round down request length to an aligned sector qemu-img: dynamically adjust iobuffer size during convert block/iscsi: set bs->bl.opt_transfer_length block: add opt_transfer_length to BlockLimits block/iscsi: set bdi->cluster_size qemu-img: fix usage instruction for qemu-img convert qemu-img: add support for skipping zeroes in input during convert qemu-nbd: add doc for option -f qemu-iotests: add test for snapshot in qemu-img convert qemu-img: add -l for snapshot in convert qemu-iotests: add 058 internal snapshot export with qemu-nbd case qemu-nbd: support internal snapshot export snapshot: distinguish id and name in load_tmp qemu-iotests: Split qcow2 only cases in 048 qemu-iotests: Clean up spaces in usage output ... Message-id: 1386347807-27359-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'tests/qemu-iotests/common.filter')
| -rw-r--r-- | tests/qemu-iotests/common.filter | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 9c82c77a81..776985d15e 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -157,7 +157,8 @@ _filter_qemu_io() _filter_qemu() { sed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#" \ - -e 's#^QEMU [0-9]\+\.[0-9]\+\.[0-9]\+ monitor#QEMU X.Y.Z monitor#' + -e 's#^QEMU [0-9]\+\.[0-9]\+\.[0-9]\+ monitor#QEMU X.Y.Z monitor#' \ + -e $'s#\r##' # QEMU monitor uses \r\n line endings } # replace problematic QMP output like timestamps |