1. Patchew
  2. QEMU
  3. View series

[PATCH v5 00/16] iotests: use vm.cmd()

Vladimir Sementsov-Ogievskiy posted 16 patches 1 year, 2 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230215132547.1620575-1-vsementsov@yandex-team.ru
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
There is a newer version of this series
docs/devel/testing.rst                        |  10 +-
python/qemu/machine/machine.py                |  20 +-
python/qemu/qmp/legacy.py                     |  10 +-
python/qemu/qmp/protocol.py                   |   2 +-
python/qemu/qmp/qmp_client.py                 |   2 +-
python/qemu/qmp/qmp_shell.py                  |  20 +-
python/qemu/utils/qemu_ga_client.py           |   8 +-
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/vnc.py                          |  16 +-
tests/avocado/x86_cpu_model_versions.py       |  13 +-
tests/migration/guestperf/engine.py           | 150 +++---
tests/qemu-iotests/030                        | 168 +++---
tests/qemu-iotests/040                        | 171 +++----
tests/qemu-iotests/041                        | 482 ++++++++----------
tests/qemu-iotests/045                        |  15 +-
tests/qemu-iotests/055                        |  62 +--
tests/qemu-iotests/056                        |  77 ++-
tests/qemu-iotests/093                        |  42 +-
tests/qemu-iotests/118                        | 225 ++++----
tests/qemu-iotests/124                        | 102 ++--
tests/qemu-iotests/129                        |  14 +-
tests/qemu-iotests/132                        |   5 +-
tests/qemu-iotests/139                        |  45 +-
tests/qemu-iotests/147                        |  30 +-
tests/qemu-iotests/151                        |  56 +-
tests/qemu-iotests/152                        |   8 +-
tests/qemu-iotests/155                        |  55 +-
tests/qemu-iotests/165                        |   8 +-
tests/qemu-iotests/196                        |   3 +-
tests/qemu-iotests/205                        |   6 +-
tests/qemu-iotests/218                        | 105 ++--
tests/qemu-iotests/245                        | 245 ++++-----
tests/qemu-iotests/256                        |  34 +-
tests/qemu-iotests/257                        |  36 +-
tests/qemu-iotests/264                        |  31 +-
tests/qemu-iotests/281                        |  21 +-
tests/qemu-iotests/295                        |  16 +-
tests/qemu-iotests/296                        |  21 +-
tests/qemu-iotests/298                        |  13 +-
tests/qemu-iotests/300                        |  54 +-
tests/qemu-iotests/iotests.py                 |  25 +-
.../tests/export-incoming-iothread            |   6 +-
.../qemu-iotests/tests/graph-changes-while-io |   6 +-
tests/qemu-iotests/tests/image-fleecing       |   3 +-
.../tests/migrate-bitmaps-postcopy-test       |  33 +-
tests/qemu-iotests/tests/migrate-bitmaps-test |  45 +-
.../qemu-iotests/tests/migrate-during-backup  |  41 +-
.../qemu-iotests/tests/migration-permissions  |   9 +-
.../tests/mirror-ready-cancel-error           |  74 ++-
tests/qemu-iotests/tests/mirror-top-perms     |  16 +-
tests/qemu-iotests/tests/nbd-multiconn        |  12 +-
tests/qemu-iotests/tests/reopen-file          |   3 +-
.../qemu-iotests/tests/stream-error-on-reset  |   6 +-
tests/vm/basevm.py                            |   4 +-
72 files changed, 1196 insertions(+), 1622 deletions(-)
[PATCH v5 00/16] iotests: use vm.cmd()
Posted by Vladimir Sementsov-Ogievskiy 1 year, 2 months ago 
Hi all!

Let's get rid of pattern

    result = self.vm.qmp(...)
    self.assert_qmp(result, 'return', {})

And switch to just

    self.vm.cmd(...)

v5:
- include fixups by John
- fix 'make check-dev'
- split first patch into several [Daniel]


Vladimir Sementsov-Ogievskiy (16):
  python: fix superfluous-parens pylint error
  python: fix broad-exception-raised pylint error
  python/qemu/qmp/legacy: cmd(): drop cmd_id unused argument
  qmp_shell.py: _fill_completion() use .command() instead of .cmd()
  scripts/cpu-x86-uarch-abi.py: use .command() instead of .cmd()
  python: rename QEMUMonitorProtocol.cmd() to cmd_raw()
  python/qemu: rename command() to cmd()
  python/machine.py: upgrade vm.cmd() method
  iotests: QemuStorageDaemon: add cmd() method like in QEMUMachine.
  iotests: add some missed checks of qmp result
  iotests: refactor some common qmp result checks into generic pattern
  iotests: drop some occasional semicolons
  iotests: drop some extra ** in qmp() call
  iotests.py: pause_job(): drop return value
  tests/vm/basevm.py: use cmd() instead of qmp()
  python: use vm.cmd() instead of vm.qmp() where appropriate

 docs/devel/testing.rst                        |  10 +-
 python/qemu/machine/machine.py                |  20 +-
 python/qemu/qmp/legacy.py                     |  10 +-
 python/qemu/qmp/protocol.py                   |   2 +-
 python/qemu/qmp/qmp_client.py                 |   2 +-
 python/qemu/qmp/qmp_shell.py                  |  20 +-
 python/qemu/utils/qemu_ga_client.py           |   8 +-
 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/vnc.py                          |  16 +-
 tests/avocado/x86_cpu_model_versions.py       |  13 +-
 tests/migration/guestperf/engine.py           | 150 +++---
 tests/qemu-iotests/030                        | 168 +++---
 tests/qemu-iotests/040                        | 171 +++----
 tests/qemu-iotests/041                        | 482 ++++++++----------
 tests/qemu-iotests/045                        |  15 +-
 tests/qemu-iotests/055                        |  62 +--
 tests/qemu-iotests/056                        |  77 ++-
 tests/qemu-iotests/093                        |  42 +-
 tests/qemu-iotests/118                        | 225 ++++----
 tests/qemu-iotests/124                        | 102 ++--
 tests/qemu-iotests/129                        |  14 +-
 tests/qemu-iotests/132                        |   5 +-
 tests/qemu-iotests/139                        |  45 +-
 tests/qemu-iotests/147                        |  30 +-
 tests/qemu-iotests/151                        |  56 +-
 tests/qemu-iotests/152                        |   8 +-
 tests/qemu-iotests/155                        |  55 +-
 tests/qemu-iotests/165                        |   8 +-
 tests/qemu-iotests/196                        |   3 +-
 tests/qemu-iotests/205                        |   6 +-
 tests/qemu-iotests/218                        | 105 ++--
 tests/qemu-iotests/245                        | 245 ++++-----
 tests/qemu-iotests/256                        |  34 +-
 tests/qemu-iotests/257                        |  36 +-
 tests/qemu-iotests/264                        |  31 +-
 tests/qemu-iotests/281                        |  21 +-
 tests/qemu-iotests/295                        |  16 +-
 tests/qemu-iotests/296                        |  21 +-
 tests/qemu-iotests/298                        |  13 +-
 tests/qemu-iotests/300                        |  54 +-
 tests/qemu-iotests/iotests.py                 |  25 +-
 .../tests/export-incoming-iothread            |   6 +-
 .../qemu-iotests/tests/graph-changes-while-io |   6 +-
 tests/qemu-iotests/tests/image-fleecing       |   3 +-
 .../tests/migrate-bitmaps-postcopy-test       |  33 +-
 tests/qemu-iotests/tests/migrate-bitmaps-test |  45 +-
 .../qemu-iotests/tests/migrate-during-backup  |  41 +-
 .../qemu-iotests/tests/migration-permissions  |   9 +-
 .../tests/mirror-ready-cancel-error           |  74 ++-
 tests/qemu-iotests/tests/mirror-top-perms     |  16 +-
 tests/qemu-iotests/tests/nbd-multiconn        |  12 +-
 tests/qemu-iotests/tests/reopen-file          |   3 +-
 .../qemu-iotests/tests/stream-error-on-reset  |   6 +-
 tests/vm/basevm.py                            |   4 +-
 72 files changed, 1196 insertions(+), 1622 deletions(-)

-- 
2.34.1
Re: [PATCH v5 00/16] iotests: use vm.cmd()
Posted by Vladimir Sementsov-Ogievskiy 10 months, 3 weeks ago 
ping. 03-16 are still applicable to master with "git am -3" and very small conflict in "iotests: QemuStorageDaemon: add cmd() method like in QEMUMachine."

On 15.02.23 16:25, Vladimir Sementsov-Ogievskiy wrote:
> Hi all!
> 
> Let's get rid of pattern
> 
>      result = self.vm.qmp(...)
>      self.assert_qmp(result, 'return', {})
> 
> And switch to just
> 
>      self.vm.cmd(...)
> 
> v5:
> - include fixups by John
> - fix 'make check-dev'
> - split first patch into several [Daniel]
> 
> 
> Vladimir Sementsov-Ogievskiy (16):
>    python: fix superfluous-parens pylint error
>    python: fix broad-exception-raised pylint error
>    python/qemu/qmp/legacy: cmd(): drop cmd_id unused argument
>    qmp_shell.py: _fill_completion() use .command() instead of .cmd()
>    scripts/cpu-x86-uarch-abi.py: use .command() instead of .cmd()
>    python: rename QEMUMonitorProtocol.cmd() to cmd_raw()
>    python/qemu: rename command() to cmd()
>    python/machine.py: upgrade vm.cmd() method
>    iotests: QemuStorageDaemon: add cmd() method like in QEMUMachine.
>    iotests: add some missed checks of qmp result
>    iotests: refactor some common qmp result checks into generic pattern
>    iotests: drop some occasional semicolons
>    iotests: drop some extra ** in qmp() call
>    iotests.py: pause_job(): drop return value
>    tests/vm/basevm.py: use cmd() instead of qmp()
>    python: use vm.cmd() instead of vm.qmp() where appropriate
> 
>   docs/devel/testing.rst                        |  10 +-
>   python/qemu/machine/machine.py                |  20 +-
>   python/qemu/qmp/legacy.py                     |  10 +-
>   python/qemu/qmp/protocol.py                   |   2 +-
>   python/qemu/qmp/qmp_client.py                 |   2 +-
>   python/qemu/qmp/qmp_shell.py                  |  20 +-
>   python/qemu/utils/qemu_ga_client.py           |   8 +-
>   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/vnc.py                          |  16 +-
>   tests/avocado/x86_cpu_model_versions.py       |  13 +-
>   tests/migration/guestperf/engine.py           | 150 +++---
>   tests/qemu-iotests/030                        | 168 +++---
>   tests/qemu-iotests/040                        | 171 +++----
>   tests/qemu-iotests/041                        | 482 ++++++++----------
>   tests/qemu-iotests/045                        |  15 +-
>   tests/qemu-iotests/055                        |  62 +--
>   tests/qemu-iotests/056                        |  77 ++-
>   tests/qemu-iotests/093                        |  42 +-
>   tests/qemu-iotests/118                        | 225 ++++----
>   tests/qemu-iotests/124                        | 102 ++--
>   tests/qemu-iotests/129                        |  14 +-
>   tests/qemu-iotests/132                        |   5 +-
>   tests/qemu-iotests/139                        |  45 +-
>   tests/qemu-iotests/147                        |  30 +-
>   tests/qemu-iotests/151                        |  56 +-
>   tests/qemu-iotests/152                        |   8 +-
>   tests/qemu-iotests/155                        |  55 +-
>   tests/qemu-iotests/165                        |   8 +-
>   tests/qemu-iotests/196                        |   3 +-
>   tests/qemu-iotests/205                        |   6 +-
>   tests/qemu-iotests/218                        | 105 ++--
>   tests/qemu-iotests/245                        | 245 ++++-----
>   tests/qemu-iotests/256                        |  34 +-
>   tests/qemu-iotests/257                        |  36 +-
>   tests/qemu-iotests/264                        |  31 +-
>   tests/qemu-iotests/281                        |  21 +-
>   tests/qemu-iotests/295                        |  16 +-
>   tests/qemu-iotests/296                        |  21 +-
>   tests/qemu-iotests/298                        |  13 +-
>   tests/qemu-iotests/300                        |  54 +-
>   tests/qemu-iotests/iotests.py                 |  25 +-
>   .../tests/export-incoming-iothread            |   6 +-
>   .../qemu-iotests/tests/graph-changes-while-io |   6 +-
>   tests/qemu-iotests/tests/image-fleecing       |   3 +-
>   .../tests/migrate-bitmaps-postcopy-test       |  33 +-
>   tests/qemu-iotests/tests/migrate-bitmaps-test |  45 +-
>   .../qemu-iotests/tests/migrate-during-backup  |  41 +-
>   .../qemu-iotests/tests/migration-permissions  |   9 +-
>   .../tests/mirror-ready-cancel-error           |  74 ++-
>   tests/qemu-iotests/tests/mirror-top-perms     |  16 +-
>   tests/qemu-iotests/tests/nbd-multiconn        |  12 +-
>   tests/qemu-iotests/tests/reopen-file          |   3 +-
>   .../qemu-iotests/tests/stream-error-on-reset  |   6 +-
>   tests/vm/basevm.py                            |   4 +-
>   72 files changed, 1196 insertions(+), 1622 deletions(-)
> 

-- 
Best regards,
Vladimir
Re: [PATCH v5 00/16] iotests: use vm.cmd()
Posted by Vladimir Sementsov-Ogievskiy 1 year ago 
On 15.02.23 16:25, Vladimir Sementsov-Ogievskiy wrote:
> Hi all!
> 
> Let's get rid of pattern
> 
>      result = self.vm.qmp(...)
>      self.assert_qmp(result, 'return', {})
> 
> And switch to just
> 
>      self.vm.cmd(...)
> 
> v5:
> - include fixups by John
> - fix 'make check-dev'
> - split first patch into several [Daniel]

Ping.

Patches 1-2 (or their equivalence) are already merged, patches 03-16 are applicable on current master, I don't think it worth resending a v6 just to drop 1-2.

-- 
Best regards,
Vladimir

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.