From: Jan Kiszka Date: Sun, 8 May 2011 17:54:52 +0000 (+0200) Subject: ahci: Unbreak bar registration X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=96d19bcbf5f679bbaaeab001b572c367fbfb2b03;p=qemu.git 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 Signed-off-by: Anthony Liguori --- diff --git a/hw/ide/ich.c b/hw/ide/ich.c index e44339b078..6150ce3343 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; }