Merge tag 'pull-request-2023-10-12' of https://gitlab.com/thuth/qemu into staging

* Fix CVE-2023-1544
* Deprecate the rdma code
* Fix flaky npcm7xx_timer test
* i2c-echo license statement and Kconfig switch
* Disable the failing riscv64-debian-cross CI job by default

* tag 'pull-request-2023-10-12' of https://gitlab.com/thuth/qemu:
  gitlab-ci: Disable the riscv64-debian-cross-container by default
  MAINTAINERS: Add include/sysemu/qtest.h to the qtest section
  hw/misc/Kconfig: add switch for i2c-echo
  hw/misc/i2c-echo: add copyright/license note
  tests/qtest: Fix npcm7xx_timer-test.c flaky test
  hw/rdma: Deprecate the pvrdma device and the rdma subsystem
  hw/pvrdma: Protect against buggy or malicious guest driver

Conflicts:
  docs/about/deprecated.rst
  Context conflict between RISC-V and RDMA deprecation.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc docs/about/deprecated.rst
index 1c4d7f36f0e468a401191102767967b67016e689,ffd0a8c89612e9c1ac32b264b944850475f6fc39..2febd2d12f252a12f0a96a1235c1d40542b4784a
--- 1/docs/about/deprecated.rst
--- 2/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@@ -327,42 -327,15 +327,51 @@@ QEMU's ``vhost`` feature, which would e
  which the 9p ``proxy`` backend currently suffers. However as of to date nobody
  has indicated plans for such kind of reimplementation unfortunately.
  
 +RISC-V 'any' CPU type ``-cpu any`` (since 8.2)
 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 +
 +The 'any' CPU type was introduced back in 2018 and has been around since the
 +initial RISC-V QEMU port. Its usage has always been unclear: users don't know
 +what to expect from a CPU called 'any', and in fact the CPU does not do anything
 +special that isn't already done by the default CPUs rv32/rv64.
 +
 +After the introduction of the 'max' CPU type, RISC-V now has a good coverage
 +of generic CPUs: rv32 and rv64 as default CPUs and 'max' as a feature complete
 +CPU for both 32 and 64 bit builds. Users are then discouraged to use the 'any'
 +CPU type starting in 8.2.
 +
 +RISC-V CPU properties which start with capital 'Z' (since 8.2)
 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 +
 +All RISC-V CPU properties which start with capital 'Z' are being deprecated
 +starting in 8.2. The reason is that they were wrongly added with capital 'Z'
 +in the past. CPU properties were later added with lower-case names, which
 +is the format we want to use from now on.
 +
 +Users which try to use these deprecated properties will receive a warning
 +recommending to switch to their stable counterparts:
 +
 +- "Zifencei" should be replaced with "zifencei"
 +- "Zicsr" should be replaced with "zicsr"
 +- "Zihintntl" should be replaced with "zihintntl"
 +- "Zihintpause" should be replaced with "zihintpause"
 +- "Zawrs" should be replaced with "zawrs"
 +- "Zfa" should be replaced with "zfa"
 +- "Zfh" should be replaced with "zfh"
 +- "Zfhmin" should be replaced with "zfhmin"
 +- "Zve32f" should be replaced with "zve32f"
 +- "Zve64f" should be replaced with "zve64f"
 +- "Zve64d" should be replaced with "zve64d"
 +
+ ``-device pvrdma`` and the rdma subsystem (since 8.2)
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 
+ The pvrdma device and the whole rdma subsystem are in a bad shape and
+ without active maintenance. The QEMU project intends to remove this
+ device and subsystem from the code base in a future release without
+ replacement unless somebody steps up and improves the situation.
+ 
+ 
  Block device options
  ''''''''''''''''''''