machine changes
PATCH 1/1 machine changes
This patch changes the QEMUMachine init functions not to take a DisplayState as an argument because is not needed any more;
In few places the graphic hardware initialization function was called only if DisplayState was not NULL, now they are always called. Apart from these cases, the rest are all mechanical substitutions.
Signed-off-by Stefano Stabellini <[email protected]>
---
hw/an5206.c +1 -1
@@ -27,7 +27,7 @@/* Board init. */ static void an5206_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
hw/boards.h +1 -1
@@ -4,7 +4,7 @@#define HW_BOARDS_H typedef void QEMUMachineInitFunc(ram_addr_t ram_size, int vga_ram_size, - const char *boot_device, DisplayState *ds, + const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename,
hw/dummy_m68k.c +1 -1
@@ -15,7 +15,7 @@/* Board init. */ static void dummy_m68k_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
hw/etraxfs.c +1 -1
@@ -48,7 +48,7 @@static void bareetraxfs_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
hw/gumstix.c +4 -4
@@ -42,7 +42,7 @@static const int sector_len =128 *1024 ;static void connex_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
@@ -58,7 +58,7 @@exit (1 ); } - cpu =pxa255_init (connex_ram, ds); + cpu =pxa255_init (connex_ram); index =drive_get_index (IF_PFLASH ,0 ,0 );if (index ==-1 ) {
@@ -82,7 +82,7 @@ }static void verdex_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
@@ -98,7 +98,7 @@exit (1 ); } - cpu =pxa270_init (verdex_ram, ds, cpu_model ?:"pxa270-c0" ); + cpu =pxa270_init (verdex_ram, cpu_model ?:"pxa270-c0" ); index =drive_get_index (IF_PFLASH ,0 ,0 );if (index ==-1 ) {
hw/integratorcp.c +2 -2
@@ -471,7 +471,7 @@ };static void integratorcp_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
@@ -526,7 +526,7 @@exit (1 ); } } -pl110_init (ds,0xc0000000 , pic[22 ],0 ); +pl110_init (0xc0000000 , pic[22 ],0 ); integrator_binfo.ram_size = ram_size; integrator_binfo.kernel_filename = kernel_filename;
hw/mainstone.c +4 -4
@@ -69,7 +69,7 @@ };static void mainstone_common_init (ram_addr_t ram_size,int vga_ram_size, -DisplayState *ds,const char *kernel_filename, +const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model,enum mainstone_model_e model,int arm_id) {
@@ -91,7 +91,7 @@exit (1 ); } - cpu =pxa270_init (mainstone_binfo.ram_size, ds, cpu_model); + cpu =pxa270_init (mainstone_binfo.ram_size, cpu_model);cpu_register_physical_memory (0 ,MAINSTONE_ROM ,qemu_ram_alloc (MAINSTONE_ROM ) |IO_MEM_ROM );
@@ -135,11 +135,11 @@ }static void mainstone_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -mainstone_common_init (ram_size, vga_ram_size, ds, kernel_filename, +mainstone_common_init (ram_size, vga_ram_size, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, mainstone,0x196 ); }
hw/mcf5208.c +1 -1
@@ -203,7 +203,7 @@ }static void mcf5208evb_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
hw/mips_jazz.c +8 -8
@@ -117,7 +117,7 @@static void mips_jazz_init (ram_addr_t ram_size,int vga_ram_size, -DisplayState *ds,const char *cpu_model, +const char *cpu_model,enum jazz_model_e jazz_model) {char buf[1024 ];
@@ -185,10 +185,10 @@/* Video card */ switch (jazz_model) {case JAZZ_MAGNUM : -g364fb_mm_init (ds, vga_ram_size,0 ,0x40000000 ,0x60000000 ); +g364fb_mm_init (vga_ram_size,0 ,0x40000000 ,0x60000000 );break ;case JAZZ_PICA61 : -isa_vga_mm_init (ds, phys_ram_base + ram_size, ram_size, vga_ram_size, +isa_vga_mm_init (phys_ram_base + ram_size, ram_size, vga_ram_size,0x40000000 ,0x60000000 ,0 );break ;default :
@@ -251,25 +251,25 @@ds1225y_init (0x80009000 ,"nvram" );/* LED indicator */ -jazz_led_init (ds,0x8000f000 ); +jazz_led_init (0x8000f000 ); }static void mips_magnum_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -mips_jazz_init (ram_size, vga_ram_size, ds, cpu_model,JAZZ_MAGNUM ); +mips_jazz_init (ram_size, vga_ram_size, cpu_model,JAZZ_MAGNUM ); }static void mips_pica61_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -mips_jazz_init (ram_size, vga_ram_size, ds, cpu_model,JAZZ_PICA61 ); +mips_jazz_init (ram_size, vga_ram_size, cpu_model,JAZZ_PICA61 ); }QEMUMachine mips_magnum_machine = {
hw/mips_malta.c +2 -2
@@ -765,7 +765,7 @@static void mips_malta_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
@@ -940,7 +940,7 @@network_init (pci_bus);/* Optional PCI video card */ -pci_cirrus_vga_init (pci_bus, ds, phys_ram_base + ram_size, +pci_cirrus_vga_init (pci_bus, phys_ram_base + ram_size, ram_size, vga_ram_size); }
hw/mips_mipssim.c +1 -1
@@ -108,7 +108,7 @@static void mips_mipssim_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
hw/mips_r4k.c +2 -2
@@ -148,7 +148,7 @@static const int sector_len =32 *1024 ;static void mips_r4k_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
@@ -244,7 +244,7 @@ } } -isa_vga_init (ds, phys_ram_base + ram_size, ram_size, +isa_vga_init (phys_ram_base + ram_size, ram_size, vga_ram_size);if (nd_table[0 ].vlan) {
hw/musicpal.c +2 -2
@@ -1427,7 +1427,7 @@ };static void musicpal_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
@@ -1493,7 +1493,7 @@ }mv88w8618_flashcfg_init (MP_FLASHCFG_BASE ); -musicpal_lcd_init (ds,MP_LCD_BASE ); +musicpal_lcd_init (MP_LCD_BASE );qemu_add_kbd_event_handler (musicpal_key_event, pic[MP_GPIO_IRQ ]);
hw/nseries.c +10 -9
@@ -715,9 +715,9 @@free (fb_blank); } -static void n8x0_dss_setup (struct n800_s *s,DisplayState *ds) +static void n8x0_dss_setup (struct n800_s *s) { - s->blizzard.opaque =s1d13745_init (0 , ds); + s->blizzard.opaque =s1d13745_init (0 ); s->blizzard.block = s1d13745_write_block; s->blizzard.write = s1d13745_write; s->blizzard.read = s1d13745_read;
@@ -1267,13 +1267,14 @@ }static void n8x0_init (ram_addr_t ram_size,const char *boot_device, -DisplayState *ds,const char *kernel_filename, +const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model,struct arm_boot_info *binfo,int model) {struct n800_s *s = (struct n800_s *)qemu_mallocz (sizeof (*s));int sdram_size = binfo->ram_size;int onenandram_size =0x00010000 ; +DisplayState *ds =get_displaystate ();if (ram_size < sdram_size + onenandram_size +OMAP242X_SRAM_SIZE ) { fprintf(stderr, "This architecture uses %i bytes of memory\n",
@@ -1281,7 +1282,7 @@exit (1 ); } - s->cpu =omap2420_mpu_init (sdram_size,NULL , cpu_model); + s->cpu =omap2420_mpu_init (sdram_size, cpu_model);/* Setup peripherals *
@@ -1318,7 +1319,7 @@n810_kbd_setup (s); }n8x0_spi_setup (s); -n8x0_dss_setup (s, ds); +n8x0_dss_setup (s);n8x0_cbus_setup (s);n8x0_uart_setup (s);if (usb_enabled)
@@ -1385,21 +1386,21 @@ };static void n800_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -return n8x0_init (ram_size, boot_device, ds, +return n8x0_init (ram_size, boot_device, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &n800_binfo,800 ); }static void n810_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -return n8x0_init (ram_size, boot_device, ds, +return n8x0_init (ram_size, boot_device, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &n810_binfo,810 ); }
hw/omap1.c +2 -2
@@ -4664,7 +4664,7 @@ }struct omap_mpu_state_s *omap310_mpu_init (unsigned long sdram_size, -DisplayState *ds,const char *core) +const char *core) {int i; struct omap_mpu_state_s *s = (struct omap_mpu_state_s *)
@@ -4746,7 +4746,7 @@ omap_findclk(s, "clk32-kHz")); s->lcd =omap_lcdc_init (0xfffec000 , s->irq[0 ][OMAP_INT_LCD_CTRL ], -omap_dma_get_lcdch (s->dma), ds, imif_base, emiff_base, +omap_dma_get_lcdch (s->dma), imif_base, emiff_base,omap_findclk (s,"lcd_ck" ));omap_ulpd_pm_init (0xfffe0800 , s);
hw/omap2.c +2 -2
@@ -4538,7 +4538,7 @@ };struct omap_mpu_state_s *omap2420_mpu_init (unsigned long sdram_size, -DisplayState *ds,const char *core) +const char *core) {struct omap_mpu_state_s *s = (struct omap_mpu_state_s *)qemu_mallocz (sizeof (struct omap_mpu_state_s ));
@@ -4716,7 +4716,7 @@omap_findclk (s,"spi2_fclk" ), omap_findclk(s, "spi2_iclk")); - s->dss = omap_dss_init(omap_l4ta(s->l4, 10), 0x68000800, ds, + s->dss = omap_dss_init(omap_l4ta(s->l4, 10), 0x68000800, /* XXX wire M_IRQ_25, D_L2_IRQ_30 and I_IRQ_13 together */ s->irq[0][OMAP_INT_24XX_DSS_IRQ], s->drq[OMAP24XX_DMA_DSS], omap_findclk(s, "dss_clk1"), omap_findclk(s, "dss_clk2"),
hw/palm.c +3 -2
@@ -201,7 +201,7 @@ };static void palmte_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
@@ -215,6 +215,7 @@static uint32_t cs3val =0xe1a0e1a0 ;ram_addr_t phys_flash;int rom_size, rom_loaded =0 ; +DisplayState *ds =get_displaystate ();if (ram_size < flash_size + sdram_size +OMAP15XX_SRAM_SIZE ) { fprintf(stderr, "This architecture uses %i bytes of memory\n",
@@ -222,7 +223,7 @@exit (1 ); } - cpu =omap310_mpu_init (sdram_size, ds, cpu_model); + cpu =omap310_mpu_init (sdram_size, cpu_model);/* External Flash (EMIFS) */ cpu_register_physical_memory(OMAP_CS0_BASE, flash_size,
hw/pc.c +10 -10
@@ -748,7 +748,7 @@/* PC hardware initialisation */ static void pc_init1 (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,int pci_enabled,const char *cpu_model)
@@ -941,24 +941,24 @@if (cirrus_vga_enabled) {if (pci_enabled) {pci_cirrus_vga_init (pci_bus, - ds, phys_ram_base + vga_ram_addr, + phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size); }else { -isa_cirrus_vga_init (ds, phys_ram_base + vga_ram_addr, +isa_cirrus_vga_init (phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size); } }else if (vmsvga_enabled) {if (pci_enabled) -pci_vmsvga_init (pci_bus, ds, phys_ram_base + vga_ram_addr, +pci_vmsvga_init (pci_bus, phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size);else fprintf (stderr,"%s: vmware_vga: no PCI bus\n" , __FUNCTION__); }else {if (pci_enabled) { -pci_vga_init (pci_bus, ds, phys_ram_base + vga_ram_addr, +pci_vga_init (pci_bus, phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size,0 ,0 ); }else { -isa_vga_init (ds, phys_ram_base + vga_ram_addr, +isa_vga_init (phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size); } }
@@ -1095,25 +1095,25 @@ }static void pc_init_pci (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -pc_init1 (ram_size, vga_ram_size, boot_device, ds, +pc_init1 (ram_size, vga_ram_size, boot_device, kernel_filename, kernel_cmdline, initrd_filename,1 , cpu_model); }static void pc_init_isa (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -pc_init1 (ram_size, vga_ram_size, boot_device, ds, +pc_init1 (ram_size, vga_ram_size, boot_device, kernel_filename, kernel_cmdline, initrd_filename,0 , cpu_model); }
hw/ppc405_boards.c +2 -2
@@ -176,7 +176,7 @@ } static void ref405ep_init (ram_addr_t ram_size, int vga_ram_size, - const char *boot_device, DisplayState *ds, + const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename,
@@ -504,7 +504,7 @@ } static void taihu_405ep_init(ram_addr_t ram_size, int vga_ram_size, - const char *boot_device, DisplayState *ds, + const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename,
hw/ppc_chrp.c +2 -2
@@ -58,7 +58,7 @@/* PowerPC Mac99 hardware initialisation */ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, - const char *boot_device, DisplayState *ds, + const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename,
@@ -255,7 +255,7 @@ pic =openpic_init (NULL , &pic_mem_index, smp_cpus, openpic_irqs,NULL ); pci_bus =pci_pmac_init (pic);/* init basic PC hardware */ -pci_vga_init (pci_bus, ds, phys_ram_base + ram_size, +pci_vga_init (pci_bus, phys_ram_base + ram_size, ram_size, vga_ram_size, vga_bios_offset, vga_bios_size);
hw/ppc_oldworld.c +2 -2
@@ -104,7 +104,7 @@ } static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, - const char *boot_device, DisplayState *ds, + const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename,
@@ -278,7 +278,7 @@ } pic =heathrow_pic_init (&pic_mem_index,1 , heathrow_irqs); pci_bus =pci_grackle_init (0xfec00000 , pic); -pci_vga_init (pci_bus, ds, phys_ram_base + ram_size, +pci_vga_init (pci_bus, phys_ram_base + ram_size, ram_size, vga_ram_size, vga_bios_offset, vga_bios_size);
hw/ppc_prep.c +2 -2
@@ -536,7 +536,7 @@/* PowerPC PREP hardware initialisation */ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size, - const char *boot_device, DisplayState *ds, + const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename,
@@ -660,7 +660,7 @@cpu_register_physical_memory (0x80000000 ,0x00800000 , PPC_io_memory);/* init basic PC hardware */ -pci_vga_init (pci_bus, ds, phys_ram_base + ram_size, ram_size, +pci_vga_init (pci_bus, phys_ram_base + ram_size, ram_size, vga_ram_size,0 ,0 );// openpic = openpic_init(0x00000000, 0xF0000000, 1); // pit = pit_init(0x40, i8259[0]);
hw/pxa2xx.c +4 -8
@@ -2027,8 +2027,7 @@ }/* Initialise a PXA270 integrated chip (ARM based core). */ -struct pxa2xx_state_s *pxa270_init (unsigned int sdram_size, -DisplayState *ds,const char *revision) +struct pxa2xx_state_s *pxa270_init (unsigned int sdram_size,const char *revision) {struct pxa2xx_state_s *s;struct pxa2xx_ssp_s *ssp;
@@ -2084,8 +2083,7 @@ s->fir =pxa2xx_fir_init (0x40800000 , s->pic[PXA2XX_PIC_ICP ], s->dma, serial_hds[i]); -if (ds) - s->lcd =pxa2xx_lcdc_init (0x44000000 , s->pic[PXA2XX_PIC_LCD ], ds); + s->lcd =pxa2xx_lcdc_init (0x44000000 , s->pic[PXA2XX_PIC_LCD ]); s->cm_base =0x41300000 ; s->cm_regs[CCCR >>2 ] =0x02000210 ;/* 416.0 MHz */
@@ -2157,8 +2155,7 @@ }/* Initialise a PXA255 integrated chip (ARM based core). */ -struct pxa2xx_state_s *pxa255_init (unsigned int sdram_size, -DisplayState *ds) +struct pxa2xx_state_s *pxa255_init (unsigned int sdram_size) {struct pxa2xx_state_s *s;struct pxa2xx_ssp_s *ssp;
@@ -2207,8 +2204,7 @@ s->fir =pxa2xx_fir_init (0x40800000 , s->pic[PXA2XX_PIC_ICP ], s->dma, serial_hds[i]); -if (ds) - s->lcd =pxa2xx_lcdc_init (0x44000000 , s->pic[PXA2XX_PIC_LCD ], ds); + s->lcd =pxa2xx_lcdc_init (0x44000000 , s->pic[PXA2XX_PIC_LCD ]); s->cm_base =0x41300000 ; s->cm_regs[CCCR >>2 ] =0x02000210 ;/* 416.0 MHz */
hw/r2d.c +2 -2
@@ -130,7 +130,7 @@ }static void r2d_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState * ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
@@ -154,7 +154,7 @@r2d_fpga_init (0x04000000 ); s =sh7750_init (env); sm501_vga_ram_addr =qemu_ram_alloc (SM501_VRAM_SIZE ); -sm501_init (ds,0x10000000 , sm501_vga_ram_addr,SM501_VRAM_SIZE , +sm501_init (0x10000000 , sm501_vga_ram_addr,SM501_VRAM_SIZE , serial_hds[2 ]);/* Todo: register on board registers */ {
hw/realview.c +2 -2
@@ -24,7 +24,7 @@ };static void realview_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
@@ -93,7 +93,7 @@sp804_init (0x10011000 , pic[4 ]);sp804_init (0x10012000 , pic[5 ]); -pl110_init (ds,0x10020000 , pic[23 ],1 ); +pl110_init (0x10020000 , pic[23 ],1 ); index =drive_get_index (IF_SD ,0 ,0 );if (index ==-1 ) {
hw/shix.c +1 -1
@@ -61,7 +61,7 @@ }static void shix_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState * ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
hw/spitz.c +10 -10
@@ -913,7 +913,7 @@ };static void spitz_common_init (ram_addr_t ram_size,int vga_ram_size, -DisplayState *ds,const char *kernel_filename, +const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model,enum spitz_model_e model,int arm_id) {
@@ -929,7 +929,7 @@ SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE);exit (1 ); } - cpu =pxa270_init (spitz_binfo.ram_size, ds, cpu_model); + cpu =pxa270_init (spitz_binfo.ram_size, cpu_model);sl_flash_register (cpu, (model == spitz) ?FLASH_128M :FLASH_1024M );
@@ -974,38 +974,38 @@ }static void spitz_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -spitz_common_init (ram_size, vga_ram_size, ds, kernel_filename, +spitz_common_init (ram_size, vga_ram_size, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, spitz,0x2c9 ); }static void borzoi_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -spitz_common_init (ram_size, vga_ram_size, ds, kernel_filename, +spitz_common_init (ram_size, vga_ram_size, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, borzoi,0x33f ); }static void akita_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -spitz_common_init (ram_size, vga_ram_size, ds, kernel_filename, +spitz_common_init (ram_size, vga_ram_size, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, akita,0x2e8 ); }static void terrier_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -spitz_common_init (ram_size, vga_ram_size, ds, kernel_filename, +spitz_common_init (ram_size, vga_ram_size, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, terrier,0x33f ); }
hw/stellaris.c +7 -7
@@ -1298,7 +1298,7 @@ };static void stellaris_init (const char *kernel_filename,const char *cpu_model, -DisplayState *ds,stellaris_board_info *board) +stellaris_board_info *board) {static const int uart_irq[] = {5 ,6 ,33 ,34 };static const int timer_irq[] = {19 ,21 ,23 ,35 };
@@ -1345,7 +1345,7 @@ i2c =i2c_init_bus ();stellaris_i2c_init (0x40020000 , pic[8 ], i2c);if (board->peripherals &BP_OLED_I2C ) { -ssd0303_init (ds, i2c,0x3d ); +ssd0303_init (i2c,0x3d ); } }
@@ -1362,7 +1362,7 @@void *ssi_bus;int index; - oled =ssd0323_init (ds, &gpio_out[GPIO_C ][7 ]); + oled =ssd0323_init (&gpio_out[GPIO_C ][7 ]); index =drive_get_index (IF_SD ,0 ,0 ); sd =ssi_sd_init (drives_table[index].bdrv);
@@ -1397,19 +1397,19 @@/* FIXME: Figure out how to generate these from stellaris_boards. */ static void lm3s811evb_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -stellaris_init (kernel_filename, cpu_model, ds, &stellaris_boards[0 ]); +stellaris_init (kernel_filename, cpu_model, &stellaris_boards[0 ]); }static void lm3s6965evb_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -stellaris_init (kernel_filename, cpu_model, ds, &stellaris_boards[1 ]); +stellaris_init (kernel_filename, cpu_model, &stellaris_boards[1 ]); }QEMUMachine lm3s811evb_machine = {
hw/sun4m.c +30 -30
196 lines not on this page · raw message
hw/sun4u.c +8 -8
@@ -334,7 +334,7 @@static fdctrl_t *floppy_controller;static void sun4uv_init (ram_addr_t RAM_size,int vga_ram_size, -const char *boot_devices,DisplayState *ds, +const char *boot_devices,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model,const struct hwdef *hwdef)
@@ -454,7 +454,7 @@ pci_bus =pci_apb_init (APB_SPECIAL_BASE ,APB_MEM_BASE ,NULL ); isa_mem_base =VGA_BASE ; vga_ram_offset =qemu_ram_alloc (vga_ram_size); -pci_cirrus_vga_init (pci_bus, ds, phys_ram_base + vga_ram_offset, +pci_cirrus_vga_init (pci_bus, phys_ram_base + vga_ram_offset, vga_ram_offset, vga_ram_size); i =0 ;
@@ -557,31 +557,31 @@/* Sun4u hardware initialisation */ static void sun4u_init (ram_addr_t RAM_size,int vga_ram_size, -const char *boot_devices,DisplayState *ds, +const char *boot_devices,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -sun4uv_init (RAM_size, vga_ram_size, boot_devices, ds, kernel_filename, +sun4uv_init (RAM_size, vga_ram_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &hwdefs[0 ]); }/* Sun4v hardware initialisation */ static void sun4v_init (ram_addr_t RAM_size,int vga_ram_size, -const char *boot_devices,DisplayState *ds, +const char *boot_devices,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -sun4uv_init (RAM_size, vga_ram_size, boot_devices, ds, kernel_filename, +sun4uv_init (RAM_size, vga_ram_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &hwdefs[1 ]); }/* Niagara hardware initialisation */ static void niagara_init (ram_addr_t RAM_size,int vga_ram_size, -const char *boot_devices,DisplayState *ds, +const char *boot_devices,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) { -sun4uv_init (RAM_size, vga_ram_size, boot_devices, ds, kernel_filename, +sun4uv_init (RAM_size, vga_ram_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &hwdefs[2 ]); }
hw/tosa.c +3 -4
@@ -197,7 +197,7 @@ };static void tosa_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {
@@ -214,14 +214,13 @@if (!cpu_model) cpu_model ="pxa255" ; - cpu =pxa255_init (tosa_binfo.ram_size,NULL ); + cpu =pxa255_init (tosa_binfo.ram_size);cpu_register_physical_memory (0 ,TOSA_ROM ,qemu_ram_alloc (TOSA_ROM ) |IO_MEM_ROM ); tmio =tc6393xb_init (0x10000000 , -pxa2xx_gpio_in_get (cpu->gpio)[TOSA_GPIO_TC6393XB_INT ], - ds); +pxa2xx_gpio_in_get (cpu->gpio)[TOSA_GPIO_TC6393XB_INT ]); scp0 =scoop_init (cpu,0 ,0x08800000 ); scp1 =scoop_init (cpu,1 ,0x14800040 );
hw/versatilepb.c +6 -6
@@ -160,7 +160,7 @@static struct arm_boot_info versatile_binfo;static void versatile_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model,int board_id)
@@ -232,7 +232,7 @@/* The versatile/PB actually has a modified Color LCD controller that includes hardware cursor support from the PL111. */ -pl110_init (ds,0x10120000 , pic[16 ],1 ); +pl110_init (0x10120000 , pic[16 ],1 ); index =drive_get_index (IF_SD ,0 ,0 );if (index ==-1 ) {
@@ -294,23 +294,23 @@ }static void vpb_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {versatile_init (ram_size, vga_ram_size, - boot_device, ds, + boot_device, kernel_filename, kernel_cmdline, initrd_filename, cpu_model,0x183 ); }static void vab_init (ram_addr_t ram_size,int vga_ram_size, -const char *boot_device,DisplayState *ds, +const char *boot_device,const char *kernel_filename,const char *kernel_cmdline,const char *initrd_filename,const char *cpu_model) {versatile_init (ram_size, vga_ram_size, - boot_device, ds, + boot_device, kernel_filename, kernel_cmdline, initrd_filename, cpu_model,0x25e ); }