Revision b584726d hw/pc.c
b/hw/pc.c | ||
---|---|---|
784 | 784 |
{ |
785 | 785 |
char buf[1024]; |
786 | 786 |
int ret, linux_boot, i; |
787 |
ram_addr_t ram_addr, vga_ram_addr, bios_offset, option_rom_offset;
|
|
787 |
ram_addr_t ram_addr, bios_offset, option_rom_offset; |
|
788 | 788 |
ram_addr_t below_4g_mem_size, above_4g_mem_size = 0; |
789 | 789 |
int bios_size, isa_bios_size, oprom_area_size; |
790 | 790 |
PCIBus *pci_bus; |
... | ... | |
858 | 858 |
} |
859 | 859 |
|
860 | 860 |
|
861 |
/* allocate VGA RAM */ |
|
862 |
vga_ram_addr = qemu_ram_alloc(vga_ram_size); |
|
863 |
|
|
864 | 861 |
/* BIOS load */ |
865 | 862 |
if (bios_name == NULL) |
866 | 863 |
bios_name = BIOS_FILENAME; |
... | ... | |
943 | 940 |
|
944 | 941 |
if (cirrus_vga_enabled) { |
945 | 942 |
if (pci_enabled) { |
946 |
pci_cirrus_vga_init(pci_bus, |
|
947 |
phys_ram_base + vga_ram_addr, |
|
948 |
vga_ram_addr, vga_ram_size); |
|
943 |
pci_cirrus_vga_init(pci_bus, vga_ram_size); |
|
949 | 944 |
} else { |
950 |
isa_cirrus_vga_init(phys_ram_base + vga_ram_addr, |
|
951 |
vga_ram_addr, vga_ram_size); |
|
945 |
isa_cirrus_vga_init(vga_ram_size); |
|
952 | 946 |
} |
953 | 947 |
} else if (vmsvga_enabled) { |
954 | 948 |
if (pci_enabled) |
955 |
pci_vmsvga_init(pci_bus, phys_ram_base + vga_ram_addr, |
|
956 |
vga_ram_addr, vga_ram_size); |
|
949 |
pci_vmsvga_init(pci_bus, vga_ram_size); |
|
957 | 950 |
else |
958 | 951 |
fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__); |
959 | 952 |
} else if (std_vga_enabled) { |
960 | 953 |
if (pci_enabled) { |
961 |
pci_vga_init(pci_bus, phys_ram_base + vga_ram_addr, |
|
962 |
vga_ram_addr, vga_ram_size, 0, 0); |
|
954 |
pci_vga_init(pci_bus, vga_ram_size, 0, 0); |
|
963 | 955 |
} else { |
964 |
isa_vga_init(phys_ram_base + vga_ram_addr, |
|
965 |
vga_ram_addr, vga_ram_size); |
|
956 |
isa_vga_init(vga_ram_size); |
|
966 | 957 |
} |
967 | 958 |
} |
968 | 959 |
|
Also available in: Unified diff