Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into...

Python patches

New functionality in qmp-shell from Dan, and some packaging fixes.

# gpg: Signature made Wed 23 Feb 2022 22:08:35 GMT
# gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <[email protected]>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jsnow-gitlab/tags/python-pull-request:
  MAINTAINERS: python - remove ehabkost and add bleal
  Revert "python: pin setuptools below v60.0.0"
  Python: add setuptools v60.0 workaround
  Python: discourage direct setup.py install
  python: support recording QMP session to a file
  python: introduce qmp-shell-wrap convenience tool

Signed-off-by: Peter Maydell <[email protected]>

diff --combined MAINTAINERS
index 37c0110d888b95a2ce952bc84f76967bf8da143a,62bc185d1082bf6f8877e9f714fcba04805fc1c2..fa8adc2618a46a2fa3abd6f2c192ed6e7cf49e57
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2747,13 -2747,13 +2747,13 @@@ F: backends/cryptodev*.
  Python library
  M: John Snow <[email protected]>
  M: Cleber Rosa <[email protected]>
- R: Eduardo Habkost <[email protected]>
+ R: Beraldo Leal <[email protected]>
  S: Maintained
  F: python/
  T: git https://gitlab.com/jsnow/qemu.git python
  
  Python scripts
- M: Eduardo Habkost <[email protected]>
+ M: John Snow <[email protected]>
  M: Cleber Rosa <[email protected]>
  S: Odd Fixes
  F: scripts/*.py
@@@ -2990,11 -2990,10 +2990,11 @@@ F: docs/sphinx/fakedbusdoc.p
  F: tests/qtest/dbus*
  
  Seccomp
 -M: Eduardo Otubo <otubo@redhat.com>
 -S: Supported
 +M: Daniel P. Berrange <berrange@redhat.com>
 +S: Odd Fixes
  F: softmmu/qemu-seccomp.c
  F: include/sysemu/seccomp.h
 +F: tests/unit/test-seccomp.c
  
  Cryptography
  M: Daniel P. Berrange <[email protected]>