>
> From: Victor Toso <me@xxxxxxxxxxxxxx>
>
> Not supported feature to be tested so reduce unused/untested code for
> now.
>
> Signed-off-by: Victor Toso <victortoso@xxxxxxxxxx>
> ---
> tests/migrate.py | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/tests/migrate.py b/tests/migrate.py
> index 5cbc8218..31593c8a 100755
> --- a/tests/migrate.py
> +++ b/tests/migrate.py
> @@ -54,7 +54,6 @@ def get_args():
> parser.add_argument('--spice_port1', dest='spice_port1', type=int,
> default=5911)
> parser.add_argument('--spice_port2', dest='spice_port2', type=int,
> default=6911)
> parser.add_argument('--migrate_port', dest='migrate_port', type=int,
> default=8000)
> - parser.add_argument('--client_count', dest='client_count', type=int,
> default=1)
> parser.add_argument('--qemu', dest='qemu',
> default='../../qemu/x86_64-softmmu/qemu-system-x86_64')
> parser.add_argument('--log_filename', dest='log_filename',
> default='migrate.log')
> parser.add_argument('--image', dest='image', default='')
> @@ -134,14 +133,13 @@ class Migrator(object):
>
> migration_count = 0
>
> - def __init__(self, log, client, qemu_exec, image, monitor_files,
> client_count,
> + def __init__(self, log, client, qemu_exec, image, monitor_files,
> spice_ports, migration_port, vdagent):
> self.client = client
> self.log = log
> self.qemu_exec = qemu_exec
> self.image = image
> self.migration_port = migration_port
> - self.client_count = client_count
> self.monitor_files = monitor_files
> self.spice_ports = spice_ports
> self.vdagent = vdagent
> @@ -174,13 +172,13 @@ class Migrator(object):
> wait_active(self.active.qmp, True)
> wait_active(self.target.qmp, False)
> if len(self.clients) == 0:
> - for i in range(self.client_count):
> - self.clients.append(start_client(client=self.client,
> - spice_port=self.spice_ports[0]))
> - wait_for_event(self.active.qmp, 'SPICE_INITIALIZED')
> + self.clients.append(start_client(client=self.client,
> + spice_port=self.spice_ports[0]))
Weird to have a "clients" with just one client, but "client" is already
taken
> + wait_for_event(self.active.qmp, 'SPICE_INITIALIZED')
> if wait_for_user_input:
> print "waiting for Enter to start migrations"
> raw_input()
> +
> self.active.qmp.cmd('client_migrate_info', {'protocol':'spice',
> 'hostname':'localhost', 'port':self.target.spice_port})
> self.active.qmp.cmd('migrate', {'uri': 'tcp:localhost:%s' %
> self.migration_port})
> @@ -212,7 +210,7 @@ def main():
> migrator = Migrator(client=args.client, qemu_exec=args.qemu_exec,
> image=args.image, log=log, monitor_files=[args.qmp1, args.qmp2],
> migration_port=args.migrate_port, spice_ports=[args.spice_port1,
> - args.spice_port2], client_count=args.client_count,
> vdagent=(args.vdagent=='on'))
> + args.spice_port2], vdagent=(args.vdagent=='on'))
> atexit.register(cleanup, migrator)
> while True:
> migrator.iterate()
Otherwise,
Acked-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel