018c809557
- cvm: bug-fix for macro isolation - tests/qtest: ahci-test: add test exposing reset issue with pending callback (Fix CVE-2023-5088) - hw/ide: reset: cancel async DMA operation before resetting state (Fix CVE-2023-5088) - Add support for the virtcca cvm feature. Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From c3e350aa92bbce2954b908a6bd8481adf222c840 Mon Sep 17 00:00:00 2001
|
|
From: fuju <fuju1@huawei.com>
|
|
Date: Sat, 15 Jun 2024 16:42:19 +0800
|
|
Subject: [PATCH] cvm: bug-fix for macro isolation
|
|
|
|
1. add else branch for CONFIG_KVM_IS_POSSIBLE macro isolation.
|
|
2. add else branch for CONFIG_KVM macro isolation.
|
|
|
|
Fixes: 12d0d099aecb("Add support for the virtcca cvm feature")
|
|
|
|
Signed-off-by: Fu Ju <fuju1@huawei.com>
|
|
---
|
|
include/sysemu/kvm.h | 1 +
|
|
target/arm/kvm_arm.h | 6 ++++++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
|
|
index 0b5319b4e3..5860228034 100644
|
|
--- a/include/sysemu/kvm.h
|
|
+++ b/include/sysemu/kvm.h
|
|
@@ -175,6 +175,7 @@ extern bool kvm_msi_use_devid;
|
|
|
|
#define kvm_enabled() (0)
|
|
#define virtcca_cvm_enabled() (0)
|
|
+#define VIRTCCA_CVM_TYPE (0)
|
|
#define kvm_irqchip_in_kernel() (false)
|
|
#define kvm_irqchip_is_split() (false)
|
|
#define kvm_async_interrupts_enabled() (false)
|
|
diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h
|
|
index 5a49383031..475531dad4 100644
|
|
--- a/target/arm/kvm_arm.h
|
|
+++ b/target/arm/kvm_arm.h
|
|
@@ -481,6 +481,12 @@ static inline int kvm_arm_tmm_init(ConfidentialGuestSupport *cgs, Error **errp G
|
|
g_assert_not_reached();
|
|
}
|
|
|
|
+static inline void tmm_add_ram_region(hwaddr base1, hwaddr len1, hwaddr base2,
|
|
+ hwaddr len2, bool populate)
|
|
+{
|
|
+ g_assert_not_reached();
|
|
+}
|
|
+
|
|
#endif
|
|
|
|
static inline const char *gic_class_name(void)
|
|
--
|
|
2.41.0.windows.1
|
|
|