From 03f1c14379d74b0c76a368681843c7c47c1e0627 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Wed, 25 May 2011 10:58:14 +0900 Subject: [PATCH] hw/ide/ich.c: convert to PCIDeviceInfo to initialize ids use PCIDeviceInfo to initialize ids. Signed-off-by: Isaku Yamahata Signed-off-by: Michael S. Tsirkin --- hw/ide/ich.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 5ce0a88800..976cc9244b 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -79,11 +79,6 @@ static int pci_ich9_ahci_init(PCIDevice *dev) ahci_init(&d->ahci, &dev->qdev, 6); - pci_config_set_vendor_id(d->card.config, PCI_VENDOR_ID_INTEL); - pci_config_set_device_id(d->card.config, PCI_DEVICE_ID_INTEL_82801IR); - - pci_config_set_class(d->card.config, PCI_CLASS_STORAGE_SATA); - pci_config_set_revision(d->card.config, 0x02); pci_config_set_prog_interface(d->card.config, AHCI_PROGMODE_MAJOR_REV_1); d->card.config[PCI_CACHE_LINE_SIZE] = 0x08; /* Cache line size */ @@ -131,6 +126,10 @@ static PCIDeviceInfo ich_ahci_info[] = { .init = pci_ich9_ahci_init, .exit = pci_ich9_uninit, .config_write = pci_ich9_write_config, + .vendor_id = PCI_VENDOR_ID_INTEL, + .device_id = PCI_DEVICE_ID_INTEL_82801IR, + .revision = 0x02, + .class_id = PCI_CLASS_STORAGE_SATA, },{ /* end of list */ }