[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] i386: Move asserts to separate x86_cpudef_validate() functio
From: |
Eduardo Habkost |
Subject: |
[PATCH 2/3] i386: Move asserts to separate x86_cpudef_validate() function |
Date: |
Mon, 1 Feb 2021 17:54:03 -0500 |
Additional sanity checks will be added to the code, so move the
existing asserts to a separate function.
Wrap the whole function in `#ifndef NDEBUG` because the checks
will become more complex than trivial assert() calls.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/i386/cpu.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 2bf3ab78056..6285fb00eb8 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -5431,17 +5431,25 @@ static void x86_register_cpu_model_type(const char
*name, X86CPUModel *model)
type_register(&ti);
}
-static void x86_register_cpudef_types(X86CPUDefinition *def)
+/* Sanity check CPU model definition before registering it */
+static void x86_cpudef_validate(X86CPUDefinition *def)
{
- X86CPUModel *m;
- const X86CPUVersionDefinition *vdef;
-
+#ifndef NDEBUG
/* AMD aliases are handled at runtime based on CPUID vendor, so
* they shouldn't be set on the CPU model table.
*/
assert(!(def->features[FEAT_8000_0001_EDX] & CPUID_EXT2_AMD_ALIASES));
/* catch mistakes instead of silently truncating model_id when too long */
assert(def->model_id && strlen(def->model_id) <= 48);
+#endif
+}
+
+static void x86_register_cpudef_types(X86CPUDefinition *def)
+{
+ X86CPUModel *m;
+ const X86CPUVersionDefinition *vdef;
+
+ x86_cpudef_validate(def);
/* Unversioned model: */
m = g_new0(X86CPUModel, 1);
--
2.28.0
- [PATCH 0/3] i386: Ensure feature names are always defined, Eduardo Habkost, 2021/02/01
- [PATCH 1/3] i386: Add missing "vmx-ept-wb" feature name, Eduardo Habkost, 2021/02/01
- Re: [PATCH 1/3] i386: Add missing "vmx-ept-wb" feature name, Paolo Bonzini, 2021/02/01
- Re: [PATCH 1/3] i386: Add missing "vmx-ept-wb" feature name, Eduardo Habkost, 2021/02/01
- Re: [PATCH 1/3] i386: Add missing "vmx-ept-wb" feature name, Paolo Bonzini, 2021/02/01
- Re: [PATCH 1/3] i386: Add missing "vmx-ept-wb" feature name, Eduardo Habkost, 2021/02/01
- Re: [PATCH 1/3] i386: Add missing "vmx-ept-wb" feature name, Paolo Bonzini, 2021/02/02
- Re: [PATCH 1/3] i386: Add missing "vmx-ept-wb" feature name, Eduardo Habkost, 2021/02/02
[PATCH 2/3] i386: Move asserts to separate x86_cpudef_validate() function,
Eduardo Habkost <=
[PATCH 3/3] i386: Sanity check CPU model feature sets, Eduardo Habkost, 2021/02/01