Revision 8932cfdf hw/pc_piix.c

b/hw/pc_piix.c
233 233
             initrd_filename, cpu_model, 1, 1);
234 234
}
235 235

  
236
static void pc_init_pci_1_3(QEMUMachineInitArgs *args)
237
{
238
    enable_compat_apic_id_mode();
239
    pc_init_pci(args);
240
}
241

  
236 242
/* PC machine init function for pc-0.14 to pc-1.2 */
237 243
static void pc_init_pci_1_2(QEMUMachineInitArgs *args)
238 244
{
239 245
    disable_kvm_pv_eoi();
240
    pc_init_pci(args);
246
    pc_init_pci_1_3(args);
241 247
}
242 248

  
243 249
/* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */
......
250 256
    const char *initrd_filename = args->initrd_filename;
251 257
    const char *boot_device = args->boot_device;
252 258
    disable_kvm_pv_eoi();
259
    enable_compat_apic_id_mode();
253 260
    pc_init1(get_system_memory(),
254 261
             get_system_io(),
255 262
             ram_size, boot_device,
......
268 275
    if (cpu_model == NULL)
269 276
        cpu_model = "486";
270 277
    disable_kvm_pv_eoi();
278
    enable_compat_apic_id_mode();
271 279
    pc_init1(get_system_memory(),
272 280
             get_system_io(),
273 281
             ram_size, boot_device,
......
306 314
static QEMUMachine pc_machine_v1_3 = {
307 315
    .name = "pc-1.3",
308 316
    .desc = "Standard PC",
309
    .init = pc_init_pci,
317
    .init = pc_init_pci_1_3,
310 318
    .max_cpus = 255,
311 319
    .compat_props = (GlobalProperty[]) {
312 320
        PC_COMPAT_1_3,

Also available in: Unified diff