The following patch will need to handle properties registration during class_init time. Let's use a device_class_set_props() setter. spatch --macro-file scripts/cocci-macro-file.h --sp-file ./scripts/coccinelle/qdev-set-props.cocci --keep-comments --in-place --dir . @@ typedef DeviceClass; DeviceClass *d; expression val; @@ - d->props = val + device_class_set_props(d, val) Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20200110153039.1379601-20-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
		
			
				
	
	
		
			73 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			73 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "qemu/osdep.h"
 | |
| #include "qapi/error.h"
 | |
| #include "qemu/module.h"
 | |
| #include "hw/loader.h"
 | |
| #include "hw/qdev-properties.h"
 | |
| #include "hw/isa/isa.h"
 | |
| #include "hw/display/ramfb.h"
 | |
| #include "ui/console.h"
 | |
| 
 | |
| #define RAMFB(obj) OBJECT_CHECK(RAMFBStandaloneState, (obj), TYPE_RAMFB_DEVICE)
 | |
| 
 | |
| typedef struct RAMFBStandaloneState {
 | |
|     SysBusDevice parent_obj;
 | |
|     QemuConsole *con;
 | |
|     RAMFBState *state;
 | |
|     uint32_t xres;
 | |
|     uint32_t yres;
 | |
| } RAMFBStandaloneState;
 | |
| 
 | |
| static void display_update_wrapper(void *dev)
 | |
| {
 | |
|     RAMFBStandaloneState *ramfb = RAMFB(dev);
 | |
| 
 | |
|     if (0 /* native driver active */) {
 | |
|         /* non-standalone device would run native display update here */;
 | |
|     } else {
 | |
|         ramfb_display_update(ramfb->con, ramfb->state);
 | |
|     }
 | |
| }
 | |
| 
 | |
| static const GraphicHwOps wrapper_ops = {
 | |
|     .gfx_update = display_update_wrapper,
 | |
| };
 | |
| 
 | |
| static void ramfb_realizefn(DeviceState *dev, Error **errp)
 | |
| {
 | |
|     RAMFBStandaloneState *ramfb = RAMFB(dev);
 | |
| 
 | |
|     ramfb->con = graphic_console_init(dev, 0, &wrapper_ops, dev);
 | |
|     ramfb->state = ramfb_setup(dev, errp);
 | |
| }
 | |
| 
 | |
| static Property ramfb_properties[] = {
 | |
|     DEFINE_PROP_UINT32("xres", RAMFBStandaloneState, xres, 0),
 | |
|     DEFINE_PROP_UINT32("yres", RAMFBStandaloneState, yres, 0),
 | |
|     DEFINE_PROP_END_OF_LIST(),
 | |
| };
 | |
| 
 | |
| static void ramfb_class_initfn(ObjectClass *klass, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(klass);
 | |
| 
 | |
|     set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
 | |
|     dc->realize = ramfb_realizefn;
 | |
|     device_class_set_props(dc, ramfb_properties);
 | |
|     dc->desc = "ram framebuffer standalone device";
 | |
|     dc->user_creatable = true;
 | |
| }
 | |
| 
 | |
| static const TypeInfo ramfb_info = {
 | |
|     .name          = TYPE_RAMFB_DEVICE,
 | |
|     .parent        = TYPE_SYS_BUS_DEVICE,
 | |
|     .instance_size = sizeof(RAMFBStandaloneState),
 | |
|     .class_init    = ramfb_class_initfn,
 | |
| };
 | |
| 
 | |
| static void ramfb_register_types(void)
 | |
| {
 | |
|     type_register_static(&ramfb_info);
 | |
| }
 | |
| 
 | |
| type_init(ramfb_register_types)
 |