diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-05-25 10:58:09 +0900 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-06-12 10:33:34 +0300 |
| commit | e72d5c9d1876baada0645bc69137987d5ba8db2d (patch) | |
| tree | a3926a7c0e40195e45ac51c22d2c3b74e997ac23 | |
| parent | 5b96d8f997897bdef1ea41529689b418e3bcbec1 (diff) | |
| download | focaccia-qemu-e72d5c9d1876baada0645bc69137987d5ba8db2d.tar.gz focaccia-qemu-e72d5c9d1876baada0645bc69137987d5ba8db2d.zip | |
hw/e1000.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>
| -rw-r--r-- | hw/e1000.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index f160bfc2ab..96d84f91ae 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1164,12 +1164,8 @@ static int pci_e1000_init(PCIDevice *pci_dev) pci_conf = d->dev.config; - pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL); - pci_config_set_device_id(pci_conf, E1000_DEVID); /* TODO: we have no capabilities, so why is this bit set? */ pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_CAP_LIST); - pci_conf[PCI_REVISION_ID] = 0x03; - pci_config_set_class(pci_conf, PCI_CLASS_NETWORK_ETHERNET); /* TODO: RST# value should be 0, PCI spec 6.2.4 */ pci_conf[PCI_CACHE_LINE_SIZE] = 0x10; @@ -1221,6 +1217,10 @@ static PCIDeviceInfo e1000_info = { .init = pci_e1000_init, .exit = pci_e1000_uninit, .romfile = "pxe-e1000.rom", + .vendor_id = PCI_VENDOR_ID_INTEL, + .device_id = E1000_DEVID, + .revision = 0x03, + .class_id = PCI_CLASS_NETWORK_ETHERNET, .qdev.props = (Property[]) { DEFINE_NIC_PROPERTIES(E1000State, conf), DEFINE_PROP_END_OF_LIST(), |