mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow user to specify CPU model

Browse Source 
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-06-17 15:49:37 +00:00
parent 19a3da7f4d
commit 727170b671
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/ppc440.c
View File

@ -34,7 +34,8 @@ static const unsigned int ppc440ep_sdram_bank_sizes[] = {
};
CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip,
const unsigned int pci_irq_nrs[4], int do_init)
const unsigned int pci_irq_nrs[4], int do_init,
const char *cpu_model)
{
target_phys_addr_t ram_bases[PPC440EP_SDRAM_NR_BANKS];
target_phys_addr_t ram_sizes[PPC440EP_SDRAM_NR_BANKS];
@ -44,13 +45,9 @@ CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip,
qemu_irq *irqs;
qemu_irq *pci_irqs;
env = cpu_ppc_init("440EP");
if (!env && kvm_enabled()) {
/* XXX Since qemu doesn't yet emulate 440, we just say it's a 405.
* Since KVM doesn't use qemu's CPU emulation it seems to be working
* OK. */
env = cpu_ppc_init("405");
}
if (cpu_model == NULL)
cpu_model = "405"; // XXX: should be 440EP
env = cpu_init(cpu_model);
if (!env) {
fprintf(stderr, "Unable to initialize CPU!\n");
exit(1);

3
hw/ppc440.h
View File

@ -15,6 +15,7 @@
#include "hw.h"
CPUState *ppc440ep_init(ram_addr_t *ram_size, PCIBus **pcip,
const unsigned int pci_irq_nrs[4], int do_init);
const unsigned int pci_irq_nrs[4], int do_init,
const char *cpu_model);
#endif

2
hw/ppc440_bamboo.c
View File

@ -103,7 +103,7 @@ static void bamboo_init(ram_addr_t ram_size,
int i;
/* Setup CPU. */
env = ppc440ep_init(&ram_size, &pcibus, pci_irq_nrs, 1);
env = ppc440ep_init(&ram_size, &pcibus, pci_irq_nrs, 1, cpu_model);
if (pcibus) {
int unit_id = 0;