From d9862de15ffc92ce6e779c5a2f506aa3f82a02c8 Mon Sep 17 00:00:00 2001
From: Alexander Lanin <Alexander.Lanin@etas.com>
Date: Thu, 13 Aug 2026 14:57:33 +0200
Subject: [PATCH 1/2] feat: install full qemu-system package instead of
 qemu-system-arm

Replace qemu-system-arm with the qemu-system meta-package to cover
additional system emulators (e.g. x86) in addition to arm, and add
a corresponding test for qemu-system-x86_64.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/s-core-devcontainer/.devcontainer/s-core-local/install.sh | 4 ++--
 .../.devcontainer/s-core-local/tests/test_default.sh          | 3 ++-
 .../.devcontainer/s-core-local/versions.yaml                  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh
index 6e745a2..62629f0 100755
--- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh
+++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh
@@ -79,8 +79,8 @@ JAVA_HOME="$(dirname $(dirname $(realpath $(command -v javac))))"
 export JAVA_HOME
 echo -e "JAVA_HOME=${JAVA_HOME}\nexport JAVA_HOME" > /etc/profile.d/java_home.sh
 
-# qemu-system-arm
-apt-get install -y --no-install-recommends --fix-broken qemu-system-arm="${qemu_system_arm_version}*"
+# qemu-system (full system emulation binaries, e.g. arm, x86, ...)
+apt-get install -y --no-install-recommends --fix-broken qemu-system="${qemu_system_version}*"
 
 # basedpyright
 su $(ls /home) -c "uv tool install basedpyright@\"${basedpyright_version}\""
diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh
index dea564b..d14eacc 100755
--- a/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh
+++ b/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh
@@ -101,5 +101,6 @@ fi
 check "validate lcov is working and has the correct version" bash -c "lcov --version | grep '${lcov_version}'"
 
 # Qemu target-related tools
-check "validate qemu-system-aarch64 is working and has the correct version" bash -c "qemu-system-aarch64 --version | grep '${qemu_system_arm_version}'"
+check "validate qemu-system-aarch64 is working and has the correct version" bash -c "qemu-system-aarch64 --version | grep '${qemu_system_version}'"
+check "validate qemu-system-x86_64 is working and has the correct version" bash -c "qemu-system-x86_64 --version | grep '${qemu_system_version}'"
 check "validate sshpass is working and has the correct version" bash -c "sshpass -V | grep '${sshpass_version}'"
diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml
index 8a84853..75b6ea3 100644
--- a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml
+++ b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml
@@ -16,7 +16,7 @@ graphviz:
   version: 2.42.2
 protobuf_compiler:
   version: 3.21.12
-qemu_system_arm:
+qemu_system:
   version: 1:8.2.2
 sshpass:
   version: 1.09

From 5f8002345f500cf168bda4bab2d88586f3f8b00a Mon Sep 17 00:00:00 2001
From: Alexander Lanin <Alexander.Lanin@etas.com>
Date: Thu, 13 Aug 2026 15:29:01 +0200
Subject: [PATCH 2/2] fix: restrict QEMU system targets

Install only the ARM and x86 QEMU system emulator packages instead of the full meta-package.\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../.devcontainer/s-core-local/install.sh                   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh
index 62629f0..202b5f8 100755
--- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh
+++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh
@@ -79,8 +79,10 @@ JAVA_HOME="$(dirname $(dirname $(realpath $(command -v javac))))"
 export JAVA_HOME
 echo -e "JAVA_HOME=${JAVA_HOME}\nexport JAVA_HOME" > /etc/profile.d/java_home.sh
 
-# qemu-system (full system emulation binaries, e.g. arm, x86, ...)
-apt-get install -y --no-install-recommends --fix-broken qemu-system="${qemu_system_version}*"
+# QEMU system emulators for ARM and x86
+apt-get install -y --no-install-recommends --fix-broken \
+    qemu-system-arm="${qemu_system_version}*" \
+    qemu-system-x86="${qemu_system_version}*"
 
 # basedpyright
 su $(ls /home) -c "uv tool install basedpyright@\"${basedpyright_version}\""