[PATCH 0/4] hw/misc: move vmlaunchupdate.c to system_ss

[PATCH 0/4] hw/misc: move vmlaunchupdate.c to system_ss

[Daniel P. Berrangé]

If building with IGVM enabled and both arm-softmmu and
aarch64-softmmu, test-multi-target breaks because the
vm-launch-update QOM class is linked in twice and thus
registered twice.

Daniel P. Berrangé (4):
  hw/misc: move vmlaunchupdate.c from specific_ss to system_ss
  tests/lcitool: add mips32r6el toolchain to refresh script
  tests/docker: add igvm to Fedora container images
  MAINTAINERS: fix typo in test-multi-target.c filename

 MAINTAINERS                                         | 2 +-
 hw/misc/meson.build                                 | 2 +-
 tests/docker/dockerfiles/fedora-rust-nightly.docker | 1 +
 tests/docker/dockerfiles/fedora.docker              | 1 +
 tests/lcitool/projects/qemu.yml                     | 1 +
 tests/lcitool/refresh                               | 2 ++
 6 files changed, 7 insertions(+), 2 deletions(-)

-- 
2.56.0

[PATCH 1/4] hw/misc: move vmlaunchupdate.c from specific_ss to system_ss

[Daniel P. Berrangé]

test-multi-target fails when igvm is enabled if both arm and
aarch64 targets are enabled:

  $ tests/unit/test-multi-target
  TAP version 14
  # random seed: R02S0c27cf3526927aa4a7f822f0a8315b3e
  1..2
  # Start of multi-targets tests
  # Start of qom-types-are-unique tests
  Registering `vm-launch-update' which already exists
  # child process (/multi-targets/qom-types-are-unique/aarch64 [1982534]) killed by signal 6 (Aborted)
  # child process (/multi-targets/qom-types-are-unique/aarch64 [1982534]) stdout: ""
  # child process (/multi-targets/qom-types-are-unique/aarch64 [1982534]) stderr: "Registering `vm-launch-update' which already exists\n"
  **
  ERROR:../tests/unit/test-multi-target.c:41:test_qom_types_are_unique: child process (/multi-targets/qom-types-are-unique/aarch64 [1982534]) failed unexpectedly
  not ok /multi-targets/qom-types-are-unique/aarch64 - ERROR:../tests/unit/test-multi-target.c:41:test_qom_types_are_unique: child process (/multi-targets/qom-types-are-unique/aarch64 [1982534]) failed unexpectedly
  Bail out!
  Aborted                    (core dumped) tests/unit/test-multi-target

This is because it is linked twice into test-multi-target
and thus the same device class object code is duplicated and
thus the class name gets registered twice.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 hw/misc/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/misc/meson.build b/hw/misc/meson.build
index fc3800baec0..7a071af82b0 100644
--- a/hw/misc/meson.build
+++ b/hw/misc/meson.build
@@ -170,7 +170,7 @@ specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c'))
 specific_ss.add(when: 'CONFIG_RISCV_MIPS_CMGCR', if_true: files('riscv_cmgcr.c'))
 specific_ss.add(when: 'CONFIG_RISCV_MIPS_CPC', if_true: files('riscv_cpc.c'))
 if igvm.found()
-   specific_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmlaunchupdate.c'))
+   system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmlaunchupdate.c'))
 endif
 
 system_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa_ec.c'))
-- 
2.56.0

[PATCH 2/4] tests/lcitool: add mips32r6el toolchain to refresh script

[Daniel P. Berrangé]

The debian-all-test-cross.docker file is auto-generated so
the extra toolchains need to be listed in the prologue
in the refresh script.

Fixes: ace0b0b3d104 ("tests/docker: Add the mips32r6el toolchain on Debian cross container")
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tests/lcitool/refresh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 94cab24bbdb..075acb82e1d 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -200,6 +200,8 @@ RUN apt update && \
   libc6-dev-mips64el-cross \
   gcc-mipsel-linux-gnu \
   libc6-dev-mipsel-cross \
+  gcc-mipsisa32r6el-linux-gnu \
+  libc6-dev-mipsr6el-cross \
   gcc-mipsisa64r6-linux-gnuabi64 \
   libc6-dev-mips64r6-cross \
   gcc-mipsisa64r6el-linux-gnuabi64 \
-- 
2.56.0

[PATCH 3/4] tests/docker: add igvm to Fedora container images

[Daniel P. Berrangé]

The igvm-devel RPM is used for certain features on the
x86 and arm platforms, so should be included to give
build and test coverage in CI.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tests/docker/dockerfiles/fedora-rust-nightly.docker | 1 +
 tests/docker/dockerfiles/fedora.docker              | 1 +
 tests/lcitool/projects/qemu.yml                     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/docker/dockerfiles/fedora-rust-nightly.docker
index 144325ae1e7..7eae32f126a 100644
--- a/tests/docker/dockerfiles/fedora-rust-nightly.docker
+++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker
@@ -54,6 +54,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                        gtk-vnc2-devel \
                        gtk3-devel \
                        hostname \
+                       igvm-devel \
                        jemalloc-devel \
                        json-c-devel \
                        libaio-devel \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 8f7e9efc899..871b1ba3f20 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -54,6 +54,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                        gtk-vnc2-devel \
                        gtk3-devel \
                        hostname \
+                       igvm-devel \
                        jemalloc-devel \
                        json-c-devel \
                        libaio-devel \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index abbd3e3f0b8..37a0c931fb2 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -35,6 +35,7 @@ packages:
  - gtk3
  - gtk-vnc
  - hostname
+ - igvm
  - json-c
  - libaio
  - libasan
-- 
2.56.0

[PATCH 4/4] MAINTAINERS: fix typo in test-multi-target.c filename

[Daniel P. Berrangé]

Fixes: 8b395deb9475 ("target-info: add multi-target test binary")
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 55463103ff1..fa0c6d0c9bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2186,7 +2186,7 @@ M: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
 S: Supported
 F: include/qemu/target-info*.h
 F: target-info*.c
-F: tests/unit/test-multi-targets.c
+F: tests/unit/test-multi-target.c
 
 Xtensa Machines
 ---------------
-- 
2.56.0

Re: [PATCH 0/4] hw/misc: move vmlaunchupdate.c to system_ss

[Pierrick Bouvier]

On 11/6/2026 9:18 AM, Daniel P. Berrangé wrote:
> If building with IGVM enabled and both arm-softmmu and
> aarch64-softmmu, test-multi-target breaks because the
> vm-launch-update QOM class is linked in twice and thus
> registered twice.
> 
> Daniel P. Berrangé (4):
>   hw/misc: move vmlaunchupdate.c from specific_ss to system_ss
>   tests/lcitool: add mips32r6el toolchain to refresh script
>   tests/docker: add igvm to Fedora container images
>   MAINTAINERS: fix typo in test-multi-target.c filename
> 
>  MAINTAINERS                                         | 2 +-
>  hw/misc/meson.build                                 | 2 +-
>  tests/docker/dockerfiles/fedora-rust-nightly.docker | 1 +
>  tests/docker/dockerfiles/fedora.docker              | 1 +
>  tests/lcitool/projects/qemu.yml                     | 1 +
>  tests/lcitool/refresh                               | 2 ++
>  6 files changed, 7 insertions(+), 2 deletions(-)
> 

Good catch, thanks.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>

Sending it for 11.2 as a multi-target fix, with the additional whpx fix.

Regards,
Pierrick

Re: [PATCH 0/4] hw/misc: move vmlaunchupdate.c to system_ss

[Pierrick Bouvier]

On 11/6/2026 9:18 AM, Daniel P. Berrangé wrote:
> If building with IGVM enabled and both arm-softmmu and
> aarch64-softmmu, test-multi-target breaks because the
> vm-launch-update QOM class is linked in twice and thus
> registered twice.
> 
> Daniel P. Berrangé (4):
>   hw/misc: move vmlaunchupdate.c from specific_ss to system_ss
>   tests/lcitool: add mips32r6el toolchain to refresh script
>   tests/docker: add igvm to Fedora container images
>   MAINTAINERS: fix typo in test-multi-target.c filename
> 
>  MAINTAINERS                                         | 2 +-
>  hw/misc/meson.build                                 | 2 +-
>  tests/docker/dockerfiles/fedora-rust-nightly.docker | 1 +
>  tests/docker/dockerfiles/fedora.docker              | 1 +
>  tests/lcitool/projects/qemu.yml                     | 1 +
>  tests/lcitool/refresh                               | 2 ++
>  6 files changed, 7 insertions(+), 2 deletions(-)
> 

This was merged into master (71f25c75417d31c214ba2cd26b273c114fc99987).
Thank you for your contribution!

Regards,
Pierrick

Re: [PATCH 2/4] tests/lcitool: add mips32r6el toolchain to refresh script

[Philippe Mathieu-Daudé]

On 6/11/26 18:18, Daniel P. Berrangé wrote:
> The debian-all-test-cross.docker file is auto-generated so
> the extra toolchains need to be listed in the prologue
> in the refresh script.
> 
> Fixes: ace0b0b3d104 ("tests/docker: Add the mips32r6el toolchain on Debian cross container")
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   tests/lcitool/refresh | 2 ++
>   1 file changed, 2 insertions(+)

Oops thanks.

Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>