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

hw/piix_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:23 +09:00 committed by Michael S. Tsirkin
parent 146beee5d9
commit 3a9d85491e
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/piix_pci.c
View File

@ -228,11 +228,6 @@ static int i440fx_initfn(PCIDevice *dev)
{ {
PCII440FXState *d = DO_UPCAST(PCII440FXState, dev, dev); PCII440FXState *d = DO_UPCAST(PCII440FXState, dev, dev);
pci_config_set_vendor_id(d->dev.config, PCI_VENDOR_ID_INTEL);
pci_config_set_device_id(d->dev.config, PCI_DEVICE_ID_INTEL_82441);
d->dev.config[0x08] = 0x02; // revision
pci_config_set_class(d->dev.config, PCI_CLASS_BRIDGE_HOST);
d->dev.config[I440FX_SMRAM] = 0x02; d->dev.config[I440FX_SMRAM] = 0x02;
cpu_smm_register(&i440fx_set_smm, d); cpu_smm_register(&i440fx_set_smm, d);
@ -406,15 +401,8 @@ static const VMStateDescription vmstate_piix3 = {
static int piix3_initfn(PCIDevice *dev) static int piix3_initfn(PCIDevice *dev)
{ {
PIIX3State *d = DO_UPCAST(PIIX3State, dev, dev); PIIX3State *d = DO_UPCAST(PIIX3State, dev, dev);
uint8_t *pci_conf;
isa_bus_new(&d->dev.qdev); isa_bus_new(&d->dev.qdev);
pci_conf = d->dev.config;
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371SB_0); // 82371SB PIIX3 PCI-to-ISA bridge (Step A1)
pci_config_set_class(pci_conf, PCI_CLASS_BRIDGE_ISA);
qemu_register_reset(piix3_reset, d); qemu_register_reset(piix3_reset, d);
return 0; return 0;
} }
@ -429,6 +417,10 @@ static PCIDeviceInfo i440fx_info[] = {
.no_hotplug = 1, .no_hotplug = 1,
.init = i440fx_initfn, .init = i440fx_initfn,
.config_write = i440fx_write_config, .config_write = i440fx_write_config,
.vendor_id = PCI_VENDOR_ID_INTEL,
.device_id = PCI_DEVICE_ID_INTEL_82441,
.revision = 0x02,
.class_id = PCI_CLASS_BRIDGE_HOST,
},{ },{
.qdev.name = "PIIX3", .qdev.name = "PIIX3",
.qdev.desc = "ISA bridge", .qdev.desc = "ISA bridge",
@ -438,6 +430,9 @@ static PCIDeviceInfo i440fx_info[] = {
.no_hotplug = 1, .no_hotplug = 1,
.init = piix3_initfn, .init = piix3_initfn,
.config_write = piix3_write_config, .config_write = piix3_write_config,
.vendor_id = PCI_VENDOR_ID_INTEL,
.device_id = PCI_DEVICE_ID_INTEL_82371SB_0, // 82371SB PIIX3 PCI-to-ISA bridge (Step A1)
.class_id = PCI_CLASS_BRIDGE_ISA,
},{ },{
/* end of list */ /* end of list */
} }