Andreas Färber <afaer...@suse.de> writes:
> It was not qdev'ified before, turn it into a SysBusDevice and
> initialize it via static properties.
>
> Prepare Old World specific MacIO state and embed the NVRAM state there.
>
> Drop macio_nvram_setup_bar() in favor of sysbus_mmio_map() or
> direct use of Memory API.
[...]
> diff --git a/hw/macio.c b/hw/macio.c
> index 0e6fc8d..32f359c 100644
> --- a/hw/macio.c
> +++ b/hw/macio.c
[...]
> @@ -85,11 +93,22 @@ static int macio_common_initfn(PCIDevice *d)
> static int macio_oldworld_initfn(PCIDevice *d)
> {
> MacIOState *s = MACIO(d);
> + OldWorldMacIOState *os = OLDWORLD_MACIO(d);
I find aliasing pointers like these mildly confusing, and prefer to
avoid aliases. Matter of taste, I guess.
> + SysBusDevice *sysbus_dev;
> int ret = macio_common_initfn(d);
> if (ret < 0) {
> return ret;
[...]
