diff options
author | Eric Blake <eblake@redhat.com> | 2015-11-18 01:52:55 -0700 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2015-12-17 08:21:27 +0100 |
commit | 5be5b7764f83cf9a535a22ecbd33710daf1fe210 (patch) | |
tree | 094248f844892ea5db23bbda9eb7ddc7cf1921ee /tests/qemu-iotests/077 | |
parent | a31939e6c854e26e391efaec49c9d7f796369bbb (diff) |
blkdebug: Avoid '.' in enum values
Our qapi conventions document that '.' should only be used in
the prefix of downstream names. BlkdebugEvent was a lone
exception to this. Changing this is not backwards compatible
to the 'blockdev-add' QMP command; however, that command is
not yet fully stable. It can also be argued that the testsuite
is the biggest user of blkdebug, and that any other user can
be taught to deal with the change by paying attention to
introspection results.
Done with:
$ for str in \
l1_grow.{alloc,write,activate}_table \
l2_alloc.{cow_read,write} \
refblock_alloc.{hookup,write,write_blocks,write_table,switch_table} \
pwritev_rmw.{head,after_head,tail,after_tail}; do
str1=$(echo "$str" | sed 's/\./\\./')
str2=$(echo "$str" | sed 's/\./_/')
git grep -l "$str1" | xargs -r sed -i "s/$str1/$str2/g"
done
followed by a manual touchup to test 77 to keep the test working.
Reported-by: Markus Armbruster <armbru@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-21-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/077')
-rwxr-xr-x | tests/qemu-iotests/077 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077 index 42a90850c7..8a7223fa46 100755 --- a/tests/qemu-iotests/077 +++ b/tests/qemu-iotests/077 @@ -63,7 +63,7 @@ EOF off=0x1000 for ev in "head" "after_head" "tail" "after_tail"; do cat <<EOF -break pwritev_rmw.$ev A +break pwritev_rmw_$ev A aio_write -P 10 $((off + 0x200)) 0x200 wait_break A aio_write -P 11 $((off + 0x400)) 0x200 @@ -76,7 +76,7 @@ done # Chained dependencies cat <<EOF -break pwritev_rmw.after_tail A +break pwritev_rmw_after_tail A aio_write -P 10 0x5000 0x200 wait_break A aio_write -P 11 0x5200 0x200 @@ -93,10 +93,10 @@ EOF # Overlapping multiple requests cat <<EOF -break pwritev_rmw.after_tail A +break pwritev_rmw_after_tail A aio_write -P 10 0x6000 0x200 wait_break A -break pwritev_rmw.after_head B +break pwritev_rmw_after_head B aio_write -P 10 0x7e00 0x200 wait_break B aio_write -P 11 0x6800 0x1000 @@ -107,10 +107,10 @@ aio_flush EOF cat <<EOF -break pwritev_rmw.after_tail A +break pwritev_rmw_after_tail A aio_write -P 10 0x8000 0x200 wait_break A -break pwritev_rmw.after_head B +break pwritev_rmw_after_head B aio_write -P 10 0x9e00 0x200 wait_break B aio_write -P 11 0x8800 0x1000 @@ -121,11 +121,11 @@ aio_flush EOF cat <<EOF -break pwritev_rmw.after_tail A +break pwritev_rmw_after_tail A aio_write -P 10 0xa000 0x200 wait_break A aio_write -P 11 0xa800 0x1000 -break pwritev_rmw.after_head B +break pwritev_rmw_after_head B aio_write -P 10 0xbe00 0x200 wait_break B resume A @@ -135,11 +135,11 @@ aio_flush EOF cat <<EOF -break pwritev_rmw.after_tail A +break pwritev_rmw_after_tail A aio_write -P 10 0xc000 0x200 wait_break A aio_write -P 11 0xc800 0x1000 -break pwritev_rmw.after_head B +break pwritev_rmw_after_head B aio_write -P 10 0xde00 0x200 wait_break B resume B @@ -150,7 +150,7 @@ EOF # Only RMW for the tail part cat <<EOF -break pwritev_rmw.after_tail A +break pwritev_rmw_after_tail A aio_write -P 10 0xe000 0x1800 wait_break A aio_write -P 11 0xf000 0xc00 @@ -163,7 +163,7 @@ cat <<EOF break pwritev A aio_write -P 10 0x10000 0x800 wait_break A -break pwritev_rmw.after_tail B +break pwritev_rmw_after_tail B aio_write -P 11 0x10000 0x400 break pwritev_done C resume A |