mirror of
				https://github.com/qemu/qemu.git
				synced 2025-10-30 19:15:42 +00:00 
			
		
		
		
	 3c6ef471ee
			
		
	
	
		3c6ef471ee
		
	
	
	
	
		
			
			Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
    @@
    expression dev, errp;
    @@
    -    qdev_realize(DEVICE(dev), NULL, errp);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), errp);
    @@
    expression sysbus_dev, dev, errp;
    @@
    +    sysbus_dev = SYS_BUS_DEVICE(dev);
    -    qdev_realize_and_unref(dev, NULL, errp);
    +    sysbus_realize_and_unref(sysbus_dev, errp);
    -    sysbus_dev = SYS_BUS_DEVICE(dev);
    @@
    expression sysbus_dev, dev, errp;
    expression expr;
    @@
         sysbus_dev = SYS_BUS_DEVICE(dev);
         ... when != dev = expr;
    -    qdev_realize_and_unref(dev, NULL, errp);
    +    sysbus_realize_and_unref(sysbus_dev, errp);
    @@
    expression dev, errp;
    @@
    -    qdev_realize_and_unref(DEVICE(dev), NULL, errp);
    +    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
    @@
    expression dev, errp;
    @@
    -    qdev_realize_and_unref(dev, NULL, errp);
    +    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
		
	
			
		
			
				
	
	
		
			49 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			49 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef HW_LM32_H
 | |
| #define HW_LM32_H
 | |
| 
 | |
| #include "hw/char/lm32_juart.h"
 | |
| #include "hw/qdev-properties.h"
 | |
| #include "qapi/error.h"
 | |
| 
 | |
| static inline DeviceState *lm32_pic_init(qemu_irq cpu_irq)
 | |
| {
 | |
|     DeviceState *dev;
 | |
|     SysBusDevice *d;
 | |
| 
 | |
|     dev = qdev_new("lm32-pic");
 | |
|     d = SYS_BUS_DEVICE(dev);
 | |
|     sysbus_realize_and_unref(d, &error_fatal);
 | |
|     sysbus_connect_irq(d, 0, cpu_irq);
 | |
| 
 | |
|     return dev;
 | |
| }
 | |
| 
 | |
| static inline DeviceState *lm32_juart_init(Chardev *chr)
 | |
| {
 | |
|     DeviceState *dev;
 | |
| 
 | |
|     dev = qdev_new(TYPE_LM32_JUART);
 | |
|     qdev_prop_set_chr(dev, "chardev", chr);
 | |
|     sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
 | |
| 
 | |
|     return dev;
 | |
| }
 | |
| 
 | |
| static inline DeviceState *lm32_uart_create(hwaddr addr,
 | |
|                                             qemu_irq irq,
 | |
|                                             Chardev *chr)
 | |
| {
 | |
|     DeviceState *dev;
 | |
|     SysBusDevice *s;
 | |
| 
 | |
|     dev = qdev_new("lm32-uart");
 | |
|     s = SYS_BUS_DEVICE(dev);
 | |
|     qdev_prop_set_chr(dev, "chardev", chr);
 | |
|     sysbus_realize_and_unref(s, &error_fatal);
 | |
|     sysbus_mmio_map(s, 0, addr);
 | |
|     sysbus_connect_irq(s, 0, irq);
 | |
|     return dev;
 | |
| }
 | |
| 
 | |
| #endif
 |