Revision e2d87bff

b/Makefile
281 281
	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
282 282
	$(INSTALL_DATA) fsdev/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1"
283 283
endif
284
install-sysconfig:
284

  
285
install-datadir:
286
	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)"
287

  
288
install-confdir:
285 289
	$(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)"
290

  
291
install-sysconfig: install-datadir install-confdir
286 292
	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
293
	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/cpus-x86_64.conf "$(DESTDIR)$(qemu_datadir)"
287 294

  
288
install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig
295
install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig install-datadir
289 296
	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
290 297
ifneq ($(TOOLS),)
291 298
	$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
......
295 302
	$(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
296 303
endif
297 304
ifneq ($(BLOBS),)
298
	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)"
299 305
	set -e; for x in $(BLOBS); do \
300 306
		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \
301 307
	done
b/arch_init.c
117 117
    /* Indicates it is an user config file (disabled by -no-user-config) */
118 118
    bool userconfig;
119 119
} default_config_files[] = {
120
    { CONFIG_QEMU_DATADIR "/cpus-" TARGET_ARCH ".conf",  false },
120 121
    { CONFIG_QEMU_CONFDIR "/qemu.conf",                   true },
121 122
    { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf", true },
122 123
    { NULL }, /* end of list */
b/sysconfigs/target/cpus-x86_64.conf
1
# x86 CPU MODELS
2

  
3
[cpudef]
4
   name = "Conroe"
5
   level = "2"
6
   vendor = "GenuineIntel"
7
   family = "6"
8
   model = "2"
9
   stepping = "3"
10
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
11
   feature_ecx = "ssse3 sse3"
12
   extfeature_edx = "i64 xd syscall"
13
   extfeature_ecx = "lahf_lm"
14
   xlevel = "0x8000000A"
15
   model_id = "Intel Celeron_4x0 (Conroe/Merom Class Core 2)"
16

  
17
[cpudef]
18
   name = "Penryn"
19
   level = "2"
20
   vendor = "GenuineIntel"
21
   family = "6"
22
   model = "2"
23
   stepping = "3"
24
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
25
   feature_ecx = "sse4.1 cx16 ssse3 sse3"
26
   extfeature_edx = "i64 xd syscall"
27
   extfeature_ecx = "lahf_lm"
28
   xlevel = "0x8000000A"
29
   model_id = "Intel Core 2 Duo P9xxx (Penryn Class Core 2)"
30

  
31
[cpudef]
32
   name = "Nehalem"
33
   level = "2"
34
   vendor = "GenuineIntel"
35
   family = "6"
36
   model = "2"
37
   stepping = "3"
38
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
39
   feature_ecx = "popcnt sse4.2 sse4.1 cx16 ssse3 sse3"
40
   extfeature_edx = "i64 syscall xd"
41
   extfeature_ecx = "lahf_lm"
42
   xlevel = "0x8000000A"
43
   model_id = "Intel Core i7 9xx (Nehalem Class Core i7)"
44

  
45
[cpudef]
46
   name = "Westmere"
47
   level = "11"
48
   vendor = "GenuineIntel"
49
   family = "6"
50
   model = "44"
51
   stepping = "1"
52
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
53
   feature_ecx = "aes popcnt sse4.2 sse4.1 cx16 ssse3 sse3"
54
   extfeature_edx = "i64 syscall xd"
55
   extfeature_ecx = "lahf_lm"
56
   xlevel = "0x8000000A"
57
   model_id = "Westmere E56xx/L56xx/X56xx (Nehalem-C)"
58

  
59
[cpudef]
60
   name = "SandyBridge"
61
   level = "0xd"
62
   vendor = "GenuineIntel"
63
   family = "6"
64
   model = "42"
65
   stepping = "1"
66
   feature_edx = " sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
67
   feature_ecx = "avx xsave aes tsc-deadline popcnt x2apic sse4.2 sse4.1 cx16 ssse3 pclmulqdq sse3"
68
   extfeature_edx = "i64 rdtscp nx syscall "
69
   extfeature_ecx = "lahf_lm"
70
   xlevel = "0x8000000A"
71
   model_id = "Intel Xeon E312xx (Sandy Bridge)"
72

  
73
[cpudef]
74
   name = "Opteron_G1"
75
   level = "5"
76
   vendor = "AuthenticAMD"
77
   family = "15"
78
   model = "6"
79
   stepping = "1"
80
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
81
   feature_ecx = "sse3"
82
   extfeature_edx = "lm fxsr mmx nx pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu"
83
   extfeature_ecx = " "
84
   xlevel = "0x80000008"
85
   model_id = "AMD Opteron 240 (Gen 1 Class Opteron)"
86

  
87
[cpudef]
88
   name = "Opteron_G2"
89
   level = "5"
90
   vendor = "AuthenticAMD"
91
   family = "15"
92
   model = "6"
93
   stepping = "1"
94
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
95
   feature_ecx = "cx16 sse3"
96
   extfeature_edx = "lm rdtscp fxsr mmx nx pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu"
97
   extfeature_ecx = "svm lahf_lm"
98
   xlevel = "0x80000008"
99
   model_id = "AMD Opteron 22xx (Gen 2 Class Opteron)"
100

  
101
[cpudef]
102
   name = "Opteron_G3"
103
   level = "5"
104
   vendor = "AuthenticAMD"
105
   family = "15"
106
   model = "6"
107
   stepping = "1"
108
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
109
   feature_ecx = "popcnt cx16 monitor sse3"
110
   extfeature_edx = "lm rdtscp fxsr mmx nx pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu"
111
   extfeature_ecx = "misalignsse sse4a abm svm lahf_lm"
112
   xlevel = "0x80000008"
113
   model_id = "AMD Opteron 23xx (Gen 3 Class Opteron)"
114

  
115
[cpudef]
116
   name = "Opteron_G4"
117
   level = "0xd"
118
   vendor = "AuthenticAMD"
119
   family = "21"
120
   model = "1"
121
   stepping = "2"
122
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
123
   feature_ecx = "avx xsave aes popcnt sse4.2 sse4.1 cx16 ssse3 pclmulqdq sse3"
124
   extfeature_edx = "lm rdtscp pdpe1gb fxsr mmx nx pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu"
125
   extfeature_ecx = " fma4 xop 3dnowprefetch misalignsse sse4a abm svm lahf_lm"
126
   xlevel = "0x8000001A"
127
   model_id = "AMD Opteron 62xx class CPU"
128

  
b/sysconfigs/target/target-x86_64.conf
1
# x86 CPU MODELS
2

  
3
[cpudef]
4
   name = "Conroe"
5
   level = "2"
6
   vendor = "GenuineIntel"
7
   family = "6"
8
   model = "2"
9
   stepping = "3"
10
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
11
   feature_ecx = "ssse3 sse3"
12
   extfeature_edx = "i64 xd syscall"
13
   extfeature_ecx = "lahf_lm"
14
   xlevel = "0x8000000A"
15
   model_id = "Intel Celeron_4x0 (Conroe/Merom Class Core 2)"
16

  
17
[cpudef]
18
   name = "Penryn"
19
   level = "2"
20
   vendor = "GenuineIntel"
21
   family = "6"
22
   model = "2"
23
   stepping = "3"
24
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
25
   feature_ecx = "sse4.1 cx16 ssse3 sse3"
26
   extfeature_edx = "i64 xd syscall"
27
   extfeature_ecx = "lahf_lm"
28
   xlevel = "0x8000000A"
29
   model_id = "Intel Core 2 Duo P9xxx (Penryn Class Core 2)"
30

  
31
[cpudef]
32
   name = "Nehalem"
33
   level = "2"
34
   vendor = "GenuineIntel"
35
   family = "6"
36
   model = "2"
37
   stepping = "3"
38
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
39
   feature_ecx = "popcnt sse4.2 sse4.1 cx16 ssse3 sse3"
40
   extfeature_edx = "i64 syscall xd"
41
   extfeature_ecx = "lahf_lm"
42
   xlevel = "0x8000000A"
43
   model_id = "Intel Core i7 9xx (Nehalem Class Core i7)"
44

  
45
[cpudef]
46
   name = "Westmere"
47
   level = "11"
48
   vendor = "GenuineIntel"
49
   family = "6"
50
   model = "44"
51
   stepping = "1"
52
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
53
   feature_ecx = "aes popcnt sse4.2 sse4.1 cx16 ssse3 sse3"
54
   extfeature_edx = "i64 syscall xd"
55
   extfeature_ecx = "lahf_lm"
56
   xlevel = "0x8000000A"
57
   model_id = "Westmere E56xx/L56xx/X56xx (Nehalem-C)"
58

  
59
[cpudef]
60
   name = "SandyBridge"
61
   level = "0xd"
62
   vendor = "GenuineIntel"
63
   family = "6"
64
   model = "42"
65
   stepping = "1"
66
   feature_edx = " sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
67
   feature_ecx = "avx xsave aes tsc-deadline popcnt x2apic sse4.2 sse4.1 cx16 ssse3 pclmulqdq sse3"
68
   extfeature_edx = "i64 rdtscp nx syscall "
69
   extfeature_ecx = "lahf_lm"
70
   xlevel = "0x8000000A"
71
   model_id = "Intel Xeon E312xx (Sandy Bridge)"
72

  
73
[cpudef]
74
   name = "Opteron_G1"
75
   level = "5"
76
   vendor = "AuthenticAMD"
77
   family = "15"
78
   model = "6"
79
   stepping = "1"
80
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
81
   feature_ecx = "sse3"
82
   extfeature_edx = "lm fxsr mmx nx pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu"
83
   extfeature_ecx = " "
84
   xlevel = "0x80000008"
85
   model_id = "AMD Opteron 240 (Gen 1 Class Opteron)"
86

  
87
[cpudef]
88
   name = "Opteron_G2"
89
   level = "5"
90
   vendor = "AuthenticAMD"
91
   family = "15"
92
   model = "6"
93
   stepping = "1"
94
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
95
   feature_ecx = "cx16 sse3"
96
   extfeature_edx = "lm rdtscp fxsr mmx nx pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu"
97
   extfeature_ecx = "svm lahf_lm"
98
   xlevel = "0x80000008"
99
   model_id = "AMD Opteron 22xx (Gen 2 Class Opteron)"
100

  
101
[cpudef]
102
   name = "Opteron_G3"
103
   level = "5"
104
   vendor = "AuthenticAMD"
105
   family = "15"
106
   model = "6"
107
   stepping = "1"
108
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
109
   feature_ecx = "popcnt cx16 monitor sse3"
110
   extfeature_edx = "lm rdtscp fxsr mmx nx pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu"
111
   extfeature_ecx = "misalignsse sse4a abm svm lahf_lm"
112
   xlevel = "0x80000008"
113
   model_id = "AMD Opteron 23xx (Gen 3 Class Opteron)"
114

  
115
[cpudef]
116
   name = "Opteron_G4"
117
   level = "0xd"
118
   vendor = "AuthenticAMD"
119
   family = "21"
120
   model = "1"
121
   stepping = "2"
122
   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
123
   feature_ecx = "avx xsave aes popcnt sse4.2 sse4.1 cx16 ssse3 pclmulqdq sse3"
124
   extfeature_edx = "lm rdtscp pdpe1gb fxsr mmx nx pse36 pat cmov mca pge mtrr syscall apic cx8 mce pae msr tsc pse de fpu"
125
   extfeature_ecx = " fma4 xop 3dnowprefetch misalignsse sse4a abm svm lahf_lm"
126
   xlevel = "0x8000001A"
127
   model_id = "AMD Opteron 62xx class CPU"
128

  

Also available in: Unified diff