diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-05-08 19:54:52 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-16 10:15:47 -0500 |
| commit | 96d19bcbf5f679bbaaeab001b572c367fbfb2b03 (patch) | |
| tree | d2dca7bfe1e4287298166726143c8c514271c796 /hw/ide | |
| parent | 077030d11e27811749020af744e67e4267ee90e1 (diff) | |
ahci: Unbreak bar registration
Fix regression of 667bb59: ahci_init initializes ahci.mem, so we have to
move bar registration after it.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/ich.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ide/ich.c b/hw/ide/ich.c index e44339b07..6150ce334 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -93,14 +93,14 @@ static int pci_ich9_ahci_init(PCIDevice *dev) qemu_register_reset(ahci_reset, d); - /* XXX BAR size should be 1k, but that breaks, so bump it to 4k for now */ - pci_register_bar_simple(&d->card, 5, 0x1000, 0, d->ahci.mem); - msi_init(dev, 0x50, 1, true, false); ahci_init(&d->ahci, &dev->qdev, 6); d->ahci.irq = d->card.irq[0]; + /* XXX BAR size should be 1k, but that breaks, so bump it to 4k for now */ + pci_register_bar_simple(&d->card, 5, 0x1000, 0, d->ahci.mem); + return 0; } |