]> git.proxmox.com Git - mirror_qemu.git/commit
macio: move ESCC device within the macio device
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Wed, 28 Feb 2018 20:32:33 +0000 (20:32 +0000)
committerDavid Gibson <david@gibson.dropbear.id.au>
Tue, 6 Mar 2018 02:16:29 +0000 (13:16 +1100)
commit343bd85a40811f0522063e58d565c6965bd81e00
tree8a07b6914502944486a7f907f190390af14552e7
parenta504b9b91a1a884ce7e5296f4692b9cac85beab5
macio: move ESCC device within the macio device

Now that the ESCC device is instantiated directly via qdev, move it to within
the macio device and wire up the IRQs and memory regions using the sysbus API.

This enables to remove the now-obsolete escc_mem parameter to the macio_init()
function.

(Note this patch also contains small touch-ups to the formatting in
macio_escc_legacy_setup() and ppc_heathrow_init() in order to keep checkpatch
happy)

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
hw/misc/macio/macio.c
hw/ppc/mac.h
hw/ppc/mac_newworld.c
hw/ppc/mac_oldworld.c