Re: [Qemu-devel] [PATCH RFC v3 09/14] iotests: maintain several vms in test

[John Snow]

On 02/18/2015 09:00 AM, Vladimir Sementsov-Ogievskiy wrote:
> The only problem with it is the same qmp socket name (which is
> vm._monitor_path) for all vms. And because of this second vm couldn't be
> lauched (vm.launch() fails because of socket is already in use).
> This patch adds a number of vm into vm._monitor_path
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
> ---
>   tests/qemu-iotests/iotests.py | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index cf5faac..fa756b4 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -77,16 +77,18 @@ def create_image(name, size):
>
>   class VM(object):
>       '''A QEMU VM'''
> +    nb_vms = 0
>
>       def __init__(self):
> -        self._monitor_path = os.path.join(test_dir, 'qemu-mon.%d' % 
> os.getpid())
> -        self._qemu_log_path = os.path.join(test_dir, 'qemu-log.%d' % 
> os.getpid())
> +        self._monitor_path = os.path.join(test_dir, 'qemu-mon.%d.%d' % 
> (os.getpid(), VM.nb_vms))
> +        self._qemu_log_path = os.path.join(test_dir, 'qemu-log.%d.%d' % 
> (os.getpid(), VM.nb_vms))
>           self._args = qemu_args + ['-chardev',
>                        'socket,id=mon,path=' + self._monitor_path,
>                        '-mon', 'chardev=mon,mode=control',
>                        '-qtest', 'stdio', '-machine', 'accel=qtest',
>                        '-display', 'none', '-vga', 'none']
>           self._num_drives = 0
> +        VM.nb_vms += 1
>
>       # This can be used to add an unused monitor instance.
>       def add_monitor_telnet(self, ip, port):

Simple enough, thanks!

Reviewed-by: John Snow <address@hidden>