macio: move setting of CUDA timebase frequency to macio_common_realize()
This removes the last of the functionality from macio_init() in preparation for its subsequent removal. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
		
							parent
							
								
									dda12e9a6f
								
							
						
					
					
						commit
						aa79b0860e
					
				@ -101,6 +101,8 @@ static void macio_common_realize(PCIDevice *d, Error **errp)
 | 
				
			|||||||
    memory_region_add_subregion(&s->bar, 0x08000,
 | 
					    memory_region_add_subregion(&s->bar, 0x08000,
 | 
				
			||||||
                                sysbus_mmio_get_region(sysbus_dev, 0));
 | 
					                                sysbus_mmio_get_region(sysbus_dev, 0));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qdev_prop_set_uint64(DEVICE(&s->cuda), "timebase-frequency",
 | 
				
			||||||
 | 
					                         s->frequency);
 | 
				
			||||||
    object_property_set_bool(OBJECT(&s->cuda), true, "realized", &err);
 | 
					    object_property_set_bool(OBJECT(&s->cuda), true, "realized", &err);
 | 
				
			||||||
    if (err) {
 | 
					    if (err) {
 | 
				
			||||||
        error_propagate(errp, err);
 | 
					        error_propagate(errp, err);
 | 
				
			||||||
@ -444,12 +446,7 @@ type_init(macio_register_types)
 | 
				
			|||||||
void macio_init(PCIDevice *d,
 | 
					void macio_init(PCIDevice *d,
 | 
				
			||||||
                MemoryRegion *pic_mem)
 | 
					                MemoryRegion *pic_mem)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    MacIOState *macio_state = MACIO(d);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /* Note: this code is strongly inspirated from the corresponding code
 | 
					    /* Note: this code is strongly inspirated from the corresponding code
 | 
				
			||||||
       in PearPC */
 | 
					       in PearPC */
 | 
				
			||||||
    qdev_prop_set_uint64(DEVICE(&macio_state->cuda), "timebase-frequency",
 | 
					 | 
				
			||||||
                         macio_state->frequency);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    qdev_init_nofail(DEVICE(d));
 | 
					    qdev_init_nofail(DEVICE(d));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user