Mark,
It seems that you're usually push mac changes via a qemu-macppc PR (git log says that the last one was Jan 2021), so feel free to keep doing so. If it's convenient for you I can pick them via ppc-next as well. Just let me know. Thanks, Daniel On 9/25/22 09:38, BALATON Zoltan wrote:
This series includes some clean ups to mac_newworld and mac_oldworld to make them a bit simpler and more readable, It also removes the shared mac.h file that turns out was more of a random collection of unrelated things. Getting rid of this mac.h improves the locality of device models and reduces unnecessary interdependency. v2: Split some patches and add a few more I've noticed now and address review comments BALATON Zoltan (13): mac_newworld: Drop some variables mac_oldworld: Drop some more variables mac_{old|new}world: Set tbfreq at declaration mac_{old|new}world: Avoid else branch by setting default value mac_oldworld: Do not open code sysbus_mmio_map() mac_newworld: Simplify creation of Uninorth devices mac_{old|new}world: Reduce number of QOM casts hw/ppc/mac.h: Move newworld specific parts out from shared header hw/ppc/mac.h: Move macio specific parts out from shared header hw/ppc/mac.h: Move grackle-pcihost declaration out from shared header hw/ppc/mac.h: Move PROM and KERNEL defines to board code hw/ppc/mac.h: Rename to include/hw/nvram/mac_nvram.h mac_nvram: Use NVRAM_SIZE constant MAINTAINERS | 1 + hw/ide/macio.c | 1 - hw/intc/heathrow_pic.c | 1 - hw/intc/openpic.c | 1 - hw/misc/macio/cuda.c | 1 - hw/misc/macio/gpio.c | 1 - hw/misc/macio/macio.c | 8 +- hw/misc/macio/pmu.c | 1 - hw/nvram/mac_nvram.c | 2 +- hw/pci-host/grackle.c | 2 +- hw/pci-host/uninorth.c | 1 - hw/ppc/mac.h | 105 ---------------- hw/ppc/mac_newworld.c | 223 ++++++++++++++++------------------ hw/ppc/mac_oldworld.c | 113 +++++++---------- include/hw/misc/macio/macio.h | 23 +++- include/hw/nvram/mac_nvram.h | 51 ++++++++ 16 files changed, 230 insertions(+), 305 deletions(-) delete mode 100644 hw/ppc/mac.h create mode 100644 include/hw/nvram/mac_nvram.h