Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> --- hw/alpha/dp264.c | 4 ++-- hw/sparc64/sun4u.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 03495e1e60..f2affecad9 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -13,7 +13,7 @@ #include "alpha_sys.h" #include "qemu/error-report.h" #include "hw/rtc/mc146818rtc.h" -#include "hw/ide/pci.h" +#include "hw/ide/cmd646.h" #include "hw/isa/superio.h" #include "net/net.h" #include "qemu/cutils.h" @@ -132,7 +132,7 @@ static void clipper_init(MachineState *machine) isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO); /* IDE disk setup. */ - pci_dev = pci_create_simple(pci_bus, -1, "cmd646-ide"); + pci_dev = pci_create_simple(pci_bus, -1, TYPE_CMD646_IDE); pci_ide_create_devs(pci_dev); /* Load PALcode. Given that this is not "real" cpu palcode, diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index e2858a0331..66b55eabd1 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -50,7 +50,7 @@ #include "hw/sparc/sparc64.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" -#include "hw/ide/pci.h" +#include "hw/ide/cmd646.h" #include "hw/loader.h" #include "hw/fw-path-provider.h" #include "elf.h" @@ -673,7 +673,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, qemu_macaddr_default_if_unset(&macaddr); } - pci_dev = pci_new(PCI_DEVFN(3, 0), "cmd646-ide"); + pci_dev = pci_new(PCI_DEVFN(3, 0), TYPE_CMD646_IDE); qdev_prop_set_uint32(&pci_dev->qdev, "secondary", 1); pci_realize_and_unref(pci_dev, pci_busA, &error_fatal); pci_ide_create_devs(pci_dev); -- 2.30.2