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

hw/cirrus_vga.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:08 +09:00 committed by Michael S. Tsirkin
parent 51387f864c
commit 5b96d8f997
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/cirrus_vga.c
View File

@ -3097,8 +3097,8 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)
{ {
PCICirrusVGAState *d = DO_UPCAST(PCICirrusVGAState, dev, dev); PCICirrusVGAState *d = DO_UPCAST(PCICirrusVGAState, dev, dev);
CirrusVGAState *s = &d->cirrus_vga; CirrusVGAState *s = &d->cirrus_vga;
uint8_t *pci_conf = d->dev.config; PCIDeviceInfo *info = DO_UPCAST(PCIDeviceInfo, qdev, dev->qdev.info);
int device_id = CIRRUS_ID_CLGD5446; int16_t device_id = info->device_id;
/* setup VGA */ /* setup VGA */
vga_common_init(&s->vga, VGA_RAM_SIZE); vga_common_init(&s->vga, VGA_RAM_SIZE);
@ -3108,9 +3108,6 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)
&s->vga); &s->vga);
/* setup PCI */ /* setup PCI */
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_CIRRUS);
pci_config_set_device_id(pci_conf, device_id);
pci_config_set_class(pci_conf, PCI_CLASS_DISPLAY_VGA);
/* setup memory space */ /* setup memory space */
/* memory #0 LFB */ /* memory #0 LFB */
@ -3139,6 +3136,9 @@ static PCIDeviceInfo cirrus_vga_info = {
.init = pci_cirrus_vga_initfn, .init = pci_cirrus_vga_initfn,
.romfile = VGABIOS_CIRRUS_FILENAME, .romfile = VGABIOS_CIRRUS_FILENAME,
.config_write = pci_cirrus_write_config, .config_write = pci_cirrus_write_config,
.vendor_id = PCI_VENDOR_ID_CIRRUS,
.device_id = CIRRUS_ID_CLGD5446,
.class_id = PCI_CLASS_DISPLAY_VGA,
}; };
static void cirrus_vga_register(void) static void cirrus_vga_register(void)