From nobody Wed Feb 11 04:06:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1676467613; cv=none; d=zohomail.com; s=zohoarc; b=WE4Gv34Dgx7N8V4CQdSISjAcnNfQVbBLLYCTK+JSuGBKylGVCR+zlgQomnRfrpxo/4ufyWGxsMrD8xo8cuK6LQKa0QIe7hNWMt4QZ09qNCZjk+5jhdeZZyohO6RPEvKRiBgj2MxVwP6IMuulnErodL9x2VHTB4UiVszmqXaIefw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676467613; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iCywJMbm/EgLTESvzU1Z0RcLowbDtU6hJh52rif+Qqc=; b=FZ0Z2rsSyhz9i4Cwfj8vHs3VaTzZ9ZAaDMV/y4IUg1iZubCppZl9l3HA3ndxCMt5rQIQEQtRkcbQMT8ss7X6IjpFUxzftJJw9xD6trI2XhHvQMhHJVwMzDTNtuGh3Riwsu3ZkfbfgD4qU0jpVx6vJB5eyc9v4531rI9RJQnkDGc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676467613631305.2937524256894; Wed, 15 Feb 2023 05:26:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSHne-0002bm-1b; Wed, 15 Feb 2023 08:26:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pSHnb-0002Yz-JM for qemu-devel@nongnu.org; Wed, 15 Feb 2023 08:26:15 -0500 Received: from forwardcorp1a.mail.yandex.net ([2a02:6b8:c0e:500:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pSHnW-0006E2-Je for qemu-devel@nongnu.org; Wed, 15 Feb 2023 08:26:15 -0500 Received: from vla5-b2806cb321eb.qloud-c.yandex.net (vla5-b2806cb321eb.qloud-c.yandex.net [IPv6:2a02:6b8:c18:3e0d:0:640:b280:6cb3]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTP id 9E19B6006A; Wed, 15 Feb 2023 16:26:03 +0300 (MSK) Received: from vsementsov-win.yandex-team.ru (unknown [2a02:6b8:b081:b4bf::1:2e]) by vla5-b2806cb321eb.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id nPk8g80UxeA1-nGHPR37I; Wed, 15 Feb 2023 16:26:02 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1676467562; bh=iCywJMbm/EgLTESvzU1Z0RcLowbDtU6hJh52rif+Qqc=; h=Cc:Message-Id:References:Date:In-Reply-To:Subject:To:From; b=eTJg4YvKOhna4+EvzQ+UfNYdqcXbI6il4pNhDke6weR+xx1vjuoJnZPf38WVlNrZx +xgIBLC8gpGxm5jeftDb7d+v4arPj4FOZ2LzPYJ3i7FUpCWsEUFMXdyDSnjZXTICy1 kUm3JWX9IilQrYdrfGemgLSqK2Wx/AJ2DiL9RCIM= Authentication-Results: vla5-b2806cb321eb.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@yandex-team.ru, jsnow@redhat.com, crosa@redhat.com, kwolf@redhat.com, hreitz@redhat.com, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v5 07/16] python/qemu: rename command() to cmd() Date: Wed, 15 Feb 2023 16:25:38 +0300 Message-Id: <20230215132547.1620575-8-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230215132547.1620575-1-vsementsov@yandex-team.ru> References: <20230215132547.1620575-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a02:6b8:c0e:500:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1676467615758100003 Use a shorter name. We are going to move in iotests from qmp() to command() where possible. But command() is longer than qmp() and don't look better. Let's rename. You can simply grep for '\.command(' and for 'def command(' to check that everything is updated (command() in tests/docker/docker.py is unrelated). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/devel/testing.rst | 10 +- python/qemu/machine/machine.py | 8 +- python/qemu/qmp/legacy.py | 2 +- python/qemu/qmp/qmp_shell.py | 2 +- python/qemu/utils/qemu_ga_client.py | 2 +- python/qemu/utils/qom.py | 8 +- python/qemu/utils/qom_common.py | 2 +- python/qemu/utils/qom_fuse.py | 6 +- scripts/cpu-x86-uarch-abi.py | 8 +- scripts/device-crash-test | 8 +- scripts/render_block_graph.py | 8 +- tests/avocado/avocado_qemu/__init__.py | 4 +- tests/avocado/cpu_queries.py | 5 +- tests/avocado/hotplug_cpu.py | 10 +- tests/avocado/info_usernet.py | 4 +- tests/avocado/machine_arm_integratorcp.py | 6 +- tests/avocado/machine_m68k_nextcube.py | 4 +- tests/avocado/machine_mips_malta.py | 6 +- tests/avocado/machine_s390_ccw_virtio.py | 28 ++-- tests/avocado/migration.py | 10 +- tests/avocado/pc_cpu_hotplug_props.py | 2 +- tests/avocado/version.py | 4 +- tests/avocado/virtio_check_params.py | 6 +- tests/avocado/virtio_version.py | 5 +- tests/avocado/x86_cpu_model_versions.py | 13 +- tests/migration/guestperf/engine.py | 150 +++++++++++----------- tests/qemu-iotests/256 | 34 ++--- tests/qemu-iotests/257 | 36 +++--- 28 files changed, 198 insertions(+), 193 deletions(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index e10c47b5a7..e3d7bb218c 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -988,8 +988,8 @@ class. Here's a simple usage example: """ def test_qmp_human_info_version(self): self.vm.launch() - res =3D self.vm.command('human-monitor-command', - command_line=3D'info version') + res =3D self.vm.cmd('human-monitor-command', + command_line=3D'info version') self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)') =20 To execute your test, run: @@ -1039,15 +1039,15 @@ and hypothetical example follows: first_machine.launch() second_machine.launch() =20 - first_res =3D first_machine.command( + first_res =3D first_machine.cmd( 'human-monitor-command', command_line=3D'info version') =20 - second_res =3D second_machine.command( + second_res =3D second_machine.cmd( 'human-monitor-command', command_line=3D'info version') =20 - third_res =3D self.get_vm(name=3D'third_machine').command( + third_res =3D self.get_vm(name=3D'third_machine').cmd( 'human-monitor-command', command_line=3D'info version') =20 diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index 0428eec50c..3b01607769 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -688,16 +688,16 @@ def qmp(self, cmd: str, self._quit_issued =3D True return ret =20 - def command(self, cmd: str, - conv_keys: bool =3D True, - **args: Any) -> QMPReturnValue: + def cmd(self, cmd: str, + conv_keys: bool =3D True, + **args: Any) -> QMPReturnValue: """ Invoke a QMP command. On success return the response dict. On failure raise an exception. """ qmp_args =3D self._qmp_args(conv_keys, args) - ret =3D self._qmp.command(cmd, **qmp_args) + ret =3D self._qmp.cmd(cmd, **qmp_args) if cmd =3D=3D 'quit': self._quit_issued =3D True return ret diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py index 5552f4ebb4..d4e39b1bb2 100644 --- a/python/qemu/qmp/legacy.py +++ b/python/qemu/qmp/legacy.py @@ -211,7 +211,7 @@ def cmd_raw(self, name: str, qmp_cmd['arguments'] =3D args return self.cmd_obj(qmp_cmd) =20 - def command(self, cmd: str, **kwds: object) -> QMPReturnValue: + def cmd(self, cmd: str, **kwds: object) -> QMPReturnValue: """ Build and send a QMP command to the monitor, report errors if any """ diff --git a/python/qemu/qmp/qmp_shell.py b/python/qemu/qmp/qmp_shell.py index 988d79c01b..98e684e9e8 100644 --- a/python/qemu/qmp/qmp_shell.py +++ b/python/qemu/qmp/qmp_shell.py @@ -202,7 +202,7 @@ def close(self) -> None: =20 def _fill_completion(self) -> None: try: - cmds =3D cast(List[Dict[str, str]], self.command('query-comman= ds')) + cmds =3D cast(List[Dict[str, str]], self.cmd('query-commands')) for cmd in cmds: self._completer.append(cmd['name']) except ExecuteError: diff --git a/python/qemu/utils/qemu_ga_client.py b/python/qemu/utils/qemu_g= a_client.py index d8411bb2d0..9a665e6e99 100644 --- a/python/qemu/utils/qemu_ga_client.py +++ b/python/qemu/utils/qemu_ga_client.py @@ -64,7 +64,7 @@ class QemuGuestAgent(QEMUMonitorProtocol): def __getattr__(self, name: str) -> Callable[..., Any]: def wrapper(**kwds: object) -> object: - return self.command('guest-' + name.replace('_', '-'), **kwds) + return self.cmd('guest-' + name.replace('_', '-'), **kwds) return wrapper =20 =20 diff --git a/python/qemu/utils/qom.py b/python/qemu/utils/qom.py index bcf192f477..426a0f245f 100644 --- a/python/qemu/utils/qom.py +++ b/python/qemu/utils/qom.py @@ -84,7 +84,7 @@ def __init__(self, args: argparse.Namespace): self.value =3D args.value =20 def run(self) -> int: - rsp =3D self.qmp.command( + rsp =3D self.qmp.cmd( 'qom-set', path=3Dself.path, property=3Dself.prop, @@ -129,7 +129,7 @@ def __init__(self, args: argparse.Namespace): self.prop =3D tmp[1] =20 def run(self) -> int: - rsp =3D self.qmp.command( + rsp =3D self.qmp.cmd( 'qom-get', path=3Dself.path, property=3Dself.prop @@ -231,8 +231,8 @@ def _list_node(self, path: str) -> None: if item.child: continue try: - rsp =3D self.qmp.command('qom-get', path=3Dpath, - property=3Ditem.name) + rsp =3D self.qmp.cmd('qom-get', path=3Dpath, + property=3Ditem.name) print(f" {item.name}: {rsp} ({item.type})") except ExecuteError as err: print(f" {item.name}: ({item.type})") diff --git a/python/qemu/utils/qom_common.py b/python/qemu/utils/qom_common= .py index 80da1b2304..dd2c8b1908 100644 --- a/python/qemu/utils/qom_common.py +++ b/python/qemu/utils/qom_common.py @@ -140,7 +140,7 @@ def qom_list(self, path: str) -> List[ObjectPropertyInf= o]: """ :return: a strongly typed list from the 'qom-list' command. """ - rsp =3D self.qmp.command('qom-list', path=3Dpath) + rsp =3D self.qmp.cmd('qom-list', path=3Dpath) # qom-list returns List[ObjectPropertyInfo] assert isinstance(rsp, list) return [ObjectPropertyInfo.make(x) for x in rsp] diff --git a/python/qemu/utils/qom_fuse.py b/python/qemu/utils/qom_fuse.py index 8dcd59fcde..cf7e344bd5 100644 --- a/python/qemu/utils/qom_fuse.py +++ b/python/qemu/utils/qom_fuse.py @@ -137,7 +137,7 @@ def read(self, path: str, size: int, offset: int, fh: I= O[bytes]) -> bytes: if path =3D=3D '': path =3D '/' try: - data =3D str(self.qmp.command('qom-get', path=3Dpath, property= =3Dprop)) + data =3D str(self.qmp.cmd('qom-get', path=3Dpath, property=3Dp= rop)) data +=3D '\n' # make values shell friendly except ExecuteError as err: raise FuseOSError(EPERM) from err @@ -152,8 +152,8 @@ def readlink(self, path: str) -> Union[bool, str]: return False path, prop =3D path.rsplit('/', 1) prefix =3D '/'.join(['..'] * (len(path.split('/')) - 1)) - return prefix + str(self.qmp.command('qom-get', path=3Dpath, - property=3Dprop)) + return prefix + str(self.qmp.cmd('qom-get', path=3Dpath, + property=3Dprop)) =20 def getattr(self, path: str, fh: Optional[IO[bytes]] =3D None) -> Mapping[str, object]: diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py index 893afd1b35..f6baeeff24 100644 --- a/scripts/cpu-x86-uarch-abi.py +++ b/scripts/cpu-x86-uarch-abi.py @@ -69,7 +69,7 @@ shell =3D QEMUMonitorProtocol(sock) shell.connect() =20 -models =3D shell.command("query-cpu-definitions") +models =3D shell.cmd("query-cpu-definitions") =20 # These QMP props don't correspond to CPUID fatures # so ignore them @@ -93,9 +93,9 @@ models =3D {} =20 for name in sorted(names): - cpu =3D shell.command("query-cpu-model-expansion", - { "type": "static", - "model": { "name": name }}) + cpu =3D shell.cmd("query-cpu-model-expansion", + { "type": "static", + "model": { "name": name }}) =20 got =3D {} for (feature, present) in cpu["model"]["props"].items(): diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 73bcb98693..3a01425868 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -269,14 +269,14 @@ def formatTestCase(t): =20 def qomListTypeNames(vm, **kwargs): """Run qom-list-types QMP command, return type names""" - types =3D vm.command('qom-list-types', **kwargs) + types =3D vm.cmd('qom-list-types', **kwargs) return [t['name'] for t in types] =20 =20 def infoQDM(vm): """Parse 'info qdm' output""" args =3D {'command-line': 'info qdm'} - devhelp =3D vm.command('human-monitor-command', **args) + devhelp =3D vm.cmd('human-monitor-command', **args) for l in devhelp.split('\n'): l =3D l.strip() if l =3D=3D '' or l.endswith(':'): @@ -304,9 +304,9 @@ class QemuBinaryInfo(object): # there's no way to query DeviceClass::user_creatable using QM= P, # so use 'info qdm': self.no_user_devs =3D set([d['name'] for d in infoQDM(vm, ) if= d['no-user']]) - self.machines =3D list(m['name'] for m in vm.command('query-ma= chines')) + self.machines =3D list(m['name'] for m in vm.cmd('query-machin= es')) self.user_devs =3D self.alldevs.difference(self.no_user_devs) - self.kvm_available =3D vm.command('query-kvm')['enabled'] + self.kvm_available =3D vm.cmd('query-kvm')['enabled'] finally: vm.shutdown() =20 diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py index 8f731a5cfe..3e1a2e3fa7 100755 --- a/scripts/render_block_graph.py +++ b/scripts/render_block_graph.py @@ -43,13 +43,13 @@ def render_block_graph(qmp, filename, format=3D'png'): representation in @format into "@filename.@format" ''' =20 - bds_nodes =3D qmp.command('query-named-block-nodes') + bds_nodes =3D qmp.cmd('query-named-block-nodes') bds_nodes =3D {n['node-name']: n for n in bds_nodes} =20 - job_nodes =3D qmp.command('query-block-jobs') + job_nodes =3D qmp.cmd('query-block-jobs') job_nodes =3D {n['device']: n for n in job_nodes} =20 - block_graph =3D qmp.command('x-debug-query-block-graph') + block_graph =3D qmp.cmd('x-debug-query-block-graph') =20 graph =3D Digraph(comment=3D'Block Nodes Graph') graph.format =3D format @@ -94,7 +94,7 @@ class LibvirtGuest(): def __init__(self, name): self.name =3D name =20 - def command(self, cmd): + def cmd(self, cmd): # only supports qmp commands without parameters m =3D {'execute': cmd} ar =3D ['virsh', 'qemu-monitor-command', self.name, json.dumps(m)] diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index 25a546842f..5ab2e0d23a 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -381,8 +381,8 @@ class LinuxSSHMixIn: =20 def ssh_connect(self, username, credential, credential_is_key=3DTrue): self.ssh_logger =3D logging.getLogger('ssh') - res =3D self.vm.command('human-monitor-command', - command_line=3D'info usernet') + res =3D self.vm.cmd('human-monitor-command', + command_line=3D'info usernet') port =3D get_info_usernet_hostfwd_port(res) self.assertIsNotNone(port) self.assertGreater(port, 0) diff --git a/tests/avocado/cpu_queries.py b/tests/avocado/cpu_queries.py index cf69f69b11..86c2d5c92d 100644 --- a/tests/avocado/cpu_queries.py +++ b/tests/avocado/cpu_queries.py @@ -23,12 +23,13 @@ def test(self): self.vm.add_args('-S') self.vm.launch() =20 - cpus =3D self.vm.command('query-cpu-definitions') + cpus =3D self.vm.cmd('query-cpu-definitions') for c in cpus: self.log.info("Checking CPU: %s", c) self.assertNotIn('', c['unavailable-features'], c['name']) =20 for c in cpus: model =3D {'name': c['name']} - e =3D self.vm.command('query-cpu-model-expansion', model=3Dmod= el, type=3D'full') + e =3D self.vm.cmd('query-cpu-model-expansion', model=3Dmodel, + type=3D'full') self.assertEquals(e['model']['name'], c['name']) diff --git a/tests/avocado/hotplug_cpu.py b/tests/avocado/hotplug_cpu.py index 6374bf1b54..292bb43e4d 100644 --- a/tests/avocado/hotplug_cpu.py +++ b/tests/avocado/hotplug_cpu.py @@ -29,9 +29,9 @@ def test(self): with self.assertRaises(AssertionError): self.ssh_command('test -e /sys/devices/system/cpu/cpu1') =20 - self.vm.command('device_add', - driver=3D'Haswell-x86_64-cpu', - socket_id=3D0, - core_id=3D1, - thread_id=3D0) + self.vm.cmd('device_add', + driver=3D'Haswell-x86_64-cpu', + socket_id=3D0, + core_id=3D1, + thread_id=3D0) self.ssh_command('test -e /sys/devices/system/cpu/cpu1') diff --git a/tests/avocado/info_usernet.py b/tests/avocado/info_usernet.py index fdc4d90c42..e1aa7a6e0a 100644 --- a/tests/avocado/info_usernet.py +++ b/tests/avocado/info_usernet.py @@ -22,8 +22,8 @@ def test_hostfwd(self): self.require_netdev('user') self.vm.add_args('-netdev', 'user,id=3Dvnet,hostfwd=3D:127.0.0.1:0= -:22') self.vm.launch() - res =3D self.vm.command('human-monitor-command', - command_line=3D'info usernet') + res =3D self.vm.cmd('human-monitor-command', + command_line=3D'info usernet') port =3D get_info_usernet_hostfwd_port(res) self.assertIsNotNone(port, ('"info usernet" output content does not seem= to ' diff --git a/tests/avocado/machine_arm_integratorcp.py b/tests/avocado/mach= ine_arm_integratorcp.py index 1ffe1073ef..87f5cf3953 100644 --- a/tests/avocado/machine_arm_integratorcp.py +++ b/tests/avocado/machine_arm_integratorcp.py @@ -81,9 +81,9 @@ def test_framebuffer_tux_logo(self): self.boot_integratorcp() framebuffer_ready =3D 'Console: switching to colour frame buffer d= evice' wait_for_console_pattern(self, framebuffer_ready) - self.vm.command('human-monitor-command', command_line=3D'stop') - self.vm.command('human-monitor-command', - command_line=3D'screendump %s' % screendump_path) + self.vm.cmd('human-monitor-command', command_line=3D'stop') + self.vm.cmd('human-monitor-command', + command_line=3D'screendump %s' % screendump_path) logger =3D logging.getLogger('framebuffer') =20 cpu_count =3D 1 diff --git a/tests/avocado/machine_m68k_nextcube.py b/tests/avocado/machine= _m68k_nextcube.py index 6790e7d9cd..d6da2fbb01 100644 --- a/tests/avocado/machine_m68k_nextcube.py +++ b/tests/avocado/machine_m68k_nextcube.py @@ -43,8 +43,8 @@ def check_bootrom_framebuffer(self, screenshot_path): # 'displaysurface_create 1120x832' trace-event. time.sleep(2) =20 - self.vm.command('human-monitor-command', - command_line=3D'screendump %s' % screenshot_path) + self.vm.cmd('human-monitor-command', + command_line=3D'screendump %s' % screenshot_path) =20 @skipUnless(PIL_AVAILABLE, 'Python PIL not installed') def test_bootrom_framebuffer_size(self): diff --git a/tests/avocado/machine_mips_malta.py b/tests/avocado/machine_mi= ps_malta.py index 92233451c5..9bd54518bf 100644 --- a/tests/avocado/machine_mips_malta.py +++ b/tests/avocado/machine_mips_malta.py @@ -71,9 +71,9 @@ def do_test_i6400_framebuffer_logo(self, cpu_cores_count): framebuffer_ready =3D 'Console: switching to colour frame buffer d= evice' wait_for_console_pattern(self, framebuffer_ready, failure_message=3D'Kernel panic - not syn= cing') - self.vm.command('human-monitor-command', command_line=3D'stop') - self.vm.command('human-monitor-command', - command_line=3D'screendump %s' % screendump_path) + self.vm.cmd('human-monitor-command', command_line=3D'stop') + self.vm.cmd('human-monitor-command', + command_line=3D'screendump %s' % screendump_path) logger =3D logging.getLogger('framebuffer') =20 match_threshold =3D 0.95 diff --git a/tests/avocado/machine_s390_ccw_virtio.py b/tests/avocado/machi= ne_s390_ccw_virtio.py index 78152f2ad1..aac4731a6c 100644 --- a/tests/avocado/machine_s390_ccw_virtio.py +++ b/tests/avocado/machine_s390_ccw_virtio.py @@ -107,10 +107,10 @@ def test_s390x_devices(self): 'dd if=3D/dev/hwrng of=3D/dev/null bs=3D1k count= =3D10', '10+0 records out') self.clear_guest_dmesg() - self.vm.command('device_del', id=3D'rn1') + self.vm.cmd('device_del', id=3D'rn1') self.wait_for_crw_reports() self.clear_guest_dmesg() - self.vm.command('device_del', id=3D'rn2') + self.vm.cmd('device_del', id=3D'rn2') self.wait_for_crw_reports() exec_command_and_wait_for_pattern(self, 'dd if=3D/dev/hwrng of=3D/dev/null bs=3D1k count= =3D10', @@ -132,8 +132,8 @@ def test_s390x_devices(self): '0x0000000c') # add another device self.clear_guest_dmesg() - self.vm.command('device_add', driver=3D'virtio-net-ccw', - devno=3D'fe.0.4711', id=3D'net_4711') + self.vm.cmd('device_add', driver=3D'virtio-net-ccw', + devno=3D'fe.0.4711', id=3D'net_4711') self.wait_for_crw_reports() exec_command_and_wait_for_pattern(self, 'for i in 1 2 3 4 5 6 7 ; = do ' 'if [ -e /sys/bus/ccw/devices/*4711 ]; then break; fi = ;' @@ -141,7 +141,7 @@ def test_s390x_devices(self): '0.0.4711') # and detach it again self.clear_guest_dmesg() - self.vm.command('device_del', id=3D'net_4711') + self.vm.cmd('device_del', id=3D'net_4711') self.vm.event_wait(name=3D'DEVICE_DELETED', match=3D{'data': {'device': 'net_4711'}}) self.wait_for_crw_reports() @@ -151,10 +151,10 @@ def test_s390x_devices(self): # test the virtio-balloon device exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo', 'MemTotal: 115640 kB') - self.vm.command('human-monitor-command', command_line=3D'balloon 9= 6') + self.vm.cmd('human-monitor-command', command_line=3D'balloon 96') exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo', 'MemTotal: 82872 kB') - self.vm.command('human-monitor-command', command_line=3D'balloon 1= 28') + self.vm.cmd('human-monitor-command', command_line=3D'balloon 128') exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo', 'MemTotal: 115640 kB') =20 @@ -244,7 +244,7 @@ def test_s390x_fedora(self): '12+0 records out') with tempfile.NamedTemporaryFile(suffix=3D'.ppm', prefix=3D'qemu-scrdump-') as ppmf= ile: - self.vm.command('screendump', filename=3Dppmfile.name) + self.vm.cmd('screendump', filename=3Dppmfile.name) ppmfile.seek(0) line =3D ppmfile.readline() self.assertEqual(line, b"P6\n") @@ -258,16 +258,16 @@ def test_s390x_fedora(self): # Hot-plug a virtio-crypto device and see whether it gets accepted self.log.info("Test hot-plug virtio-crypto device") self.clear_guest_dmesg() - self.vm.command('object-add', qom_type=3D'cryptodev-backend-builti= n', - id=3D'cbe0') - self.vm.command('device_add', driver=3D'virtio-crypto-ccw', id=3D'= crypdev0', - cryptodev=3D'cbe0', devno=3D'fe.0.2342') + self.vm.cmd('object-add', qom_type=3D'cryptodev-backend-builtin', + id=3D'cbe0') + self.vm.cmd('device_add', driver=3D'virtio-crypto-ccw', id=3D'cryp= dev0', + cryptodev=3D'cbe0', devno=3D'fe.0.2342') exec_command_and_wait_for_pattern(self, 'while ! (dmesg -c | grep Accelerator.device) ; do' ' sleep 1 ; done', 'Accelerator device is ready') exec_command_and_wait_for_pattern(self, 'lscss', '0.0.2342') - self.vm.command('device_del', id=3D'crypdev0') - self.vm.command('object-del', id=3D'cbe0') + self.vm.cmd('device_del', id=3D'crypdev0') + self.vm.cmd('object-del', id=3D'cbe0') exec_command_and_wait_for_pattern(self, 'while ! (dmesg -c | grep Start.virtcrypto_remove)= ; do' ' sleep 1 ; done', 'Start virtcrypto_remove.') diff --git a/tests/avocado/migration.py b/tests/avocado/migration.py index 4b25680c50..8dda9f7f81 100644 --- a/tests/avocado/migration.py +++ b/tests/avocado/migration.py @@ -28,7 +28,7 @@ class Migration(QemuSystemTest): =20 @staticmethod def migration_finished(vm): - return vm.command('query-migrate')['status'] in ('completed', 'fai= led') + return vm.cmd('query-migrate')['status'] in ('completed', 'failed') =20 def assert_migration(self, src_vm, dst_vm): wait.wait_for(self.migration_finished, @@ -39,10 +39,10 @@ def assert_migration(self, src_vm, dst_vm): timeout=3Dself.timeout, step=3D0.1, args=3D(dst_vm,)) - self.assertEqual(src_vm.command('query-migrate')['status'], 'compl= eted') - self.assertEqual(dst_vm.command('query-migrate')['status'], 'compl= eted') - self.assertEqual(dst_vm.command('query-status')['status'], 'runnin= g') - self.assertEqual(src_vm.command('query-status')['status'],'postmig= rate') + self.assertEqual(src_vm.cmd('query-migrate')['status'], 'completed= ') + self.assertEqual(dst_vm.cmd('query-migrate')['status'], 'completed= ') + self.assertEqual(dst_vm.cmd('query-status')['status'], 'running') + self.assertEqual(src_vm.cmd('query-status')['status'],'postmigrate= ') =20 def do_migrate(self, dest_uri, src_uri=3DNone): dest_vm =3D self.get_vm('-incoming', dest_uri) diff --git a/tests/avocado/pc_cpu_hotplug_props.py b/tests/avocado/pc_cpu_h= otplug_props.py index 52b878188e..b56f51d02a 100644 --- a/tests/avocado/pc_cpu_hotplug_props.py +++ b/tests/avocado/pc_cpu_hotplug_props.py @@ -32,4 +32,4 @@ def test_no_die_id(self): self.vm.add_args('-smp', '1,sockets=3D2,cores=3D2,threads=3D2,maxc= pus=3D8') self.vm.add_args('-device', 'qemu64-x86_64-cpu,socket-id=3D1,core-= id=3D0,thread-id=3D0') self.vm.launch() - self.assertEquals(len(self.vm.command('query-cpus-fast')), 2) + self.assertEquals(len(self.vm.cmd('query-cpus-fast')), 2) diff --git a/tests/avocado/version.py b/tests/avocado/version.py index ded7f039c1..b8ce739743 100644 --- a/tests/avocado/version.py +++ b/tests/avocado/version.py @@ -19,6 +19,6 @@ class Version(QemuSystemTest): def test_qmp_human_info_version(self): self.vm.add_args('-nodefaults') self.vm.launch() - res =3D self.vm.command('human-monitor-command', - command_line=3D'info version') + res =3D self.vm.cmd('human-monitor-command', + command_line=3D'info version') self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)') diff --git a/tests/avocado/virtio_check_params.py b/tests/avocado/virtio_ch= eck_params.py index 4093da8a67..f4314ef824 100644 --- a/tests/avocado/virtio_check_params.py +++ b/tests/avocado/virtio_check_params.py @@ -51,8 +51,8 @@ def query_virtqueue(self, vm, dev_type_name): error =3D None props =3D None =20 - output =3D vm.command('human-monitor-command', - command_line =3D 'info qtree') + output =3D vm.cmd('human-monitor-command', + command_line =3D 'info qtree') props_list =3D DEV_TYPES[dev_type_name].values(); pattern =3D self.make_pattern(props_list) res =3D re.findall(pattern, output) @@ -121,7 +121,7 @@ def test_machine_types(self): # collect all machine types except 'none', 'isapc', 'microvm' with QEMUMachine(self.qemu_bin) as vm: vm.launch() - machines =3D [m['name'] for m in vm.command('query-machines')] + machines =3D [m['name'] for m in vm.cmd('query-machines')] vm.shutdown() machines.remove('none') machines.remove('isapc') diff --git a/tests/avocado/virtio_version.py b/tests/avocado/virtio_version= .py index c84e48813a..afe5e828b5 100644 --- a/tests/avocado/virtio_version.py +++ b/tests/avocado/virtio_version.py @@ -48,7 +48,8 @@ def pci_modern_device_id(virtio_devid): return virtio_devid + 0x1040 =20 def devtype_implements(vm, devtype, implements): - return devtype in [d['name'] for d in vm.command('qom-list-types', imp= lements=3Dimplements)] + return devtype in [d['name'] for d in + vm.cmd('qom-list-types', implements=3Dimplements)] =20 def get_pci_interfaces(vm, devtype): interfaces =3D ('pci-express-device', 'conventional-pci-device') @@ -78,7 +79,7 @@ def run_device(self, devtype, opts=3DNone, machine=3D'pc'= ): vm.add_args('-S') vm.launch() =20 - pcibuses =3D vm.command('query-pci') + pcibuses =3D vm.cmd('query-pci') alldevs =3D [dev for bus in pcibuses for dev in bus['devices']] devfortest =3D [dev for dev in alldevs if dev['qdev_id'] =3D=3D 'devfortest'] diff --git a/tests/avocado/x86_cpu_model_versions.py b/tests/avocado/x86_cp= u_model_versions.py index a6edf74c1c..9e07b8a55d 100644 --- a/tests/avocado/x86_cpu_model_versions.py +++ b/tests/avocado/x86_cpu_model_versions.py @@ -84,7 +84,8 @@ def test_4_0_alias_compatibility(self): # with older QEMU versions that didn't have the versioned CPU model self.vm.add_args('-S') self.vm.launch() - cpus =3D dict((m['name'], m) for m in self.vm.command('query-cpu-d= efinitions')) + cpus =3D dict((m['name'], m) for m in + self.vm.cmd('query-cpu-definitions')) =20 self.assertFalse(cpus['Cascadelake-Server']['static'], 'unversioned Cascadelake-Server CPU model must no= t be static') @@ -115,7 +116,8 @@ def test_4_1_alias(self): self.vm.add_args('-S') self.vm.launch() =20 - cpus =3D dict((m['name'], m) for m in self.vm.command('query-cpu-d= efinitions')) + cpus =3D dict((m['name'], m) for m in + self.vm.cmd('query-cpu-definitions')) =20 self.assertFalse(cpus['Cascadelake-Server']['static'], 'unversioned Cascadelake-Server CPU model must no= t be static') @@ -220,7 +222,8 @@ def test_none_alias(self): self.vm.add_args('-S') self.vm.launch() =20 - cpus =3D dict((m['name'], m) for m in self.vm.command('query-cpu-d= efinitions')) + cpus =3D dict((m['name'], m) for m in + self.vm.cmd('query-cpu-definitions')) =20 self.assertFalse(cpus['Cascadelake-Server']['static'], 'unversioned Cascadelake-Server CPU model must no= t be static') @@ -246,8 +249,8 @@ class CascadelakeArchCapabilities(avocado_qemu.QemuSyst= emTest): :avocado: tags=3Darch:x86_64 """ def get_cpu_prop(self, prop): - cpu_path =3D self.vm.command('query-cpus-fast')[0].get('qom-path') - return self.vm.command('qom-get', path=3Dcpu_path, property=3Dprop) + cpu_path =3D self.vm.cmd('query-cpus-fast')[0].get('qom-path') + return self.vm.cmd('qom-get', path=3Dcpu_path, property=3Dprop) =20 def test_4_1(self): """ diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestper= f/engine.py index cc06fac592..846cd2f637 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -77,7 +77,7 @@ def _cpu_timing(self, pid): return TimingRecord(pid, now, 1000 * (stime + utime) / jiffies= _per_sec) =20 def _migrate_progress(self, vm): - info =3D vm.command("query-migrate") + info =3D vm.cmd("query-migrate") =20 if "ram" not in info: info["ram"] =3D {} @@ -109,7 +109,7 @@ def _migrate(self, hardware, scenario, src, dst, connec= t_uri): src_vcpu_time =3D [] src_pid =3D src.get_pid() =20 - vcpus =3D src.command("query-cpus-fast") + vcpus =3D src.cmd("query-cpus-fast") src_threads =3D [] for vcpu in vcpus: src_threads.append(vcpu["thread-id"]) @@ -128,82 +128,82 @@ def _migrate(self, hardware, scenario, src, dst, conn= ect_uri): if self._verbose: print("Starting migration") if scenario._auto_converge: - resp =3D src.command("migrate-set-capabilities", - capabilities =3D [ - { "capability": "auto-converge", - "state": True } - ]) - resp =3D src.command("migrate-set-parameters", - cpu_throttle_increment=3Dscenario._auto_con= verge_step) + resp =3D src.cmd("migrate-set-capabilities", + capabilities =3D [ + { "capability": "auto-converge", + "state": True } + ]) + resp =3D src.cmd("migrate-set-parameters", + cpu_throttle_increment=3Dscenario._auto_converg= e_step) =20 if scenario._post_copy: - resp =3D src.command("migrate-set-capabilities", - capabilities =3D [ - { "capability": "postcopy-ram", - "state": True } - ]) - resp =3D dst.command("migrate-set-capabilities", - capabilities =3D [ - { "capability": "postcopy-ram", - "state": True } - ]) - - resp =3D src.command("migrate-set-parameters", - max_bandwidth=3Dscenario._bandwidth * 1024 * 10= 24) - - resp =3D src.command("migrate-set-parameters", - downtime_limit=3Dscenario._downtime) + resp =3D src.cmd("migrate-set-capabilities", + capabilities =3D [ + { "capability": "postcopy-ram", + "state": True } + ]) + resp =3D dst.cmd("migrate-set-capabilities", + capabilities =3D [ + { "capability": "postcopy-ram", + "state": True } + ]) + + resp =3D src.cmd("migrate-set-parameters", + max_bandwidth=3Dscenario._bandwidth * 1024 * 1024) + + resp =3D src.cmd("migrate-set-parameters", + downtime_limit=3Dscenario._downtime) =20 if scenario._compression_mt: - resp =3D src.command("migrate-set-capabilities", - capabilities =3D [ - { "capability": "compress", - "state": True } - ]) - resp =3D src.command("migrate-set-parameters", - compress_threads=3Dscenario._compression_mt= _threads) - resp =3D dst.command("migrate-set-capabilities", - capabilities =3D [ - { "capability": "compress", - "state": True } - ]) - resp =3D dst.command("migrate-set-parameters", - decompress_threads=3Dscenario._compression_= mt_threads) + resp =3D src.cmd("migrate-set-capabilities", + capabilities =3D [ + { "capability": "compress", + "state": True } + ]) + resp =3D src.cmd("migrate-set-parameters", + compress_threads=3Dscenario._compression_mt_thr= eads) + resp =3D dst.cmd("migrate-set-capabilities", + capabilities =3D [ + { "capability": "compress", + "state": True } + ]) + resp =3D dst.cmd("migrate-set-parameters", + decompress_threads=3Dscenario._compression_mt_t= hreads) =20 if scenario._compression_xbzrle: - resp =3D src.command("migrate-set-capabilities", - capabilities =3D [ - { "capability": "xbzrle", - "state": True } - ]) - resp =3D dst.command("migrate-set-capabilities", - capabilities =3D [ - { "capability": "xbzrle", - "state": True } - ]) - resp =3D src.command("migrate-set-parameters", - xbzrle_cache_size=3D( - hardware._mem * - 1024 * 1024 * 1024 / 100 * - scenario._compression_xbzrle_cache)) + resp =3D src.cmd("migrate-set-capabilities", + capabilities =3D [ + { "capability": "xbzrle", + "state": True } + ]) + resp =3D dst.cmd("migrate-set-capabilities", + capabilities =3D [ + { "capability": "xbzrle", + "state": True } + ]) + resp =3D src.cmd("migrate-set-parameters", + xbzrle_cache_size=3D( + hardware._mem * + 1024 * 1024 * 1024 / 100 * + scenario._compression_xbzrle_cache)) =20 if scenario._multifd: - resp =3D src.command("migrate-set-capabilities", - capabilities =3D [ - { "capability": "multifd", - "state": True } - ]) - resp =3D src.command("migrate-set-parameters", - multifd_channels=3Dscenario._multifd_channe= ls) - resp =3D dst.command("migrate-set-capabilities", - capabilities =3D [ - { "capability": "multifd", - "state": True } - ]) - resp =3D dst.command("migrate-set-parameters", - multifd_channels=3Dscenario._multifd_channe= ls) - - resp =3D src.command("migrate", uri=3Dconnect_uri) + resp =3D src.cmd("migrate-set-capabilities", + capabilities =3D [ + { "capability": "multifd", + "state": True } + ]) + resp =3D src.cmd("migrate-set-parameters", + multifd_channels=3Dscenario._multifd_channels) + resp =3D dst.cmd("migrate-set-capabilities", + capabilities =3D [ + { "capability": "multifd", + "state": True } + ]) + resp =3D dst.cmd("migrate-set-parameters", + multifd_channels=3Dscenario._multifd_channels) + + resp =3D src.cmd("migrate", uri=3Dconnect_uri) =20 post_copy =3D False paused =3D False @@ -228,7 +228,7 @@ def _migrate(self, hardware, scenario, src, dst, connec= t_uri): =20 if progress._status in ("completed", "failed", "cancelled"): if progress._status =3D=3D "completed" and paused: - dst.command("cont") + dst.cmd("cont") if progress_history[-1] !=3D progress: progress_history.append(progress) =20 @@ -256,13 +256,13 @@ def _migrate(self, hardware, scenario, src, dst, conn= ect_uri): if progress._ram._iterations > scenario._max_iters: if self._verbose: print("No completion after %d iterations over RAM" % s= cenario._max_iters) - src.command("migrate_cancel") + src.cmd("migrate_cancel") continue =20 if time.time() > (start + scenario._max_time): if self._verbose: print("No completion after %d seconds" % scenario._max= _time) - src.command("migrate_cancel") + src.cmd("migrate_cancel") continue =20 if (scenario._post_copy and @@ -270,7 +270,7 @@ def _migrate(self, hardware, scenario, src, dst, connec= t_uri): not post_copy): if self._verbose: print("Switching to post-copy after %d iterations" % s= cenario._post_copy_iters) - resp =3D src.command("migrate-start-postcopy") + resp =3D src.cmd("migrate-start-postcopy") post_copy =3D True =20 if (scenario._pause and @@ -278,7 +278,7 @@ def _migrate(self, hardware, scenario, src, dst, connec= t_uri): not paused): if self._verbose: print("Pausing VM after %d iterations" % scenario._pau= se_iters) - resp =3D src.command("stop") + resp =3D src.cmd("stop") paused =3D True =20 def _is_ppc64le(self): diff --git a/tests/qemu-iotests/256 b/tests/qemu-iotests/256 index 13666813bd..fffc8ef055 100755 --- a/tests/qemu-iotests/256 +++ b/tests/qemu-iotests/256 @@ -40,25 +40,25 @@ with iotests.FilePath('img0') as img0_path, \ def create_target(filepath, name, size): basename =3D os.path.basename(filepath) nodename =3D "file_{}".format(basename) - log(vm.command('blockdev-create', job_id=3D'job1', - options=3D{ - 'driver': 'file', - 'filename': filepath, - 'size': 0, - })) + log(vm.cmd('blockdev-create', job_id=3D'job1', + options=3D{ + 'driver': 'file', + 'filename': filepath, + 'size': 0, + })) vm.run_job('job1') - log(vm.command('blockdev-add', driver=3D'file', - node_name=3Dnodename, filename=3Dfilepath)) - log(vm.command('blockdev-create', job_id=3D'job2', - options=3D{ - 'driver': iotests.imgfmt, - 'file': nodename, - 'size': size, - })) + log(vm.cmd('blockdev-add', driver=3D'file', + node_name=3Dnodename, filename=3Dfilepath)) + log(vm.cmd('blockdev-create', job_id=3D'job2', + options=3D{ + 'driver': iotests.imgfmt, + 'file': nodename, + 'size': size, + })) vm.run_job('job2') - log(vm.command('blockdev-add', driver=3Diotests.imgfmt, - node_name=3Dname, - file=3Dnodename)) + log(vm.cmd('blockdev-add', driver=3Diotests.imgfmt, + node_name=3Dname, + file=3Dnodename)) =20 log('--- Preparing images & VM ---\n') vm.add_object('iothread,id=3Diothread0') diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257 index e7e7a2317e..7d3720b8e5 100755 --- a/tests/qemu-iotests/257 +++ b/tests/qemu-iotests/257 @@ -160,26 +160,26 @@ class Drive: file_node_name =3D "file_{}".format(basename) vm =3D self.vm =20 - log(vm.command('blockdev-create', job_id=3D'bdc-file-job', - options=3D{ - 'driver': 'file', - 'filename': self.path, - 'size': 0, - })) + log(vm.cmd('blockdev-create', job_id=3D'bdc-file-job', + options=3D{ + 'driver': 'file', + 'filename': self.path, + 'size': 0, + })) vm.run_job('bdc-file-job') - log(vm.command('blockdev-add', driver=3D'file', - node_name=3Dfile_node_name, filename=3Dself.path)) - - log(vm.command('blockdev-create', job_id=3D'bdc-fmt-job', - options=3D{ - 'driver': fmt, - 'file': file_node_name, - 'size': size, - })) + log(vm.cmd('blockdev-add', driver=3D'file', + node_name=3Dfile_node_name, filename=3Dself.path)) + + log(vm.cmd('blockdev-create', job_id=3D'bdc-fmt-job', + options=3D{ + 'driver': fmt, + 'file': file_node_name, + 'size': size, + })) vm.run_job('bdc-fmt-job') - log(vm.command('blockdev-add', driver=3Dfmt, - node_name=3Dname, - file=3Dfile_node_name)) + log(vm.cmd('blockdev-add', driver=3Dfmt, + node_name=3Dname, + file=3Dfile_node_name)) self.fmt =3D fmt self.size =3D size self.node =3D name --=20 2.34.1