3 files changed, 12 insertions, 4 deletions

diff --git a/classes/container-cross-install.bbclass b/classes/container-cross-install.bbclass
index d365d7a1..d18c6436 100644
--- a/classes/container-cross-install.bbclass
+++ b/classes/container-cross-install.bbclass
@@ -830,7 +830,8 @@ Or remove it from BUNDLED_CONTAINERS if not needed.
         VRUNNER_CMD="${VRUNNER_CMD} -- ${DOCKER_CONTAINERS}"
 
         bbnote "Running batch import for Docker containers..."
-        TMPDIR="${WORKDIR}" eval ${VRUNNER_CMD}
+        # Prepend native sysroot to PATH so vrunner finds the correct QEMU (with virtfs support)
+        PATH="${STAGING_BINDIR_NATIVE}:${PATH}" TMPDIR="${WORKDIR}" eval ${VRUNNER_CMD}
 
         if [ $? -ne 0 ]; then
             bbfatal "Docker batch import failed"
@@ -894,7 +895,8 @@ Or remove it from BUNDLED_CONTAINERS if not needed.
         VRUNNER_CMD="${VRUNNER_CMD} -- ${PODMAN_CONTAINERS}"
 
         bbnote "Running batch import for Podman containers..."
-        TMPDIR="${WORKDIR}" eval ${VRUNNER_CMD}
+        # Prepend native sysroot to PATH so vrunner finds the correct QEMU (with virtfs support)
+        PATH="${STAGING_BINDIR_NATIVE}:${PATH}" TMPDIR="${WORKDIR}" eval ${VRUNNER_CMD}
 
         if [ $? -ne 0 ]; then
             bbfatal "Podman batch import failed"
diff --git a/conf/layer.conf b/conf/layer.conf
index 85694344..6eadc87f 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -76,4 +76,8 @@ USER_CLASSES:append = " meta-virt-hosts"
 
 HOSTTOOLS_NONFATAL += "getent"
 
+# Propagate virtualization/vcontainer to native DISTRO_FEATURES for qemu virtfs support
+# This enables virtio-9p in qemu-system-native for container-cross-install batch imports
+DISTRO_FEATURES_NATIVE:append = " ${@bb.utils.contains_any('DISTRO_FEATURES', 'vcontainer virtualization', 'virtualization', '', d)}"
+
 NON_MULTILIB_RECIPES:append:x86-64 = " kubernetes"
diff --git a/recipes-devtools/qemu/qemu-system-native_%.bbappend b/recipes-devtools/qemu/qemu-system-native_%.bbappend
index d360af80..b04b6934 100644
--- a/recipes-devtools/qemu/qemu-system-native_%.bbappend
+++ b/recipes-devtools/qemu/qemu-system-native_%.bbappend
@@ -5,6 +5,8 @@
 # Enable virtfs (virtio-9p) for vcontainer cross-architecture container bundling.
 # This is required for the fast batch-import path in container-cross-install.
 #
-# Only applied when "vcontainer" or "virtualization" is in DISTRO_FEATURES.
+# Note: Native recipes don't see target DISTRO_FEATURES directly.
+# The layer.conf propagates virtualization to DISTRO_FEATURES_NATIVE when
+# vcontainer or virtualization is in the target DISTRO_FEATURES.
 
-PACKAGECONFIG:append = " ${@bb.utils.contains_any('DISTRO_FEATURES', 'vcontainer virtualization', 'virtfs', '', d)}"
+PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES_NATIVE', 'virtualization', 'virtfs', '', d)}"