mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
Remove vga_ram_size
The vga_ram_size argument to machine init functions always has the same value, and is ignored by many machines (including SPARC32 which has an obsolete ifdef for VGA_RAM_SIZE). Remove it and push VGA_RAM_SIZE into vga_int.h. Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
parent
1481e16abb
commit
fbe1b5953d
42 changed files with 126 additions and 133 deletions
16
hw/sun4u.c
16
hw/sun4u.c
|
@ -326,7 +326,7 @@ pci_ebus_init(PCIBus *bus, int devfn)
|
|||
ebus_mmio_mapfunc);
|
||||
}
|
||||
|
||||
static void sun4uv_init(ram_addr_t RAM_size, int vga_ram_size,
|
||||
static void sun4uv_init(ram_addr_t RAM_size,
|
||||
const char *boot_devices,
|
||||
const char *kernel_filename, const char *kernel_cmdline,
|
||||
const char *initrd_filename, const char *cpu_model,
|
||||
|
@ -447,7 +447,7 @@ static void sun4uv_init(ram_addr_t RAM_size, int vga_ram_size,
|
|||
pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, NULL, &pci_bus2,
|
||||
&pci_bus3);
|
||||
isa_mem_base = VGA_BASE;
|
||||
pci_vga_init(pci_bus, vga_ram_size, 0, 0);
|
||||
pci_vga_init(pci_bus, 0, 0);
|
||||
|
||||
// XXX Should be pci_bus3
|
||||
pci_ebus_init(pci_bus, -1);
|
||||
|
@ -560,32 +560,32 @@ static const struct hwdef hwdefs[] = {
|
|||
};
|
||||
|
||||
/* Sun4u hardware initialisation */
|
||||
static void sun4u_init(ram_addr_t RAM_size, int vga_ram_size,
|
||||
static void sun4u_init(ram_addr_t RAM_size,
|
||||
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, kernel_filename,
|
||||
sun4uv_init(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,
|
||||
static void sun4v_init(ram_addr_t RAM_size,
|
||||
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, kernel_filename,
|
||||
sun4uv_init(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,
|
||||
static void niagara_init(ram_addr_t RAM_size,
|
||||
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, kernel_filename,
|
||||
sun4uv_init(RAM_size, boot_devices, kernel_filename,
|
||||
kernel_cmdline, initrd_filename, cpu_model, &hwdefs[2]);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue