Skip to content

Commit

Permalink
Merge pull request #4077 from PaulYuuu/pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulYuuu authored Sep 18, 2024
2 parents 4cc64ef + 0982c12 commit 6ac6e9f
Show file tree
Hide file tree
Showing 24 changed files with 2,614 additions and 2,587 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: pre-commit

on:
pull_request:
push:
branches: [master]

jobs:
pre-commit:
runs-on: ubuntu-latest
env:
SKIP: no-commit-to-branch
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.9
- uses: pre-commit/[email protected]
22 changes: 22 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
exclude: "qemu/deps/cpuid/cpuid_dumps/kvm"
repos:
- repo: local
hooks:
- id: cfg-lint
entry: .ci/cfg-lint-check.py
files: (^|/)tests/cfg/.+\.cfg$
language: python
name: check cfg
require_serial: true
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
hooks:
- id: check-added-large-files
args: ["--maxkb=5120"]
- id: check-ast
- id: check-yaml
- id: end-of-file-fixer
- id: mixed-line-ending
args: ["--fix=lf"]
- id: no-commit-to-branch
- id: trailing-whitespace
2 changes: 1 addition & 1 deletion CODING_STYLE
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ import urllib
import urlparse
import MySQLdb
try:
import autotest.common
import autotest.common
except ImportError:
import common # Magic autotest module and sys.path setup code.
import MySQLdb # After common so that we check our site-packages first.
Expand Down
1 change: 0 additions & 1 deletion deps/cpu_flags/src/sse3.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@ int sse3(){
return 0;
}
#endif

6 changes: 3 additions & 3 deletions generic/deps/iometer/iometer-performance.icf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Version 2006.07.27
Version 2006.07.27
'TEST SETUP ====================================================================
'Test Description

'Run Time
' hours minutes seconds
0 3 0
Expand Down Expand Up @@ -293,4 +293,4 @@ Version 2006.07.27
'End worker
'End manager
'END manager list
Version 2006.07.27
Version 2006.07.27
6 changes: 3 additions & 3 deletions generic/deps/iometer/iometer.icf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Version 2006.07.27
Version 2006.07.27
'TEST SETUP ====================================================================
'Test Description

'Run Time
' hours minutes seconds
0 0 2
Expand Down Expand Up @@ -293,4 +293,4 @@ Version 2006.07.27
'End worker
'End manager
'END manager list
Version 2006.07.27
Version 2006.07.27
2 changes: 1 addition & 1 deletion qemu/control_files/control.parallel
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ params = {
## If you provide only "git_repo" and "user_git_repo", the build test
## will assume it will perform all build from the userspace dir, building
## modules trough make -C kernel LINUX=%s sync. As of today (07-13-2009)
## we need 3 git repos, "git_repo" (linux sources), "user_git_repo" and
## we need 3 git repos, "git_repo" (linux sources), "user_git_repo" and
## "kmod_repo" to build KVM userspace + kernel modules.
#"git_repo": 'git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git',
#"kernel_branch": 'kernel_branch_name',
Expand Down
2 changes: 1 addition & 1 deletion qemu/deps/cpuid/README
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ e.g New cpu_model: Haswell
Make sure the host cpu model is "Haswell" or advance than "Haswell"
and support rhel7.0 machine type
2). Add cpu_model
Add cpu model Haswell to file cpuid/cpuid_dumps/scripts/dump-cpus-from-qemu
Add cpu model Haswell to file cpuid/cpuid_dumps/scripts/dump-cpus-from-qemu
3). Add machine_tpye
Add machine type rhel7.0 to file cpuid/cpuid_dumps/scripts/dump-cpus-from-qemu
and to file cpuid/cpuid_dumps/scripts/machines-versions
Expand Down
43 changes: 21 additions & 22 deletions qemu/deps/cpuid/cpuid_dump.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ x86 Opteron_G4 AMD Opteron 62xx class CPU
extfeature_edx (lm|i64 rdtscp pdpe1gb fxsr mmx nx|xd pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx (fma4 xop 3dnowprefetch misalignsse sse4a abm svm lahf_lm)

x86 Opteron_G3 AMD Opteron 23xx (Gen 3 Class Opteron)
x86 Opteron_G3 AMD Opteron 23xx (Gen 3 Class Opteron)
family 15 model 6 stepping 1 level 5 xlevel 0x80000008 vendor "AuthenticAMD"
feature_edx (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr apic cx8 mce pae msr tsc pse de fpu)
feature_ecx (popcnt x2apic cx16 monitor pni|sse3)
extfeature_edx (lm|i64 rdtscp fxsr mmx nx|xd pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx (misalignsse sse4a abm svm)

x86 Opteron_G2 AMD Opteron 22xx (Gen 2 Class Opteron)
x86 Opteron_G2 AMD Opteron 22xx (Gen 2 Class Opteron)
family 15 model 6 stepping 1 level 5 xlevel 0x80000008 vendor "AuthenticAMD"
feature_edx (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr apic cx8 mce pae msr tsc pse de fpu)
feature_ecx (x2apic cx16 pni|sse3)
extfeature_edx (lm|i64 rdtscp fxsr mmx nx|xd pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx (svm)

x86 Opteron_G1 AMD Opteron 240 (Gen 1 Class Opteron)
x86 Opteron_G1 AMD Opteron 240 (Gen 1 Class Opteron)
family 15 model 6 stepping 1 level 5 xlevel 0x80000008 vendor "AuthenticAMD"
feature_edx (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr apic cx8 mce pae msr tsc pse de fpu)
feature_ecx (x2apic pni|sse3)
Expand All @@ -48,129 +48,128 @@ x86 SandyBridge Intel Xeon E312xx (Sandy Bridge)
extfeature_edx (lm|i64 nx|xd syscall)
extfeature_ecx (lahf_lm)

x86 Westmere Westmere E56xx/L56xx/X56xx (Nehalem-C)
x86 Westmere Westmere E56xx/L56xx/X56xx (Nehalem-C)
family 6 model 44 stepping 1 level 11 xlevel 0x8000000a vendor "GenuineIntel"
feature_edx (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr apic cx8 mce pae msr tsc pse de fpu)
feature_ecx (aes popcnt x2apic sse4.2|sse4_2 sse4.1|sse4_1 cx16 ssse3 pni|sse3)
extfeature_edx (lm|i64 fxsr mmx nx|xd pat cmov pge syscall apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx (lahf_lm)

x86 Nehalem Intel Core i7 9xx (Nehalem Class Core i7)
x86 Nehalem Intel Core i7 9xx (Nehalem Class Core i7)
family 6 model 26 stepping 3 level 2 xlevel 0x8000000a vendor "GenuineIntel"
feature_edx (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr apic cx8 mce pae msr tsc pse de fpu)
feature_ecx (popcnt x2apic sse4.2|sse4_2 sse4.1|sse4_1 cx16 ssse3 pni|sse3)
extfeature_edx (lm|i64 nx|xd syscall)
extfeature_ecx (lahf_lm)

x86 Penryn Intel Core 2 Duo P9xxx (Penryn Class Core 2)
x86 Penryn Intel Core 2 Duo P9xxx (Penryn Class Core 2)
family 6 model 23 stepping 3 level 2 xlevel 0x8000000a vendor "GenuineIntel"
feature_edx (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr apic cx8 mce pae msr tsc pse de fpu)
feature_ecx (x2apic sse4.1|sse4_1 cx16 ssse3 pni|sse3)
extfeature_edx (lm|i64 nx|xd syscall)
extfeature_ecx (lahf_lm)

x86 Conroe Intel Celeron_4x0 (Conroe/Merom Class Core 2)
x86 Conroe Intel Celeron_4x0 (Conroe/Merom Class Core 2)
family 6 model 15 stepping 3 level 2 xlevel 0x8000000a vendor "GenuineIntel"
feature_edx (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr apic cx8 mce pae msr tsc pse de fpu)
feature_ecx (x2apic ssse3 pni|sse3)
extfeature_edx (lm|i64 nx|xd syscall)
extfeature_ecx (lahf_lm)

x86 cpu64-rhel5 QEMU Virtual CPU version (cpu64-rhel5)
x86 cpu64-rhel5 QEMU Virtual CPU version (cpu64-rhel5)
family 6 model 6 stepping 3 level 4 xlevel 0x8000000a vendor "AuthenticAMD"
feature_edx (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr apic cx8 mce pae msr tsc pse de fpu)
feature_ecx (pni|sse3)
extfeature_edx (3dnow 3dnowext lm|i64 fxsr mmx nx|xd pat cmov pge syscall apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx (svm)

x86 cpu64-rhel6 QEMU Virtual CPU version (cpu64-rhel6)
x86 cpu64-rhel6 QEMU Virtual CPU version (cpu64-rhel6)
family 6 model 13 stepping 3 level 4 xlevel 0x8000000a vendor "AuthenticAMD"
feature_edx 078bfbfd (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr apic cx8 mce pae msr tsc pse de fpu)
feature_ecx 00002001 (cx16 pni|sse3)
extfeature_edx 2191abfd (lm|i64 fxsr mmx nx|xd pat cmov pge syscall apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx 00000065 (sse4a abm svm lahf_lm)

x86 [n270] Intel(R) Atom(TM) CPU N270 @ 1.60GHz
x86 [n270] Intel(R) Atom(TM) CPU N270 @ 1.60GHz
family 6 model 28 stepping 2 level 5 xlevel 0x8000000a vendor ""
feature_edx 0789fbff (sse2 sse fxsr mmx clflush pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de vme fpu)
feature_ecx 00000209 (ssse3 monitor pni|sse3)
extfeature_edx 0191a3fd (fxsr mmx nx|xd pat cmov pge apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx 00000000 ()

x86 [athlon] QEMU Virtual CPU version 0.12.1
x86 [athlon] QEMU Virtual CPU version 0.12.1
family 6 model 2 stepping 3 level 2 xlevel 0x80000008 vendor "AuthenticAMD"
feature_edx 0783fbff (sse2 sse fxsr mmx pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de vme fpu)
feature_ecx 00000000 ()
extfeature_edx c1c1a3fd (3dnow 3dnowext fxsr mmx mmxext pat cmov pge apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx 00000000 ()

x86 [pentium3]
x86 [pentium3]
family 6 model 7 stepping 3 level 2 xlevel 0x0 vendor ""
feature_edx 0383f9ff (sse fxsr mmx pse36 pat cmov mca pge mtrr sep cx8 mce pae msr tsc pse de vme fpu)
feature_ecx 00000000 ()
extfeature_edx 00000000 ()
extfeature_ecx 00000000 ()

x86 [pentium2]
x86 [pentium2]
family 6 model 5 stepping 2 level 2 xlevel 0x0 vendor ""
feature_edx 0183f9ff (fxsr mmx pse36 pat cmov mca pge mtrr sep cx8 mce pae msr tsc pse de vme fpu)
feature_ecx 00000000 ()
extfeature_edx 00000000 ()
extfeature_ecx 00000000 ()

x86 [pentium]
x86 [pentium]
family 5 model 4 stepping 3 level 1 xlevel 0x0 vendor ""
feature_edx 008001bf (mmx cx8 mce msr tsc pse de vme fpu)
feature_ecx 00000000 ()
extfeature_edx 00000000 ()
extfeature_ecx 00000000 ()

x86 [486]
x86 [486]
family 4 model 0 stepping 0 level 0 xlevel 0x0 vendor ""
feature_edx 0000000b (pse vme fpu)
feature_ecx 00000000 ()
extfeature_edx 00000000 ()
extfeature_ecx 00000000 ()

x86 [coreduo] Genuine Intel(R) CPU T2600 @ 2.16GHz
x86 [coreduo] Genuine Intel(R) CPU T2600 @ 2.16GHz
family 6 model 14 stepping 8 level 10 xlevel 0x80000008 vendor ""
feature_edx 0789fbff (sse2 sse fxsr mmx clflush pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de vme fpu)
feature_ecx 00000009 (monitor pni|sse3)
extfeature_edx 00100000 (nx|xd)
extfeature_ecx 00000000 ()

x86 [qemu32] QEMU Virtual CPU version 0.12.1
x86 [qemu32] QEMU Virtual CPU version 0.12.1
family 6 model 3 stepping 3 level 4 xlevel 0x0 vendor ""
feature_edx 0781abfd (sse2 sse fxsr mmx pat cmov pge sep apic cx8 mce pae msr tsc pse de fpu)
feature_ecx 00800001 (popcnt pni|sse3)
extfeature_edx 00000000 ()
extfeature_ecx 00000000 ()

x86 [kvm64] Common KVM processor
x86 [kvm64] Common KVM processor
family 15 model 6 stepping 1 level 5 xlevel 0x80000008 vendor "GenuineIntel"
feature_edx 078bfbfd (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu)
feature_ecx 00002001 (cx16 pni|sse3)
extfeature_edx 2191abfd (lm|i64 fxsr mmx nx|xd pat cmov pge syscall apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx 00000000 ()

x86 [core2duo] Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz
x86 [core2duo] Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz
family 6 model 15 stepping 11 level 10 xlevel 0x80000008 vendor ""
feature_edx 078bfbfd (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu)
feature_ecx 00000209 (ssse3 monitor pni|sse3)
extfeature_edx 20100800 (lm|i64 nx|xd syscall)
extfeature_ecx 00000001 (lahf_lm)

x86 [phenom] AMD Phenom(tm) 9550 Quad-Core Processor
x86 [phenom] AMD Phenom(tm) 9550 Quad-Core Processor
family 16 model 2 stepping 3 level 5 xlevel 0x8000001a vendor "AuthenticAMD"
feature_edx 078bfbfd (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu)
feature_ecx 00802009 (popcnt cx16 monitor pni|sse3)
extfeature_edx e3d1abfd (3dnow 3dnowext lm|i64 fxsr_opt fxsr mmx mmxext nx|xd pat cmov pge syscall apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx 00000065 (sse4a abm svm lahf_lm)

x86 [qemu64] QEMU Virtual CPU version 0.12.1
x86 [qemu64] QEMU Virtual CPU version 0.12.1
family 6 model 6 stepping 3 level 4 xlevel 0x8000000a vendor "AuthenticAMD"
feature_edx 078bfbfd (sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu)
feature_ecx 00802001 (popcnt cx16 pni|sse3)
extfeature_edx 2191abfd (lm|i64 fxsr mmx nx|xd pat cmov pge syscall apic cx8 mce pae msr tsc pse de fpu)
extfeature_ecx 00000065 (sse4a abm svm lahf_lm)

3,060 changes: 1,530 additions & 1,530 deletions qemu/deps/dgreadiness/DG_Readiness_Tool_v3.6.ps1

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion qemu/deps/nx/x64_sc_rdo.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,3 @@ main(void)
p();
return 0;
}

Loading

0 comments on commit 6ac6e9f

Please sign in to comment.