On Fri, Jul 14, 2017 at 10:40:07AM +0100, Mark Cave-Ayland wrote: > When looking to instantiate a TYPE_FW_CFG_MEM or TYPE_FW_CFG_IO device to be > able to wire it up differently, it is much more convenient for the caller to > instantiate the device and have the fw_cfg default files already preloaded > during realize. > > Move fw_cfg_init1() to the end of both the fw_cfg_mem_realize() and > fw_cfg_io_realize() functions so it no longer needs to be called manually > when instantiating the device, and also rename it to fw_cfg_common_realize() > which better describes its new purpose. > > Since it is now the responsibility of the machine to wire up the fw_cfg device > it is necessary to introduce a object_property_add_child() call into > fw_cfg_init_io() and fw_cfg_init_mem() to link the fw_cfg device to the root > machine object as before. > > Finally with the previous change to fw_cfg_find() we can now remove the > assert() preventing multiple fw_cfg devices being instantiated and replace > them with a simple call to fw_cfg_find() at realize time instead. This allows > us to remove FW_CFG_NAME and FW_CFG_PATH since they are no longer required. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> > Reviewed-by: Igor Mammedov <imamm...@redhat.com>
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com> -- Eduardo