OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

New -cpu options: choose CPU model for emulated target.

Browse Source 
Only relevant on PowerPC targets, for now.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2468 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
j_mayer 2007-03-05 19:44:02 +00:00
parent 7a2d6d9650
commit 94fc95cdb2
13 changed files with 75 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/integratorcp.c
View File

@ -516,7 +516,7 @@ static void integratorcp_init(int ram_size, int vga_ram_size, int boot_device,
static void integratorcp926_init(int ram_size, int vga_ram_size, static void integratorcp926_init(int ram_size, int vga_ram_size,
int boot_device, DisplayState *ds, const char **fd_filename, int snapshot, int boot_device, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename, const char *cpu_model)
{ {
integratorcp_init(ram_size, vga_ram_size, boot_device, ds, fd_filename, integratorcp_init(ram_size, vga_ram_size, boot_device, ds, fd_filename,
snapshot, kernel_filename, kernel_cmdline, snapshot, kernel_filename, kernel_cmdline,
@ -526,7 +526,7 @@ static void integratorcp926_init(int ram_size, int vga_ram_size,
static void integratorcp1026_init(int ram_size, int vga_ram_size, static void integratorcp1026_init(int ram_size, int vga_ram_size,
int boot_device, DisplayState *ds, const char **fd_filename, int snapshot, int boot_device, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename, const char *cpu_model)
{ {
integratorcp_init(ram_size, vga_ram_size, boot_device, ds, fd_filename, integratorcp_init(ram_size, vga_ram_size, boot_device, ds, fd_filename,
snapshot, kernel_filename, kernel_cmdline, snapshot, kernel_filename, kernel_cmdline,

2
hw/mips_malta.c
View File

@ -615,7 +615,7 @@ static
void mips_malta_init (int ram_size, int vga_ram_size, int boot_device, void mips_malta_init (int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename, const char *cpu_model)
{ {
char buf[1024]; char buf[1024];
unsigned long bios_offset; unsigned long bios_offset;

2
hw/mips_r4k.c
View File

@ -130,7 +130,7 @@ static
void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device, void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename, const char *cpu_model)
{ {
char buf[1024]; char buf[1024];
unsigned long bios_offset; unsigned long bios_offset;

6
hw/pc.c
View File

@ -758,7 +758,8 @@ static void pc_init_pci(int ram_size, int vga_ram_size, int boot_device,
int snapshot, int snapshot,
const char *kernel_filename, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename,
const char *cpu_model)
{ {
pc_init1(ram_size, vga_ram_size, boot_device, pc_init1(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot, ds, fd_filename, snapshot,
@ -771,7 +772,8 @@ static void pc_init_isa(int ram_size, int vga_ram_size, int boot_device,
int snapshot, int snapshot,
const char *kernel_filename, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename,
const char *cpu_model)
{ {
pc_init1(ram_size, vga_ram_size, boot_device, pc_init1(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot, ds, fd_filename, snapshot,

59
hw/ppc_chrp.c
View File

@ -292,13 +292,14 @@ void pmac_format_nvram_partition(uint8_t *buf, int len)
} }
/* PowerPC CHRP hardware initialisation */ /* PowerPC CHRP hardware initialisation */
static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, static void ppc_chrp_init (int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, DisplayState *ds, const char **fd_filename,
int snapshot, int snapshot,
const char *kernel_filename, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename, const char *initrd_filename,
int is_heathrow) const char *cpu_model,
int is_heathrow)
{ {
CPUState *env; CPUState *env;
char buf[1024]; char buf[1024];
@ -320,22 +321,16 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device,
env = cpu_init(); env = cpu_init();
register_savevm("cpu", 0, 3, cpu_save, cpu_load, env); register_savevm("cpu", 0, 3, cpu_save, cpu_load, env);
/* Register CPU as a 74x/75x */ /* Default CPU is a generic 74x/75x */
if (cpu_model == NULL)
cpu_model = "750";
/* XXX: CPU model (or PVR) should be provided on command line */ /* XXX: CPU model (or PVR) should be provided on command line */
// ppc_find_by_name("750gx", &def); // Linux boot OK // ppc_find_by_name("750gx", &def); // Linux boot OK
// ppc_find_by_name("750fx", &def); // Linux boot OK // ppc_find_by_name("750fx", &def); // Linux boot OK
/* Linux does not boot on 750cxe (and probably other 750cx based) /* Linux does not boot on 750cxe (and probably other 750cx based)
* because it assumes it has 8 IBAT & DBAT pairs as it only have 4. * because it assumes it has 8 IBAT & DBAT pairs as it only have 4.
*/ */
// ppc_find_by_name("750cxe", &def); ppc_find_by_name(cpu_model, &def);
// ppc_find_by_name("750p", &def);
// ppc_find_by_name("740p", &def);
ppc_find_by_name("750", &def);
// ppc_find_by_name("740", &def);
// ppc_find_by_name("G3", &def);
// ppc_find_by_name("604r", &def);
// ppc_find_by_name("604e", &def);
// ppc_find_by_name("604", &def);
if (def == NULL) { if (def == NULL) {
cpu_abort(env, "Unable to find PowerPC CPU definition\n"); cpu_abort(env, "Unable to find PowerPC CPU definition\n");
} }
@ -525,30 +520,32 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device,
register_ioport_write(0x0F00, 4, 1, &PPC_debug_write, NULL); register_ioport_write(0x0F00, 4, 1, &PPC_debug_write, NULL);
} }
static void ppc_core99_init(int ram_size, int vga_ram_size, int boot_device, static void ppc_core99_init (int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, DisplayState *ds, const char **fd_filename,
int snapshot, int snapshot,
const char *kernel_filename, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename,
const char *cpu_model)
{ {
ppc_chrp_init(ram_size, vga_ram_size, boot_device, ppc_chrp_init(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot, ds, fd_filename, snapshot,
kernel_filename, kernel_cmdline, kernel_filename, kernel_cmdline,
initrd_filename, 0); initrd_filename, cpu_model, 0);
} }
static void ppc_heathrow_init(int ram_size, int vga_ram_size, int boot_device, static void ppc_heathrow_init (int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, DisplayState *ds, const char **fd_filename,
int snapshot, int snapshot,
const char *kernel_filename, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename,
const char *cpu_model)
{ {
ppc_chrp_init(ram_size, vga_ram_size, boot_device, ppc_chrp_init(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot, ds, fd_filename, snapshot,
kernel_filename, kernel_cmdline, kernel_filename, kernel_cmdline,
initrd_filename, 1); initrd_filename, cpu_model, 1);
} }
QEMUMachine core99_machine = { QEMUMachine core99_machine = {

21
hw/ppc_prep.c
View File

@ -518,10 +518,12 @@ CPUReadMemoryFunc *PPC_prep_io_read[] = {
#define NVRAM_SIZE 0x2000 #define NVRAM_SIZE 0x2000
/* PowerPC PREP hardware initialisation */ /* PowerPC PREP hardware initialisation */
static void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device, static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename,
const char *kernel_filename, const char *kernel_cmdline, int snapshot, const char *kernel_filename,
const char *initrd_filename) const char *kernel_cmdline,
const char *initrd_filename,
const char *cpu_model)
{ {
CPUState *env; CPUState *env;
char buf[1024]; char buf[1024];
@ -543,12 +545,11 @@ static void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device,
env = cpu_init(); env = cpu_init();
register_savevm("cpu", 0, 3, cpu_save, cpu_load, env); register_savevm("cpu", 0, 3, cpu_save, cpu_load, env);
/* Register CPU as a 604 */ /* Default CPU is a 604 */
/* XXX: CPU model (or PVR) should be provided on command line */ if (cpu_model == NULL)
// ppc_find_by_name("604r", &def); cpu_model = "604";
// ppc_find_by_name("604e", &def); ppc_find_by_name(cpu_model, &def);
ppc_find_by_name("604", &def);
if (def == NULL) { if (def == NULL) {
cpu_abort(env, "Unable to find PowerPC CPU definition\n"); cpu_abort(env, "Unable to find PowerPC CPU definition\n");
} }

2
hw/realview.c
View File

@ -15,7 +15,7 @@
static void realview_init(int ram_size, int vga_ram_size, int boot_device, static void realview_init(int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename, const char *cpu_model)
{ {
CPUState *env; CPUState *env;
void *pic; void *pic;

2
hw/shix.c
View File

@ -70,7 +70,7 @@ void vga_screen_dump(const char *filename)
void shix_init(int ram_size, int vga_ram_size, int boot_device, void shix_init(int ram_size, int vga_ram_size, int boot_device,
DisplayState * ds, const char **fd_filename, int snapshot, DisplayState * ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename, const char *cpu_model)
{ {
int ret; int ret;
CPUState *env; CPUState *env;

2
hw/sun4m.c
View File

@ -211,7 +211,7 @@ static void main_cpu_reset(void *opaque)
static void sun4m_init(int ram_size, int vga_ram_size, int boot_device, static void sun4m_init(int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename, const char *cpu_model)
{ {
CPUState *env, *envs[MAX_CPUS]; CPUState *env, *envs[MAX_CPUS];
char buf[1024]; char buf[1024];

2
hw/sun4u.c
View File

@ -257,7 +257,7 @@ static fdctrl_t *floppy_controller;
static void sun4u_init(int ram_size, int vga_ram_size, int boot_device, static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename, const char *cpu_model)
{ {
CPUState *env; CPUState *env;
char buf[1024]; char buf[1024];

4
hw/versatilepb.c
View File

@ -257,7 +257,7 @@ static void versatile_init(int ram_size, int vga_ram_size, int boot_device,
static void vpb_init(int ram_size, int vga_ram_size, int boot_device, static void vpb_init(int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename, const char *cpu_model)
{ {
versatile_init(ram_size, vga_ram_size, boot_device, versatile_init(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot, ds, fd_filename, snapshot,
@ -268,7 +268,7 @@ static void vpb_init(int ram_size, int vga_ram_size, int boot_device,
static void vab_init(int ram_size, int vga_ram_size, int boot_device, static void vab_init(int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename) const char *initrd_filename, const char *cpu_model)
{ {
versatile_init(ram_size, vga_ram_size, boot_device, versatile_init(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot, ds, fd_filename, snapshot,

18
vl.c
View File

@ -6355,6 +6355,7 @@ void help(void)
"\n" "\n"
"Standard options:\n" "Standard options:\n"
"-M machine select emulated machine (-M ? for list)\n" "-M machine select emulated machine (-M ? for list)\n"
"-cpu cpu select CPU (-C ? for list)\n"
"-fda/-fdb file use 'file' as floppy disk 0/1 image\n" "-fda/-fdb file use 'file' as floppy disk 0/1 image\n"
"-hda/-hdb file use 'file' as IDE hard disk 0/1 image\n" "-hda/-hdb file use 'file' as IDE hard disk 0/1 image\n"
"-hdc/-hdd file use 'file' as IDE hard disk 2/3 image\n" "-hdc/-hdd file use 'file' as IDE hard disk 2/3 image\n"
@ -6487,6 +6488,7 @@ enum {
QEMU_OPTION_h, QEMU_OPTION_h,
QEMU_OPTION_M, QEMU_OPTION_M,
QEMU_OPTION_cpu,
QEMU_OPTION_fda, QEMU_OPTION_fda,
QEMU_OPTION_fdb, QEMU_OPTION_fdb,
QEMU_OPTION_hda, QEMU_OPTION_hda,
@ -6562,6 +6564,7 @@ const QEMUOption qemu_options[] = {
{ "help", 0, QEMU_OPTION_h }, { "help", 0, QEMU_OPTION_h },
{ "M", HAS_ARG, QEMU_OPTION_M }, { "M", HAS_ARG, QEMU_OPTION_M },
{ "cpu", HAS_ARG, QEMU_OPTION_cpu },
{ "fda", HAS_ARG, QEMU_OPTION_fda }, { "fda", HAS_ARG, QEMU_OPTION_fda },
{ "fdb", HAS_ARG, QEMU_OPTION_fdb }, { "fdb", HAS_ARG, QEMU_OPTION_fdb },
{ "hda", HAS_ARG, QEMU_OPTION_hda }, { "hda", HAS_ARG, QEMU_OPTION_hda },
@ -6867,6 +6870,7 @@ int main(int argc, char **argv)
int parallel_device_index; int parallel_device_index;
const char *loadvm = NULL; const char *loadvm = NULL;
QEMUMachine *machine; QEMUMachine *machine;
const char *cpu_model;
char usb_devices[MAX_USB_CMDLINE][128]; char usb_devices[MAX_USB_CMDLINE][128];
int usb_devices_index; int usb_devices_index;
int fds[2]; int fds[2];
@ -6904,6 +6908,7 @@ int main(int argc, char **argv)
register_machines(); register_machines();
machine = first_machine; machine = first_machine;
cpu_model = NULL;
initrd_filename = NULL; initrd_filename = NULL;
for(i = 0; i < MAX_FD; i++) for(i = 0; i < MAX_FD; i++)
fd_filename[i] = NULL; fd_filename[i] = NULL;
@ -6995,6 +7000,17 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
break; break;
case QEMU_OPTION_cpu:
/* hw initialization will check this */
if (optarg[0] == '?') {
#if defined(TARGET_PPC)
ppc_cpu_list(stdout, &fprintf);
#endif
exit(1);
} else {
cpu_model = optarg;
}
break;
case QEMU_OPTION_initrd: case QEMU_OPTION_initrd:
initrd_filename = optarg; initrd_filename = optarg;
break; break;
@ -7569,7 +7585,7 @@ int main(int argc, char **argv)
machine->init(ram_size, vga_ram_size, boot_device, machine->init(ram_size, vga_ram_size, boot_device,
ds, fd_filename, snapshot, ds, fd_filename, snapshot,
kernel_filename, kernel_cmdline, initrd_filename); kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
/* init USB devices */ /* init USB devices */
if (usb_enabled) { if (usb_enabled) {

6
vl.h
View File

@ -695,7 +695,7 @@ typedef void QEMUMachineInitFunc(int ram_size, int vga_ram_size,
int boot_device, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename); const char *initrd_filename, const char *cpu_model);
typedef struct QEMUMachine { typedef struct QEMUMachine {
const char *name; const char *name;
@ -709,6 +709,10 @@ int qemu_register_machine(QEMUMachine *m);
typedef void SetIRQFunc(void *opaque, int irq_num, int level); typedef void SetIRQFunc(void *opaque, int irq_num, int level);
typedef void IRQRequestFunc(void *opaque, int level); typedef void IRQRequestFunc(void *opaque, int level);
#if defined(TARGET_PPC)
void ppc_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
#endif
/* ISA bus */ /* ISA bus */
extern target_phys_addr_t isa_mem_base; extern target_phys_addr_t isa_mem_base;