From: Isaku Yamahata Date: Wed, 25 May 2011 01:58:25 +0000 (+0900) Subject: hw/rtl8139.c: convert to PCIDeviceInfo to initialize ids X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~5672^2~28 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7cba16a748b3ed7aba1a94304869fcfa9b5c0396;p=sdk%2Femulator%2Fqemu.git hw/rtl8139.c: convert to PCIDeviceInfo to initialize ids use PCIDeviceInfo to initialize ids. Signed-off-by: Isaku Yamahata Signed-off-by: Michael S. Tsirkin --- diff --git a/hw/rtl8139.c b/hw/rtl8139.c index c7c7a3c..34e3a9e 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3453,10 +3453,6 @@ static int pci_rtl8139_init(PCIDevice *dev) uint8_t *pci_conf; pci_conf = s->dev.config; - pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_REALTEK); - pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_REALTEK_8139); - pci_conf[PCI_REVISION_ID] = RTL8139_PCI_REVID; /* >=0x20 is for 8139C+ */ - pci_config_set_class(pci_conf, PCI_CLASS_NETWORK_ETHERNET); pci_conf[PCI_INTERRUPT_PIN] = 1; /* interrupt pin 0 */ /* TODO: start of capability list, but no capability * list bit in status register, and offset 0xdc seems unused. */ @@ -3510,6 +3506,10 @@ static PCIDeviceInfo rtl8139_info = { .init = pci_rtl8139_init, .exit = pci_rtl8139_uninit, .romfile = "pxe-rtl8139.rom", + .vendor_id = PCI_VENDOR_ID_REALTEK, + .device_id = PCI_DEVICE_ID_REALTEK_8139, + .revision = RTL8139_PCI_REVID, /* >=0x20 is for 8139C+ */ + .class_id = PCI_CLASS_NETWORK_ETHERNET, .qdev.props = (Property[]) { DEFINE_NIC_PROPERTIES(RTL8139State, conf), DEFINE_PROP_END_OF_LIST(),