diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-22 07:11:09 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-22 07:11:09 -0500 |
| commit | fdba9594df8eb2e2ac16bba95308e4159ffbb9e4 (patch) | |
| tree | ae99a704abd1629e8f0a2de427814ad48bc85197 /hw/lsi53c895a.c | |
| parent | 7ee28fd303003d70bb4c142e6ad4b92b7383b5b4 (diff) | |
| parent | 0e6264db2c04dfad79be60240bfacfcaf47f9d6c (diff) | |
| download | qemu-fdba9594df8eb2e2ac16bba95308e4159ffbb9e4.tar.gz qemu-fdba9594df8eb2e2ac16bba95308e4159ffbb9e4.tar.bz2 qemu-fdba9594df8eb2e2ac16bba95308e4159ffbb9e4.zip | |
Merge remote-tracking branch 'mst/for_anthony' into staging
Conflicts:
hw/usb-uhci.c
Diffstat (limited to 'hw/lsi53c895a.c')
| -rw-r--r-- | hw/lsi53c895a.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 90c6cbcbf0..940b43abfd 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -2256,15 +2256,6 @@ static int lsi_scsi_init(PCIDevice *dev) pci_conf = s->dev.config; - /* PCI Vendor ID (word) */ - pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_LSI_LOGIC); - /* PCI device ID (word) */ - pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_LSI_53C895A); - /* PCI base class code */ - pci_config_set_class(pci_conf, PCI_CLASS_STORAGE_SCSI); - /* PCI subsystem ID */ - pci_conf[PCI_SUBSYSTEM_ID] = 0x00; - pci_conf[PCI_SUBSYSTEM_ID + 1] = 0x10; /* PCI latency timer = 255 */ pci_conf[PCI_LATENCY_TIMER] = 0xff; /* TODO: RST# value should be 0 */ @@ -2300,6 +2291,10 @@ static PCIDeviceInfo lsi_info = { .qdev.vmsd = &vmstate_lsi_scsi, .init = lsi_scsi_init, .exit = lsi_scsi_uninit, + .vendor_id = PCI_VENDOR_ID_LSI_LOGIC, + .device_id = PCI_DEVICE_ID_LSI_53C895A, + .class_id = PCI_CLASS_STORAGE_SCSI, + .subsystem_id = 0x1000, }; static void lsi53c895a_register_devices(void) |