Re: [Qemu-devel] [PATCH v5 05/11] iotests: allow resume_drive by node name

[Max Reitz <mreitz@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 2556 bytes --]

On 29.12.18 13:20, Vladimir Sementsov-Ogievskiy wrote:
> After node graph changes, we may not be able to resume_drive by device
> name (backing files are not recursively searched). So, lets allow to
> resume by node-name. Set constant name for breakpoints, to avoid
> introducing extra parameters.

Hm, I don't quite understand this reason.  Is this so you can create
breakpoints on one node (which falls through to the first blkdebug node)
and then remove them from another (falling through to the same blkdebug
node)?

Wouldn't it be better to let the user specify the breakpoint name?

Max

> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>  tests/qemu-iotests/iotests.py | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 76877ad584..c9779f432f 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -415,11 +415,11 @@ class VM(qtest.QEMUQtestMachine):
>              self.pause_drive(drive, "write_aio")
>              return
>          self.qmp('human-monitor-command',
> -                    command_line='qemu-io %s "break %s bp_%s"' % (drive, event, drive))
> +                    command_line='qemu-io %s "break %s bp_0"' % (drive, event))
>  
>      def resume_drive(self, drive):
>          self.qmp('human-monitor-command',
> -                    command_line='qemu-io %s "remove_break bp_%s"' % (drive, drive))
> +                    command_line='qemu-io %s "remove_break bp_0"' % (drive))
>  
>      def hmp_qemu_io(self, drive, cmd):
>          '''Write to a given drive using an HMP command'''
> @@ -543,13 +543,14 @@ class QMPTestCase(unittest.TestCase):
>          self.assertEqual(self.vm.flatten_qmp_object(json.loads(json_filename[5:])),
>                           self.vm.flatten_qmp_object(reference))
>  
> -    def cancel_and_wait(self, drive='drive0', force=False, resume=False):
> +    def cancel_and_wait(self, drive='drive0', force=False, resume=False,
> +                        resume_node=None):
>          '''Cancel a block job and wait for it to finish, returning the event'''
>          result = self.vm.qmp('block-job-cancel', device=drive, force=force)
>          self.assert_qmp(result, 'return', {})
>  
>          if resume:
> -            self.vm.resume_drive(drive)
> +            self.vm.resume_drive(resume_node or drive)
>  
>          cancelled = False
>          result = None
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]