05fcc90d20
- hw/misc/mos6522: Fix bad class definition of the MOS6522 device - target/i386: Fix minor typo in NO_NESTED_DATA_BP feature bit - cpu: ensure we don't call start_exclusive from cpu_exec - Avoid unaligned fetch in ladr_match() - audio/audio.c: remove trailing newline in error_setg - acpi/tests/avocado/bits: wait for 200 seconds for SHUTDOWN event from bits VM - linux-user: Tolerate CONFIG_LSM_MMAP_MIN_ADDR - accel/tcg: Fix user-only probe_access_internal plugin - linux-user: Honor elf alignment when placing images - Reserve address for MSI mapping in the CVM scenario. Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 3ab56c27fe6b593be9a24f27b52b2730efa05304)
51 lines
2.0 KiB
Diff
51 lines
2.0 KiB
Diff
From c006b5b78ffe7e6af76cde943a9fdd082473ba55 Mon Sep 17 00:00:00 2001
|
|
From: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 18 Nov 2024 15:45:24 -0500
|
|
Subject: [PATCH] target/i386: Fix minor typo in NO_NESTED_DATA_BP feature bit
|
|
|
|
cheery-pick from 9c882ad4dc96f658ff9f92b88b3749d0398e6fa2
|
|
|
|
Rename CPUID_8000_0021_EAX_No_NESTED_DATA_BP to
|
|
CPUID_8000_0021_EAX_NO_NESTED_DATA_BP.
|
|
|
|
No functional change intended.
|
|
|
|
Signed-off-by: Babu Moger <babu.moger@amd.com>
|
|
Link: https://lore.kernel.org/r/a6749acd125670d3930f4ca31736a91b1d965f2f.1729807947.git.babu.moger@amd.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
|
---
|
|
target/i386/cpu.c | 2 +-
|
|
target/i386/cpu.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
index ca7e5337b0..c2dc929eaa 100644
|
|
--- a/target/i386/cpu.c
|
|
+++ b/target/i386/cpu.c
|
|
@@ -5063,7 +5063,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
|
|
CPUID_8000_0008_EBX_STIBP_ALWAYS_ON |
|
|
CPUID_8000_0008_EBX_AMD_SSBD | CPUID_8000_0008_EBX_AMD_PSFD,
|
|
.features[FEAT_8000_0021_EAX] =
|
|
- CPUID_8000_0021_EAX_No_NESTED_DATA_BP |
|
|
+ CPUID_8000_0021_EAX_NO_NESTED_DATA_BP |
|
|
CPUID_8000_0021_EAX_LFENCE_ALWAYS_SERIALIZING |
|
|
CPUID_8000_0021_EAX_NULL_SEL_CLR_BASE |
|
|
CPUID_8000_0021_EAX_AUTO_IBRS,
|
|
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
|
|
index 34f9615b98..6ca185cd9d 100644
|
|
--- a/target/i386/cpu.h
|
|
+++ b/target/i386/cpu.h
|
|
@@ -971,7 +971,7 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,
|
|
#define CPUID_8000_0008_EBX_AMD_PSFD (1U << 28)
|
|
|
|
/* Processor ignores nested data breakpoints */
|
|
-#define CPUID_8000_0021_EAX_No_NESTED_DATA_BP (1U << 0)
|
|
+#define CPUID_8000_0021_EAX_NO_NESTED_DATA_BP (1U << 0)
|
|
/* LFENCE is always serializing */
|
|
#define CPUID_8000_0021_EAX_LFENCE_ALWAYS_SERIALIZING (1U << 2)
|
|
/* Null Selector Clears Base */
|
|
--
|
|
2.41.0.windows.1
|
|
|