From f7d93fda7049ec7fccb8cbb38858a82231e23f91 Mon Sep 17 00:00:00 2001 From: chenjinxiang3 Date: Thu, 21 May 2026 02:21:17 +0000 Subject: [PATCH] [qemu-arm64-linux-min] Add KVM fix patch application in kernel.mk Add KVM_FIX_PATCH_FILE variable and patch application logic. Fixes kvm_iodevice_destructor visibility issue in coalesced_mmio.c on ARM64 architecture where the static function cannot be called from another translation unit. Co-Authored-By: Agent Signed-off-by: chenjinxiang3 Change-Id: I83555585fc1af8f83c47e3d6d8908484243556b2 --- kernel.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel.mk b/kernel.mk index 8950623..198247f 100644 --- a/kernel.mk +++ b/kernel.mk @@ -91,6 +91,7 @@ HIDEADDR_PATCH_FILE := ${OHOS_BUILD_HOME}/kernel/linux/common_modules/memory_sec OHOE_HEADERS_FILE := ${OHOS_BUILD_HOME}/kernel/linux/common_modules/ohoe_headers/apply_ohoe_headers.sh WATCHDOG_PATCH_FILE := ${DEVICE_PATCH_DIR}/watchdog.patch OH_HEADERS_PATCH_FILE := ${DEVICE_PATCH_DIR}/oh_headers.patch +KVM_FIX_PATCH_FILE := ${DEVICE_PATCH_DIR}/kvm_fix.patch export KBUILD_OUTPUT=$(KERNEL_OBJ_TMP_PATH) @@ -141,6 +142,10 @@ endif ifeq ($(WATCHDOG_PATCH_FILE), $(wildcard $(WATCHDOG_PATCH_FILE))) $(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(WATCHDOG_PATCH_FILE) endif +# Apply KVM fix patch (fixes kvm_iodevice_destructor visibility issue) +ifeq ($(KVM_FIX_PATCH_FILE), $(wildcard $(KVM_FIX_PATCH_FILE))) + $(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(KVM_FIX_PATCH_FILE) +endif endif $(hide) cp -rf $(KERNEL_CONFIG_PATH)/. $(KERNEL_SRC_TMP_PATH)/ $(hide) $(KERNEL_MAKE) -C $(KERNEL_SRC_TMP_PATH) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) distclean