--- qemu/hw/ide/isa.c	2018/04/24 18:30:50	1.1.1.2
+++ qemu/hw/ide/isa.c	2018/04/24 19:30:24	1.1.1.5
@@ -26,8 +26,6 @@
 #include <hw/pc.h>
 #include <hw/isa.h>
 #include "block.h"
-#include "block_int.h"
-#include "sysemu.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>
@@ -67,8 +65,8 @@ static int isa_ide_initfn(ISADevice *dev
 {
     ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev);
 
-    ide_bus_new(&s->bus, &s->dev.qdev);
-    ide_init_ioport(&s->bus, s->iobase, s->iobase2);
+    ide_bus_new(&s->bus, &s->dev.qdev, 0);
+    ide_init_ioport(&s->bus, dev, s->iobase, s->iobase2);
     isa_init_irq(dev, &s->irq, s->isairq);
     ide_init2(&s->bus, s->irq);
     vmstate_register(&dev->qdev, 0, &vmstate_ide_isa, s);
@@ -98,6 +96,7 @@ ISADevice *isa_ide_init(int iobase, int
 
 static ISADeviceInfo isa_ide_info = {
     .qdev.name  = "isa-ide",
+    .qdev.fw_name  = "ide",
     .qdev.size  = sizeof(ISAIDEState),
     .init       = isa_ide_initfn,
     .qdev.reset = isa_ide_reset,