ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/vga-pci.c: convert to PCIDeviceInfo to initialize ids 

use PCIDeviceInfo to initialize ids.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Isaku Yamahata 2011-05-25 10:58:31 +09:00 committed by Michael S. Tsirkin
parent 56fe6408d7
commit 3290277283
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/vga-pci.c
View File

@ -74,7 +74,6 @@ static int pci_vga_initfn(PCIDevice *dev)
{ {
PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, dev); PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, dev);
VGACommonState *s = &d->vga; VGACommonState *s = &d->vga;
uint8_t *pci_conf = d->dev.config;
// vga + console init // vga + console init
vga_common_init(s, VGA_RAM_SIZE); vga_common_init(s, VGA_RAM_SIZE);
@ -83,11 +82,6 @@ static int pci_vga_initfn(PCIDevice *dev)
s->ds = graphic_console_init(s->update, s->invalidate, s->ds = graphic_console_init(s->update, s->invalidate,
s->screen_dump, s->text_update, s); 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 */ /* XXX: VGA_RAM_SIZE must be a power of two */
pci_register_bar(&d->dev, 0, VGA_RAM_SIZE, pci_register_bar(&d->dev, 0, VGA_RAM_SIZE,
PCI_BASE_ADDRESS_MEM_PREFETCH, vga_map); PCI_BASE_ADDRESS_MEM_PREFETCH, vga_map);
@ -114,6 +108,11 @@ static PCIDeviceInfo vga_info = {
.init = pci_vga_initfn, .init = pci_vga_initfn,
.config_write = pci_vga_write_config, .config_write = pci_vga_write_config,
.romfile = "vgabios-stdvga.bin", .romfile = "vgabios-stdvga.bin",
/* dummy VGA (same as Bochs ID) */
.vendor_id = PCI_VENDOR_ID_QEMU,
.device_id = PCI_DEVICE_ID_QEMU_VGA,
.class_id = PCI_CLASS_DISPLAY_VGA,
}; };
static void vga_register(void) static void vga_register(void)