Commit 70166477 authored by Isaku Yamahata's avatar Isaku Yamahata Committed by Blue Swirl
Browse files

pc: split out cpu initialization from pc_init1() into pc_cpus_init(). 



split out cpu initialization which is piix independent from pc_init1()
into pc_cpus_init(). Later it will be used.

Signed-off-by: default avatarIsaku Yamahata <yamahata@valinux.co.jp>
Acked-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 8e78eb28

hw/pc.c

+19 −12
Original line number Diff line number Diff line
@@ -811,6 +811,24 @@ static CPUState *pc_new_cpu(const char *cpu_model) 
    return env;

}



static void pc_cpus_init(const char *cpu_model)

{

    int i;



    /* init CPUs */

    if (cpu_model == NULL) {

#ifdef TARGET_X86_64

        cpu_model = "qemu64";

#else

        cpu_model = "qemu32";

#endif

    }



    for(i = 0; i < smp_cpus; i++) {

        pc_new_cpu(cpu_model);

    }

}



static qemu_irq *pc_allocate_cpu_irq(void)

{

    return qemu_allocate_irqs(pic_irq_request, NULL, 1);
@@ -855,18 +873,7 @@ static void pc_init1(ram_addr_t ram_size, 


    linux_boot = (kernel_filename != NULL);



    /* init CPUs */

    if (cpu_model == NULL) {

#ifdef TARGET_X86_64

        cpu_model = "qemu64";

#else

        cpu_model = "qemu32";

#endif

    }



    for (i = 0; i < smp_cpus; i++) {

        pc_new_cpu(cpu_model);

    }

    pc_cpus_init(cpu_model);



    vmport_init();