hw/timer/sun4v-rtc: Use DeviceState::realize rather than SysBusDevice::init
Move from the legacy SysBusDevice::init method to using DeviceState::realize. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Message-Id: <20181002212522.23303-4-f4bug@amsat.org> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
		
							parent
							
								
									252bfbdec0
								
							
						
					
					
						commit
						e871972e65
					
				@ -63,21 +63,21 @@ void sun4v_rtc_init(hwaddr addr)
 | 
				
			|||||||
    sysbus_mmio_map(s, 0, addr);
 | 
					    sysbus_mmio_map(s, 0, addr);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int sun4v_rtc_init1(SysBusDevice *dev)
 | 
					static void sun4v_rtc_realize(DeviceState *dev, Error **errp)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
 | 
				
			||||||
    Sun4vRtc *s = SUN4V_RTC(dev);
 | 
					    Sun4vRtc *s = SUN4V_RTC(dev);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    memory_region_init_io(&s->iomem, OBJECT(s), &sun4v_rtc_ops, s,
 | 
					    memory_region_init_io(&s->iomem, OBJECT(s), &sun4v_rtc_ops, s,
 | 
				
			||||||
                          "sun4v-rtc", 0x08ULL);
 | 
					                          "sun4v-rtc", 0x08ULL);
 | 
				
			||||||
    sysbus_init_mmio(dev, &s->iomem);
 | 
					    sysbus_init_mmio(sbd, &s->iomem);
 | 
				
			||||||
    return 0;
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void sun4v_rtc_class_init(ObjectClass *klass, void *data)
 | 
					static void sun4v_rtc_class_init(ObjectClass *klass, void *data)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 | 
					    DeviceClass *dc = DEVICE_CLASS(klass);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    k->init = sun4v_rtc_init1;
 | 
					    dc->realize = sun4v_rtc_realize;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const TypeInfo sun4v_rtc_info = {
 | 
					static const TypeInfo sun4v_rtc_info = {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user