Commit 4c7634bcb3643f83405501d328a5e6dd5cb42719
1 parent
a21ae81d
init VGA with default config
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@900 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
3 additions
and
0 deletions
hw/pci.c
| @@ -1030,6 +1030,8 @@ static void pci_bios_init_device(PCIDevice *d) | @@ -1030,6 +1030,8 @@ static void pci_bios_init_device(PCIDevice *d) | ||
| 1030 | } | 1030 | } |
| 1031 | break; | 1031 | break; |
| 1032 | case 0x0300: | 1032 | case 0x0300: |
| 1033 | + if (vendor_id != 0x1234) | ||
| 1034 | + goto default_map; | ||
| 1033 | /* VGA: map frame buffer to default Bochs VBE address */ | 1035 | /* VGA: map frame buffer to default Bochs VBE address */ |
| 1034 | pci_set_io_region_addr(d, 0, 0xE0000000); | 1036 | pci_set_io_region_addr(d, 0, 0xE0000000); |
| 1035 | break; | 1037 | break; |
| @@ -1040,6 +1042,7 @@ static void pci_bios_init_device(PCIDevice *d) | @@ -1040,6 +1042,7 @@ static void pci_bios_init_device(PCIDevice *d) | ||
| 1040 | } | 1042 | } |
| 1041 | break; | 1043 | break; |
| 1042 | default: | 1044 | default: |
| 1045 | + default_map: | ||
| 1043 | /* default memory mappings */ | 1046 | /* default memory mappings */ |
| 1044 | for(i = 0; i < PCI_NUM_REGIONS; i++) { | 1047 | for(i = 0; i < PCI_NUM_REGIONS; i++) { |
| 1045 | r = &d->io_regions[i]; | 1048 | r = &d->io_regions[i]; |