Merge remote-tracking branch 'origin/master' into pci

[mirror_qemu.git] / hw / ide / ich.c

diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 976cc9244b0002caff5dbba6b9ab1cd02aec2995..054e0734e43342c29e7320c39614dc454794a737 100644 (file)
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -90,12 +90,12 @@ 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);
     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;
 }