Revision ffce9ebb

b/hw/i386/pc_piix.c
344 344
    .init = pc_init_pci,
345 345
    .hot_add_cpu = pc_hot_add_cpu,
346 346
    .max_cpus = 255,
347
    .compat_props = (GlobalProperty[]) {
348
        PC_COMPAT_1_5,
349
        { /* end of list */ }
350
    },
347 351
    DEFAULT_MACHINE_OPTIONS,
348 352
};
349 353

  
b/hw/i386/pc_q35.c
231 231
    .init = pc_q35_init,
232 232
    .hot_add_cpu = pc_hot_add_cpu,
233 233
    .max_cpus = 255,
234
    .compat_props = (GlobalProperty[]) {
235
        PC_COMPAT_1_5,
236
        { /* end of list */ }
237
    },
234 238
    DEFAULT_MACHINE_OPTIONS,
235 239
};
236 240

  
b/include/hw/i386/pc.h
185 185

  
186 186
int e820_add_entry(uint64_t, uint64_t, uint32_t);
187 187

  
188
#define PC_COMPAT_1_5 \
189
        {\
190
            .driver   = "Conroe-" TYPE_X86_CPU,\
191
            .property = "model",\
192
            .value    = stringify(2),\
193
        },{\
194
            .driver   = "Penryn-" TYPE_X86_CPU,\
195
            .property = "model",\
196
            .value    = stringify(2),\
197
        },{\
198
            .driver   = "Nehalem-" TYPE_X86_CPU,\
199
            .property = "model",\
200
            .value    = stringify(2),\
201
        }
202

  
188 203
#define PC_COMPAT_1_4 \
204
        PC_COMPAT_1_5, \
189 205
        {\
190 206
            .driver   = "scsi-hd",\
191 207
            .property = "discard_granularity",\
b/target-i386/cpu.c
672 672
        .level = 2,
673 673
        .vendor = CPUID_VENDOR_INTEL,
674 674
        .family = 6,
675
        .model = 2,
675
        .model = 15,
676 676
        .stepping = 3,
677 677
        .features[FEAT_1_EDX] =
678 678
            CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
......
694 694
        .level = 2,
695 695
        .vendor = CPUID_VENDOR_INTEL,
696 696
        .family = 6,
697
        .model = 2,
697
        .model = 23,
698 698
        .stepping = 3,
699 699
        .features[FEAT_1_EDX] =
700 700
            CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
......
717 717
        .level = 2,
718 718
        .vendor = CPUID_VENDOR_INTEL,
719 719
        .family = 6,
720
        .model = 2,
720
        .model = 26,
721 721
        .stepping = 3,
722 722
        .features[FEAT_1_EDX] =
723 723
            CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |

Also available in: Unified diff