mirror of
				https://github.com/qemu/qemu.git
				synced 2025-10-31 12:07:31 +00:00 
			
		
		
		
	 b80d4a9887
			
		
	
	
		b80d4a9887
		
	
	
	
	
		
			
			Don't overwrite pci header type. Otherwise, multi function bit which pci_init_header_type() sets appropriately is lost. Anyway PCI_HEADER_TYPE_NORMAL is zero, so it is unnecessary to zero which is already zero cleared. how to test: run qemu and issue info pci to see whether a device in question is normal device, not pci-to-pci bridge. This is handy because guest os isn't required. tested changes: The following files are covered by using following commands. sparc64-softmmu apb_pci.c, vga-pci.c, cmd646.c, ne2k_pci.c, sun4u.c ppc-softmmu grackle_pci.c, cmd646.c, ne2k_pci.c, vga-pci.c, macio.c ppc-softmmu -M mac99 unin_pci.c(uni-north, uni-north-agp) ppc64-softmmu pci-ohci, ne2k_pci, vga-pci, unin_pci.c(u3-agp) x86_64-softmmu acpi_piix4.c, ide/piix.c, piix_pci.c -vga vmware vmware_vga.c -watchdog i6300esb wdt_i6300esb.c -usb usb-uhci.c -sound ac97 ac97.c -nic model=rtl8139 rtl8139.c -nic model=pcnet pcnet.c -balloon virtio virtio-pci.c: untested changes: The following changes aren't tested. prep_pci.c: ppc-softmmu -M prep should cover, but core dumped. unin_pci.c(uni-north-pci): the caller is commented out. openpic.c: the caller is commented out in ppc_prep.c Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
		
			
				
	
	
		
			145 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			145 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * QEMU PCI VGA Emulator.
 | |
|  *
 | |
|  * Copyright (c) 2003 Fabrice Bellard
 | |
|  *
 | |
|  * Permission is hereby granted, free of charge, to any person obtaining a copy
 | |
|  * of this software and associated documentation files (the "Software"), to deal
 | |
|  * in the Software without restriction, including without limitation the rights
 | |
|  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 | |
|  * copies of the Software, and to permit persons to whom the Software is
 | |
|  * furnished to do so, subject to the following conditions:
 | |
|  *
 | |
|  * The above copyright notice and this permission notice shall be included in
 | |
|  * all copies or substantial portions of the Software.
 | |
|  *
 | |
|  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 | |
|  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 | |
|  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 | |
|  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 | |
|  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 | |
|  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 | |
|  * THE SOFTWARE.
 | |
|  */
 | |
| #include "hw.h"
 | |
| #include "console.h"
 | |
| #include "pc.h"
 | |
| #include "pci.h"
 | |
| #include "vga_int.h"
 | |
| #include "pixel_ops.h"
 | |
| #include "qemu-timer.h"
 | |
| #include "loader.h"
 | |
| 
 | |
| typedef struct PCIVGAState {
 | |
|     PCIDevice dev;
 | |
|     VGACommonState vga;
 | |
| } PCIVGAState;
 | |
| 
 | |
| static const VMStateDescription vmstate_vga_pci = {
 | |
|     .name = "vga",
 | |
|     .version_id = 2,
 | |
|     .minimum_version_id = 2,
 | |
|     .minimum_version_id_old = 2,
 | |
|     .fields      = (VMStateField []) {
 | |
|         VMSTATE_PCI_DEVICE(dev, PCIVGAState),
 | |
|         VMSTATE_STRUCT(vga, PCIVGAState, 0, vmstate_vga_common, VGACommonState),
 | |
|         VMSTATE_END_OF_LIST()
 | |
|     }
 | |
| };
 | |
| 
 | |
| static void vga_map(PCIDevice *pci_dev, int region_num,
 | |
|                     pcibus_t addr, pcibus_t size, int type)
 | |
| {
 | |
|     PCIVGAState *d = (PCIVGAState *)pci_dev;
 | |
|     VGACommonState *s = &d->vga;
 | |
|     if (region_num == PCI_ROM_SLOT) {
 | |
|         cpu_register_physical_memory(addr, s->bios_size, s->bios_offset);
 | |
|     } else {
 | |
|         cpu_register_physical_memory(addr, s->vram_size, s->vram_offset);
 | |
|         s->map_addr = addr;
 | |
|         s->map_end = addr + s->vram_size;
 | |
|         vga_dirty_log_start(s);
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void pci_vga_write_config(PCIDevice *d,
 | |
|                                  uint32_t address, uint32_t val, int len)
 | |
| {
 | |
|     PCIVGAState *pvs = container_of(d, PCIVGAState, dev);
 | |
|     VGACommonState *s = &pvs->vga;
 | |
| 
 | |
|     pci_default_write_config(d, address, val, len);
 | |
|     if (s->map_addr && pvs->dev.io_regions[0].addr == -1)
 | |
|         s->map_addr = 0;
 | |
| }
 | |
| 
 | |
| static int pci_vga_initfn(PCIDevice *dev)
 | |
| {
 | |
|      PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, dev);
 | |
|      VGACommonState *s = &d->vga;
 | |
|      uint8_t *pci_conf = d->dev.config;
 | |
| 
 | |
|      // vga + console init
 | |
|      vga_common_init(s, VGA_RAM_SIZE);
 | |
|      vga_init(s);
 | |
| 
 | |
|      s->ds = graphic_console_init(s->update, s->invalidate,
 | |
|                                   s->screen_dump, s->text_update, s);
 | |
| 
 | |
|      // dummy VGA (same as Bochs ID)
 | |
|      pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_QEMU);
 | |
|      pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_QEMU_VGA);
 | |
|      pci_config_set_class(pci_conf, PCI_CLASS_DISPLAY_VGA);
 | |
| 
 | |
|      /* XXX: VGA_RAM_SIZE must be a power of two */
 | |
|      pci_register_bar(&d->dev, 0, VGA_RAM_SIZE,
 | |
|                       PCI_BASE_ADDRESS_MEM_PREFETCH, vga_map);
 | |
| 
 | |
|      if (s->bios_size) {
 | |
|         unsigned int bios_total_size;
 | |
|         /* must be a power of two */
 | |
|         bios_total_size = 1;
 | |
|         while (bios_total_size < s->bios_size)
 | |
|             bios_total_size <<= 1;
 | |
|         pci_register_bar(&d->dev, PCI_ROM_SLOT, bios_total_size,
 | |
|                          PCI_BASE_ADDRESS_MEM_PREFETCH, vga_map);
 | |
|      }
 | |
| 
 | |
|     vga_init_vbe(s);
 | |
|      /* ROM BIOS */
 | |
|      rom_add_vga(VGABIOS_FILENAME);
 | |
|      return 0;
 | |
| }
 | |
| 
 | |
| int pci_vga_init(PCIBus *bus,
 | |
|                  unsigned long vga_bios_offset, int vga_bios_size)
 | |
| {
 | |
|     PCIDevice *dev;
 | |
| 
 | |
|     dev = pci_create(bus, -1, "VGA");
 | |
|     qdev_prop_set_uint32(&dev->qdev, "bios-offset", vga_bios_offset);
 | |
|     qdev_prop_set_uint32(&dev->qdev, "bios-size", vga_bios_size);
 | |
|     qdev_init_nofail(&dev->qdev);
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static PCIDeviceInfo vga_info = {
 | |
|     .qdev.name    = "VGA",
 | |
|     .qdev.size    = sizeof(PCIVGAState),
 | |
|     .qdev.vmsd    = &vmstate_vga_pci,
 | |
|     .init         = pci_vga_initfn,
 | |
|     .config_write = pci_vga_write_config,
 | |
|     .qdev.props   = (Property[]) {
 | |
|         DEFINE_PROP_HEX32("bios-offset", PCIVGAState, vga.bios_offset, 0),
 | |
|         DEFINE_PROP_HEX32("bios-size",   PCIVGAState, vga.bios_size,   0),
 | |
|         DEFINE_PROP_END_OF_LIST(),
 | |
|     }
 | |
| };
 | |
| 
 | |
| static void vga_register(void)
 | |
| {
 | |
|     pci_qdev_register(&vga_info);
 | |
| }
 | |
| device_init(vga_register);
 |