[PULL 00/13] Trivial patches for 2023-10-11

[PULL 00/13] Trivial patches for 2023-10-11

[Michael Tokarev]

The following changes since commit 0ad0d9dcd16f2ea816a413008ac5191ebef45c95:

  Merge tag 'firmware/seabios-20231010-pull-request' of https://gitlab.com/kraxel/qemu into staging (2023-10-10 10:22:16 -0400)

are available in the Git repository at:

  https://gitlab.com/mjt0k/qemu.git tags/pull-trivial-patches

for you to fetch changes up to 1fea86e7e25127daf4e6b0395f8d241afe1b81eb:

  cpus: Remove unused smp_cores/smp_threads declarations (2023-10-11 14:19:45 +0300)

----------------------------------------------------------------
trivial patches for 2023-10-11

Just some trivial stuff, including some MAINTAINERS updates.

----------------------------------------------------------------
Cornelia Huck (1):
      MAINTAINERS: add standard-headers to Hosts/LINUX

Jianlin Li (1):
      Update AMD memory encryption document links.

Olaf Hering (1):
      roms: use PYTHON to invoke python

Peter Maydell (1):
      hw/rdma/vmw/pvrdma_cmd: Use correct struct in query_port()

Philippe Mathieu-Daudé (2):
      MAINTAINERS: Add section for overall sensors
      cpus: Remove unused smp_cores/smp_threads declarations

Pierre Labatut (1):
      Fix compilation when UFFDIO_REGISTER is not set.

Thomas Huth (6):
      MAINTAINERS: Add g364fb and ds1225y to the Jazz section
      MAINTAINERS: Add unowned RISC-V related files to the right sections
      MAINTAINERS: Add include folder to the hw/char/ section
      MAINTAINERS: Add the CI-related doc files to the CI section
      MAINTAINERS: Add some unowned files to the SBSA-REF section
      scripts/xml-preprocess: Make sure this script is invoked via the right Python

 MAINTAINERS                                | 24 +++++++++++++++++++++++-
 docs/system/i386/amd-memory-encryption.rst |  6 +++---
 hw/rdma/vmw/pvrdma_cmd.c                   |  5 ++---
 include/sysemu/cpus.h                      |  7 -------
 roms/Makefile                              |  2 +-
 scripts/xml-preprocess.py                  |  0
 subprojects/libvhost-user/libvhost-user.c  |  2 +-
 7 files changed, 30 insertions(+), 16 deletions(-)
 mode change 100755 => 100644 scripts/xml-preprocess.py

[PULL 01/13] Update AMD memory encryption document links.

[Michael Tokarev]

From: Jianlin Li <ljianlin99@gmail.com>

The previous links for the white paper and programmer's manual
are no longer available. Replace them with the new ones.

Signed-off-by: Jianlin Li <ljianlin99@gmail.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 docs/system/i386/amd-memory-encryption.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/system/i386/amd-memory-encryption.rst b/docs/system/i386/amd-memory-encryption.rst
index dcf4add0e7..e9bc142bc1 100644
--- a/docs/system/i386/amd-memory-encryption.rst
+++ b/docs/system/i386/amd-memory-encryption.rst
@@ -183,13 +183,13 @@ References
 ----------
 
 `AMD Memory Encryption whitepaper
-<https://developer.amd.com/wordpress/media/2013/12/AMD_Memory_Encryption_Whitepaper_v7-Public.pdf>`_
+<https://www.amd.com/content/dam/amd/en/documents/epyc-business-docs/white-papers/memory-encryption-white-paper.pdf>`_
 
 .. [SEVAPI] `Secure Encrypted Virtualization API
    <https://www.amd.com/system/files/TechDocs/55766_SEV-KM_API_Specification.pdf>`_
 
 .. [APMVOL2] `AMD64 Architecture Programmer's Manual Volume 2: System Programming
-   <https://www.amd.com/system/files/TechDocs/24593.pdf>`_
+   <https://www.amd.com/content/dam/amd/en/documents/processor-tech-docs/programmer-references/24593.pdf>`_
 
 KVM Forum slides:
 
@@ -199,7 +199,7 @@ KVM Forum slides:
   <https://www.linux-kvm.org/images/9/94/Extending-Secure-Encrypted-Virtualization-with-SEV-ES-Thomas-Lendacky-AMD.pdf>`_
 
 `AMD64 Architecture Programmer's Manual:
-<http://support.amd.com/TechDocs/24593.pdf>`_
+<https://www.amd.com/content/dam/amd/en/documents/processor-tech-docs/programmer-references/24593.pdf>`_
 
 * SME is section 7.10
 * SEV is section 15.34
-- 
2.39.2

[PULL 02/13] hw/rdma/vmw/pvrdma_cmd: Use correct struct in query_port()

[Michael Tokarev]

From: Peter Maydell <peter.maydell@linaro.org>

In query_port() we pass the address of a local pvrdma_port_attr
struct to the rdma_query_backend_port() function.  Unfortunately,
rdma_backend_query_port() wants a pointer to a struct ibv_port_attr,
and the two are not the same length.

Coverity spotted this (CID 1507146): pvrdma_port_attr is 48 bytes
long, and ibv_port_attr is 52 bytes, because it has a few extra
fields at the end.

Fortunately, all we do with the attrs struct after the call is to
read a few specific fields out of it which are all at the same
offsets in both structs, so we can simply make the local variable the
correct type.  This also lets us drop the cast (which should have
been a bit of a warning flag that we were doing something wrong
here).

Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/rdma/vmw/pvrdma_cmd.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
index c6ed025982..d31c187593 100644
--- a/hw/rdma/vmw/pvrdma_cmd.c
+++ b/hw/rdma/vmw/pvrdma_cmd.c
@@ -129,14 +129,13 @@ static int query_port(PVRDMADev *dev, union pvrdma_cmd_req *req,
 {
     struct pvrdma_cmd_query_port *cmd = &req->query_port;
     struct pvrdma_cmd_query_port_resp *resp = &rsp->query_port_resp;
-    struct pvrdma_port_attr attrs = {};
+    struct ibv_port_attr attrs = {};
 
     if (cmd->port_num > MAX_PORTS) {
         return -EINVAL;
     }
 
-    if (rdma_backend_query_port(&dev->backend_dev,
-                                (struct ibv_port_attr *)&attrs)) {
+    if (rdma_backend_query_port(&dev->backend_dev, &attrs)) {
         return -ENOMEM;
     }
 
-- 
2.39.2

[PULL 03/13] Fix compilation when UFFDIO_REGISTER is not set.

[Michael Tokarev]

From: Pierre Labatut <plabatut@google.com>

Signed-off-by: Pierre Labatut <plabatut@google.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 subprojects/libvhost-user/libvhost-user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
index 051a611da3..ac6d5d01d3 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -631,9 +631,9 @@ static bool
 generate_faults(VuDev *dev) {
     unsigned int i;
     for (i = 0; i < dev->nregions; i++) {
+#ifdef UFFDIO_REGISTER
         VuDevRegion *dev_region = &dev->regions[i];
         int ret;
-#ifdef UFFDIO_REGISTER
         struct uffdio_register reg_struct;
 
         /*
-- 
2.39.2

[PULL 04/13] MAINTAINERS: Add g364fb and ds1225y to the Jazz section

[Michael Tokarev]

From: Thomas Huth <thuth@redhat.com>

These devices are only used by the Jazz machine, so they
should be listed in the corresponding section in MAINTAINERS.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9e7dec4a58..93756ec21a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1286,8 +1286,10 @@ M: Hervé Poussineau <hpoussin@reactos.org>
 R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
 S: Maintained
 F: hw/mips/jazz.c
+F: hw/display/g364fb.c
 F: hw/display/jazz_led.c
 F: hw/dma/rc4030.c
+F: hw/nvram/ds1225y.c
 
 Malta
 M: Philippe Mathieu-Daudé <philmd@linaro.org>
-- 
2.39.2

[PULL 05/13] MAINTAINERS: Add unowned RISC-V related files to the right sections

[Michael Tokarev]

From: Thomas Huth <thuth@redhat.com>

There are a bunch of RISC-V files that are currently not covered
by the "get_maintainers.pl" script. Add them to the right sections
in MAINTAINERS to fix this problem.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Christoph Müllner <christoph.muellner@vrull.eu>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@vrull.eu>
Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 MAINTAINERS | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 93756ec21a..e80fca855a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -318,8 +318,11 @@ R: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
 R: Liu Zhiwei <zhiwei_liu@linux.alibaba.com>
 L: qemu-riscv@nongnu.org
 S: Supported
+F: configs/targets/riscv*
+F: docs/system/target-riscv.rst
 F: target/riscv/
 F: hw/riscv/
+F: hw/intc/riscv*
 F: include/hw/riscv/
 F: linux-user/host/riscv32/
 F: linux-user/host/riscv64/
@@ -331,6 +334,7 @@ L: qemu-riscv@nongnu.org
 S: Supported
 F: target/riscv/insn_trans/trans_xthead.c.inc
 F: target/riscv/xthead*.decode
+F: disas/riscv-xthead*
 
 RISC-V XVentanaCondOps extension
 M: Philipp Tomsich <philipp.tomsich@vrull.eu>
@@ -338,6 +342,7 @@ L: qemu-riscv@nongnu.org
 S: Maintained
 F: target/riscv/XVentanaCondOps.decode
 F: target/riscv/insn_trans/trans_xventanacondops.c.inc
+F: disas/riscv-xventana*
 
 RENESAS RX CPUs
 R: Yoshinori Sato <ysato@users.sourceforge.jp>
@@ -1527,6 +1532,7 @@ Microchip PolarFire SoC Icicle Kit
 M: Bin Meng <bin.meng@windriver.com>
 L: qemu-riscv@nongnu.org
 S: Supported
+F: docs/system/riscv/microchip-icicle-kit.rst
 F: hw/riscv/microchip_pfsoc.c
 F: hw/char/mchp_pfsoc_mmuart.c
 F: hw/misc/mchp_pfsoc_dmc.c
@@ -1542,6 +1548,7 @@ Shakti C class SoC
 M: Vijai Kumar K <vijai@behindbytes.com>
 L: qemu-riscv@nongnu.org
 S: Supported
+F: docs/system/riscv/shakti-c.rst
 F: hw/riscv/shakti_c.c
 F: hw/char/shakti_uart.c
 F: include/hw/riscv/shakti_c.h
@@ -1553,6 +1560,7 @@ M: Bin Meng <bin.meng@windriver.com>
 M: Palmer Dabbelt <palmer@dabbelt.com>
 L: qemu-riscv@nongnu.org
 S: Supported
+F: docs/system/riscv/sifive_u.rst
 F: hw/*/*sifive*.c
 F: include/hw/*/*sifive*.h
 
@@ -3573,7 +3581,7 @@ M: Alistair Francis <Alistair.Francis@wdc.com>
 L: qemu-riscv@nongnu.org
 S: Maintained
 F: tcg/riscv/
-F: disas/riscv.c
+F: disas/riscv.[ch]
 
 S390 TCG target
 M: Richard Henderson <richard.henderson@linaro.org>
-- 
2.39.2

[PULL 06/13] MAINTAINERS: Add include folder to the hw/char/ section

[Michael Tokarev]

From: Thomas Huth <thuth@redhat.com>

The "Character devices" section only covers hw/char/ but
misses the corresponding include/hw/char/ folder. Add it now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index e80fca855a..0f9c4b263e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1988,6 +1988,7 @@ M: Marc-André Lureau <marcandre.lureau@redhat.com>
 R: Paolo Bonzini <pbonzini@redhat.com>
 S: Odd Fixes
 F: hw/char/
+F: include/hw/char/
 
 Network devices
 M: Jason Wang <jasowang@redhat.com>
-- 
2.39.2

[PULL 07/13] MAINTAINERS: Add the CI-related doc files to the CI section

[Michael Tokarev]

From: Thomas Huth <thuth@redhat.com>

The docs/devel/ci* were not covered yet, add them to MAINTAINERS
so that the right people are put on CC: for related patches.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f9c4b263e..de2ef5add3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3918,6 +3918,7 @@ F: .github/workflows/lockdown.yml
 F: .gitlab-ci.yml
 F: .gitlab-ci.d/
 F: .travis.yml
+F: docs/devel/ci*
 F: scripts/ci/
 F: tests/docker/
 F: tests/vm/
-- 
2.39.2

[PULL 08/13] MAINTAINERS: add standard-headers to Hosts/LINUX

[Michael Tokarev]

From: Cornelia Huck <cohuck@redhat.com>

The files in there are updated via update-linux-headers.sh.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index de2ef5add3..6f947ffccb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -562,6 +562,7 @@ M: Cornelia Huck <cohuck@redhat.com>
 M: Paolo Bonzini <pbonzini@redhat.com>
 S: Maintained
 F: linux-headers/
+F: include/standard-headers/
 F: scripts/update-linux-headers.sh
 
 POSIX
-- 
2.39.2

[PULL 09/13] MAINTAINERS: Add section for overall sensors

[Michael Tokarev]

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Sensor devices depend on some bus, not a particular board.
While merged for a particular board, sensor devices don't
depend on it. They depend on a bus technology, and can be
used by any board exposing such bus.

In order to help merging sensor patches, when they fall out
of a particular board tree, add a section covering overall
sensors, to help out with patch review and merge queue
handling.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 MAINTAINERS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 6f947ffccb..b217080fee 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3418,6 +3418,12 @@ M: Viktor Prutyanov <viktor.prutyanov@phystech.edu>
 S: Maintained
 F: contrib/elf2dmp/
 
+Overall sensors
+M: Philippe Mathieu-Daudé <philmd@linaro.org>
+S: Odd Fixes
+F: hw/sensor
+F: include/hw/sensor
+
 I2C and SMBus
 M: Corey Minyard <cminyard@mvista.com>
 S: Maintained
-- 
2.39.2

[PULL 10/13] MAINTAINERS: Add some unowned files to the SBSA-REF section

[Michael Tokarev]

From: Thomas Huth <thuth@redhat.com>

These files belong to the sbsa-ref machine and thus should
be listed here.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 MAINTAINERS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index b217080fee..0bab360c12 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -945,6 +945,9 @@ R: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
 L: qemu-arm@nongnu.org
 S: Maintained
 F: hw/arm/sbsa-ref.c
+F: hw/misc/sbsa_ec.c
+F: hw/watchdog/sbsa_gwdt.c
+F: include/hw/watchdog/sbsa_gwdt.h
 F: docs/system/arm/sbsa.rst
 F: tests/avocado/machine_aarch64_sbsaref.py
 
-- 
2.39.2

[PULL 11/13] roms: use PYTHON to invoke python

[Michael Tokarev]

From: Olaf Hering <olaf@aepfle.de>

python3 may not be the expected python version.
Use PYTHON to invoke python.

Fixes: 22e11539e1 ("edk2: replace build scripts")

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 roms/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roms/Makefile b/roms/Makefile
index 6859685290..67f709ba2d 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -147,7 +147,7 @@ skiboot:
 	cp skiboot/skiboot.lid ../pc-bios/skiboot.lid
 
 efi:
-	python3 edk2-build.py --config edk2-build.config \
+	$(PYTHON) edk2-build.py --config edk2-build.config \
 		--version-override "edk2-stable202302-for-qemu" \
 		--release-date "03/01/2023"
 	rm -f ../pc-bios/edk2-*.fd.bz2
-- 
2.39.2

[PULL 12/13] scripts/xml-preprocess: Make sure this script is invoked via the right Python

[Michael Tokarev]

From: Thomas Huth <thuth@redhat.com>

If a script is executable and has a shebang line, Meson treats it as
a normal executable, so that this script here is run via the "python3"
binary in the $PATH. However, "python3" might not be in the $PATH at
all, or it might be a wrong version, so we should make sure to run
this script via the Python version that has been chosen for the QEMU
build process. The best way to do this is to remove the executable bit
from the access mode bits. (See also commit 4b424c757188f7a4)

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1918
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 scripts/xml-preprocess.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 scripts/xml-preprocess.py

diff --git a/scripts/xml-preprocess.py b/scripts/xml-preprocess.py
old mode 100755
new mode 100644
-- 
2.39.2

[PULL 13/13] cpus: Remove unused smp_cores/smp_threads declarations

[Michael Tokarev]

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Commit a5e0b33119 ("vl.c: Replace smp global variables
with smp machine properties") removed the last uses of
the smp_cores / smp_threads variables but forgot to
remove their declarations. Do it now.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 include/sysemu/cpus.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h
index 0535a4c68a..b4a566cfe7 100644
--- a/include/sysemu/cpus.h
+++ b/include/sysemu/cpus.h
@@ -50,11 +50,4 @@ void cpu_synchronize_all_post_reset(void);
 void cpu_synchronize_all_post_init(void);
 void cpu_synchronize_all_pre_loadvm(void);
 
-#ifndef CONFIG_USER_ONLY
-/* vl.c */
-/* *-user doesn't have configurable SMP topology */
-extern int smp_cores;
-extern int smp_threads;
-#endif
-
 #endif
-- 
2.39.2

Re: [PULL 02/13] hw/rdma/vmw/pvrdma_cmd: Use correct struct in query_port()

[Stefan Hajnoczi]

On Wed, 11 Oct 2023 at 07:23, Michael Tokarev <mjt@tls.msk.ru> wrote:
>
> From: Peter Maydell <peter.maydell@linaro.org>
>
> In query_port() we pass the address of a local pvrdma_port_attr
> struct to the rdma_query_backend_port() function.  Unfortunately,
> rdma_backend_query_port() wants a pointer to a struct ibv_port_attr,
> and the two are not the same length.
>
> Coverity spotted this (CID 1507146): pvrdma_port_attr is 48 bytes
> long, and ibv_port_attr is 52 bytes, because it has a few extra
> fields at the end.
>
> Fortunately, all we do with the attrs struct after the call is to
> read a few specific fields out of it which are all at the same
> offsets in both structs, so we can simply make the local variable the
> correct type.  This also lets us drop the cast (which should have
> been a bit of a warning flag that we were doing something wrong
> here).
>
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
>  hw/rdma/vmw/pvrdma_cmd.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

The following CI failure has occurred:

../hw/rdma/vmw/pvrdma_cmd.c:144:59: error: implicit conversion from
enumeration type 'enum ibv_port_state' to different enumeration type
'enum pvrdma_port_state' [-Werror,-Wenum-conversion]
resp->attrs.state = dev->func0->device_active ? attrs.state :
~ ~~~~~~^~~~~
../hw/rdma/vmw/pvrdma_cmd.c:146:33: error: implicit conversion from
enumeration type 'enum ibv_mtu' to different enumeration type 'enum
pvrdma_mtu' [-Werror,-Wenum-conversion]
resp->attrs.max_mtu = attrs.max_mtu;
~ ~~~~~~^~~~~~~
../hw/rdma/vmw/pvrdma_cmd.c:147:36: error: implicit conversion from
enumeration type 'enum ibv_mtu' to different enumeration type 'enum
pvrdma_mtu' [-Werror,-Wenum-conversion]
resp->attrs.active_mtu = attrs.active_mtu;
~ ~~~~~~^~~~~~~~~~

https://gitlab.com/qemu-project/qemu/-/jobs/5270666420

Please take a look.

Thanks,
Stefan

>
> diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
> index c6ed025982..d31c187593 100644
> --- a/hw/rdma/vmw/pvrdma_cmd.c
> +++ b/hw/rdma/vmw/pvrdma_cmd.c
> @@ -129,14 +129,13 @@ static int query_port(PVRDMADev *dev, union pvrdma_cmd_req *req,
>  {
>      struct pvrdma_cmd_query_port *cmd = &req->query_port;
>      struct pvrdma_cmd_query_port_resp *resp = &rsp->query_port_resp;
> -    struct pvrdma_port_attr attrs = {};
> +    struct ibv_port_attr attrs = {};
>
>      if (cmd->port_num > MAX_PORTS) {
>          return -EINVAL;
>      }
>
> -    if (rdma_backend_query_port(&dev->backend_dev,
> -                                (struct ibv_port_attr *)&attrs)) {
> +    if (rdma_backend_query_port(&dev->backend_dev, &attrs)) {
>          return -ENOMEM;
>      }
>
> --
> 2.39.2
>
>

Re: [PULL 02/13] hw/rdma/vmw/pvrdma_cmd: Use correct struct in query_port()

[Thomas Huth]

On 11/10/2023 17.38, Stefan Hajnoczi wrote:
> On Wed, 11 Oct 2023 at 07:23, Michael Tokarev <mjt@tls.msk.ru> wrote:
>>
>> From: Peter Maydell <peter.maydell@linaro.org>
>>
>> In query_port() we pass the address of a local pvrdma_port_attr
>> struct to the rdma_query_backend_port() function.  Unfortunately,
>> rdma_backend_query_port() wants a pointer to a struct ibv_port_attr,
>> and the two are not the same length.
>>
>> Coverity spotted this (CID 1507146): pvrdma_port_attr is 48 bytes
>> long, and ibv_port_attr is 52 bytes, because it has a few extra
>> fields at the end.
>>
>> Fortunately, all we do with the attrs struct after the call is to
>> read a few specific fields out of it which are all at the same
>> offsets in both structs, so we can simply make the local variable the
>> correct type.  This also lets us drop the cast (which should have
>> been a bit of a warning flag that we were doing something wrong
>> here).
>>
>> Cc: qemu-stable@nongnu.org
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
>> ---
>>   hw/rdma/vmw/pvrdma_cmd.c | 5 ++---
>>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> The following CI failure has occurred:
> 
> ../hw/rdma/vmw/pvrdma_cmd.c:144:59: error: implicit conversion from
> enumeration type 'enum ibv_port_state' to different enumeration type
> 'enum pvrdma_port_state' [-Werror,-Wenum-conversion]
> resp->attrs.state = dev->func0->device_active ? attrs.state :
> ~ ~~~~~~^~~~~
> ../hw/rdma/vmw/pvrdma_cmd.c:146:33: error: implicit conversion from
> enumeration type 'enum ibv_mtu' to different enumeration type 'enum
> pvrdma_mtu' [-Werror,-Wenum-conversion]
> resp->attrs.max_mtu = attrs.max_mtu;
> ~ ~~~~~~^~~~~~~
> ../hw/rdma/vmw/pvrdma_cmd.c:147:36: error: implicit conversion from
> enumeration type 'enum ibv_mtu' to different enumeration type 'enum
> pvrdma_mtu' [-Werror,-Wenum-conversion]
> resp->attrs.active_mtu = attrs.active_mtu;
> ~ ~~~~~~^~~~~~~~~~
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/5270666420
> 
> Please take a look.

That pvrdma patch unfortunately does not work with Clang, see also:

 
https://lore.kernel.org/qemu-devel/781330fc-85b3-4ef1-8f07-1cc5fc5e4ad2@redhat.com/T/#t

  Thomas

Re: [PULL 02/13] hw/rdma/vmw/pvrdma_cmd: Use correct struct in query_port()

[Peter Maydell]

On Wed, 11 Oct 2023 at 17:29, Thomas Huth <thuth@redhat.com> wrote:
>
> On 11/10/2023 17.38, Stefan Hajnoczi wrote:
> > The following CI failure has occurred:
> >
> > ../hw/rdma/vmw/pvrdma_cmd.c:144:59: error: implicit conversion from
> > enumeration type 'enum ibv_port_state' to different enumeration type
> > 'enum pvrdma_port_state' [-Werror,-Wenum-conversion]
> > resp->attrs.state = dev->func0->device_active ? attrs.state :
> > ~ ~~~~~~^~~~~
> > ../hw/rdma/vmw/pvrdma_cmd.c:146:33: error: implicit conversion from
> > enumeration type 'enum ibv_mtu' to different enumeration type 'enum
> > pvrdma_mtu' [-Werror,-Wenum-conversion]
> > resp->attrs.max_mtu = attrs.max_mtu;
> > ~ ~~~~~~^~~~~~~
> > ../hw/rdma/vmw/pvrdma_cmd.c:147:36: error: implicit conversion from
> > enumeration type 'enum ibv_mtu' to different enumeration type 'enum
> > pvrdma_mtu' [-Werror,-Wenum-conversion]
> > resp->attrs.active_mtu = attrs.active_mtu;
> > ~ ~~~~~~^~~~~~~~~~
> >
> > https://gitlab.com/qemu-project/qemu/-/jobs/5270666420
> >
> > Please take a look.
>
> That pvrdma patch unfortunately does not work with Clang, see also:
>
>
> https://lore.kernel.org/qemu-devel/781330fc-85b3-4ef1-8f07-1cc5fc5e4ad2@redhat.com/T/#t

Explicitly casting to the new enum type is OK and fixes the clang
warnings; I'll send out a v2 of the patch in a moment.

thanks
-- PMM