mirror of
				https://github.com/qemu/qemu.git
				synced 2025-10-31 04:06:46 +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]
		
	
			
		
			
				
	
	
		
			61 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			61 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * ARM CMSDK APB timer emulation
 | |
|  *
 | |
|  * Copyright (c) 2017 Linaro Limited
 | |
|  * Written by Peter Maydell
 | |
|  *
 | |
|  *  This program is free software; you can redistribute it and/or modify
 | |
|  *  it under the terms of the GNU General Public License version 2 or
 | |
|  *  (at your option) any later version.
 | |
|  */
 | |
| 
 | |
| #ifndef CMSDK_APB_TIMER_H
 | |
| #define CMSDK_APB_TIMER_H
 | |
| 
 | |
| #include "hw/qdev-properties.h"
 | |
| #include "hw/sysbus.h"
 | |
| #include "hw/ptimer.h"
 | |
| 
 | |
| #define TYPE_CMSDK_APB_TIMER "cmsdk-apb-timer"
 | |
| #define CMSDK_APB_TIMER(obj) OBJECT_CHECK(CMSDKAPBTIMER, (obj), \
 | |
|                                          TYPE_CMSDK_APB_TIMER)
 | |
| 
 | |
| typedef struct {
 | |
|     /*< private >*/
 | |
|     SysBusDevice parent_obj;
 | |
| 
 | |
|     /*< public >*/
 | |
|     MemoryRegion iomem;
 | |
|     qemu_irq timerint;
 | |
|     uint32_t pclk_frq;
 | |
|     struct ptimer_state *timer;
 | |
| 
 | |
|     uint32_t ctrl;
 | |
|     uint32_t value;
 | |
|     uint32_t reload;
 | |
|     uint32_t intstatus;
 | |
| } CMSDKAPBTIMER;
 | |
| 
 | |
| /**
 | |
|  * cmsdk_apb_timer_create - convenience function to create TYPE_CMSDK_APB_TIMER
 | |
|  * @addr: location in system memory to map registers
 | |
|  * @pclk_frq: frequency in Hz of the PCLK clock (used for calculating baud rate)
 | |
|  */
 | |
| static inline DeviceState *cmsdk_apb_timer_create(hwaddr addr,
 | |
|                                                  qemu_irq timerint,
 | |
|                                                  uint32_t pclk_frq)
 | |
| {
 | |
|     DeviceState *dev;
 | |
|     SysBusDevice *s;
 | |
| 
 | |
|     dev = qdev_new(TYPE_CMSDK_APB_TIMER);
 | |
|     s = SYS_BUS_DEVICE(dev);
 | |
|     qdev_prop_set_uint32(dev, "pclk-frq", pclk_frq);
 | |
|     sysbus_realize_and_unref(s, &error_fatal);
 | |
|     sysbus_mmio_map(s, 0, addr);
 | |
|     sysbus_connect_irq(s, 0, timerint);
 | |
|     return dev;
 | |
| }
 | |
| 
 | |
| #endif
 |