| Message ID | 1402167080-20316-12-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 06/07/2014 12:51 PM, Max Reitz wrote: > As different image formats most probably map guest addresses to > different host addresses, add a filter to filter the host addresses out; > also, the image filename should be filtered. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/common.filter | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter > index a04df7f..8b14edb 100644 > --- a/tests/qemu-iotests/common.filter > +++ b/tests/qemu-iotests/common.filter > @@ -170,5 +170,12 @@ _filter_qmp() > -e 's#^{"QMP":.*}$#QMP_VERSION#' > } > > +# filter out offsets and file names from qemu-img map > +_filter_qemu_img_map() > +{ > + sed -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \ The 'g' modifier to the s/// is not necessary, since there are no lines output by 'qemu-img map' that contain more than 3 hex numbers. But it doesn't hurt either. > + -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt > +} A cut by column number may have been shorter to write, but this does indeed appear to do the trick for all but a perverse person that names their backing files with substrings that include something like '/path/to/Mapped to gotcha/'. Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index a04df7f..8b14edb 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -170,5 +170,12 @@ _filter_qmp() -e 's#^{"QMP":.*}$#QMP_VERSION#' } +# filter out offsets and file names from qemu-img map +_filter_qemu_img_map() +{ + sed -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \ + -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt +} + # make sure this script returns success /bin/true
As different image formats most probably map guest addresses to different host addresses, add a filter to filter the host addresses out; also, the image filename should be filtered. Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/common.filter | 7 +++++++ 1 file changed, 7 insertions(+)