[libvirt PATCH 1/2] sync_qemu_models_i386.py: Fix complaint from flake8
Line was too long. Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/cpu_map/sync_qemu_models_i386.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py index 37bbe6d09e..4974b30b43 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -208,7 +208,8 @@ def read_builtin_x86_defs(filename): """Extract content between begin_mark and end_mark from file `filename` as string, while expanding shorthand macros like "I486_FEATURES".""" - begin_mark = re.compile("^static( const)? X86CPUDefinition builtin_x86_defs\\[\\] = {$") + begin_mark = re.compile( + "^static( const)? X86CPUDefinition builtin_x86_defs\\[\\] = {$") end_mark = "};\n" shorthand = re.compile("^#define ([A-Z0-9_]+_FEATURES) (.*)$") lines = list() -- 2.39.2
This brings the tool's list of features in sync with qemu commit 886c0453cbf10eebd42a9ccf89c3e46eb389c357. Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/cpu_map/sync_qemu_models_i386.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py index 4974b30b43..b5e738def7 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -84,13 +84,20 @@ def translate_feature(name): "CPUID_7_1_EAX_FSRC": "fsrc", "CPUID_7_1_EAX_FSRS": "fsrs", "CPUID_7_1_EAX_FZRM": "fzrm", + "CPUID_8000_0008_EBX_AMD_PSFD": "amd-psfd", "CPUID_8000_0008_EBX_AMD_SSBD": "amd-ssbd", "CPUID_8000_0008_EBX_CLZERO": "clzero", "CPUID_8000_0008_EBX_IBPB": "ibpb", "CPUID_8000_0008_EBX_IBRS": "ibrs", "CPUID_8000_0008_EBX_STIBP": "amd-stibp", + "CPUID_8000_0008_EBX_STIBP_ALWAYS_ON": "stibp-always-on", "CPUID_8000_0008_EBX_WBNOINVD": "wbnoinvd", "CPUID_8000_0008_EBX_XSAVEERPTR": "xsaveerptr", + "CPUID_8000_0021_EAX_AUTO_IBRS": "auto-ibrs", + "CPUID_8000_0021_EAX_LFENCE_ALWAYS_SERIALIZING": + "lfence-always-serializing", + "CPUID_8000_0021_EAX_NULL_SEL_CLR_BASE": "null-sel-clr-base", + "CPUID_8000_0021_EAX_No_NESTED_DATA_BP": "no-nested-data-bp", "CPUID_ACPI": "acpi", "CPUID_APIC": "apic", "CPUID_CLFLUSH": "clflush", @@ -155,6 +162,7 @@ def translate_feature(name): "CPUID_SVM_NPT": "npt", "CPUID_SVM_NRIPSAVE": "nrip-save", "CPUID_SVM_SVME_ADDR_CHK": "svme-addr-chk", + "CPUID_SVM_VNMI": "vnmi", "CPUID_TSC": "tsc", "CPUID_VME": "vme", "CPUID_XSAVE_XGETBV1": "xgetbv1", -- 2.39.2
On 5/24/23 13:00, Tim Wiederhake wrote:
This brings the tool's list of features in sync with qemu commit 886c0453cbf10eebd42a9ccf89c3e46eb389c357.
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> --- src/cpu_map/sync_qemu_models_i386.py | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py index 4974b30b43..b5e738def7 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -84,13 +84,20 @@ def translate_feature(name): "CPUID_7_1_EAX_FSRC": "fsrc", "CPUID_7_1_EAX_FSRS": "fsrs", "CPUID_7_1_EAX_FZRM": "fzrm", + "CPUID_8000_0008_EBX_AMD_PSFD": "amd-psfd", "CPUID_8000_0008_EBX_AMD_SSBD": "amd-ssbd", "CPUID_8000_0008_EBX_CLZERO": "clzero", "CPUID_8000_0008_EBX_IBPB": "ibpb", "CPUID_8000_0008_EBX_IBRS": "ibrs", "CPUID_8000_0008_EBX_STIBP": "amd-stibp", + "CPUID_8000_0008_EBX_STIBP_ALWAYS_ON": "stibp-always-on", "CPUID_8000_0008_EBX_WBNOINVD": "wbnoinvd", "CPUID_8000_0008_EBX_XSAVEERPTR": "xsaveerptr", + "CPUID_8000_0021_EAX_AUTO_IBRS": "auto-ibrs", + "CPUID_8000_0021_EAX_LFENCE_ALWAYS_SERIALIZING": + "lfence-always-serializing", + "CPUID_8000_0021_EAX_NULL_SEL_CLR_BASE": "null-sel-clr-base", + "CPUID_8000_0021_EAX_No_NESTED_DATA_BP": "no-nested-data-bp", "CPUID_ACPI": "acpi", "CPUID_APIC": "apic", "CPUID_CLFLUSH": "clflush", @@ -155,6 +162,7 @@ def translate_feature(name): "CPUID_SVM_NPT": "npt", "CPUID_SVM_NRIPSAVE": "nrip-save", "CPUID_SVM_SVME_ADDR_CHK": "svme-addr-chk", + "CPUID_SVM_VNMI": "vnmi", "CPUID_TSC": "tsc", "CPUID_VME": "vme", "CPUID_XSAVE_XGETBV1": "xgetbv1",
For both: Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Michal Prívozník -
Tim Wiederhake