 3e80f6902c
			
		
	
	
		3e80f6902c
		
	
	
	
	
		
			
			This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion.  More to come in
this series.
Coccinelle script:
    @ depends on !(file in "hw/arm/highbank.c")@
    expression bus, type_name, dev, expr;
    @@
    -    dev = qdev_create(bus, type_name);
    +    dev = qdev_new(type_name);
         ... when != dev = expr
    -    qdev_init_nofail(dev);
    +    qdev_realize_and_unref(dev, bus, &error_fatal);
    @@
    expression bus, type_name, dev, expr;
    identifier DOWN;
    @@
    -    dev = DOWN(qdev_create(bus, type_name));
    +    dev = DOWN(qdev_new(type_name));
         ... when != dev = expr
    -    qdev_init_nofail(DEVICE(dev));
    +    qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
    @@
    expression bus, type_name, expr;
    identifier dev;
    @@
    -    DeviceState *dev = qdev_create(bus, type_name);
    +    DeviceState *dev = qdev_new(type_name);
         ... when != dev = expr
    -    qdev_init_nofail(dev);
    +    qdev_realize_and_unref(dev, bus, &error_fatal);
    @@
    expression bus, type_name, dev, expr, errp;
    symbol true;
    @@
    -    dev = qdev_create(bus, type_name);
    +    dev = qdev_new(type_name);
         ... when != dev = expr
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize_and_unref(dev, bus, errp);
    @@
    expression bus, type_name, expr, errp;
    identifier dev;
    symbol true;
    @@
    -    DeviceState *dev = qdev_create(bus, type_name);
    +    DeviceState *dev = qdev_new(type_name);
         ... when != dev = expr
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name.  Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
		
	
			
		
			
				
	
	
		
			168 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			168 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * css bridge implementation
 | |
|  *
 | |
|  * Copyright 2012,2016 IBM Corp.
 | |
|  * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
 | |
|  *            Pierre Morel <pmorel@linux.vnet.ibm.com>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2 or (at
 | |
|  * your option) any later version. See the COPYING file in the top-level
 | |
|  * directory.
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "qapi/error.h"
 | |
| #include "hw/hotplug.h"
 | |
| #include "hw/qdev-properties.h"
 | |
| #include "hw/sysbus.h"
 | |
| #include "qemu/bitops.h"
 | |
| #include "qemu/module.h"
 | |
| #include "hw/s390x/css.h"
 | |
| #include "ccw-device.h"
 | |
| #include "hw/s390x/css-bridge.h"
 | |
| #include "cpu.h"
 | |
| 
 | |
| /*
 | |
|  * Invoke device-specific unplug handler, disable the subchannel
 | |
|  * (including sending a channel report to the guest) and remove the
 | |
|  * device from the virtual css bus.
 | |
|  */
 | |
| static void ccw_device_unplug(HotplugHandler *hotplug_dev,
 | |
|                               DeviceState *dev, Error **errp)
 | |
| {
 | |
|     CcwDevice *ccw_dev = CCW_DEVICE(dev);
 | |
|     CCWDeviceClass *k = CCW_DEVICE_GET_CLASS(ccw_dev);
 | |
|     SubchDev *sch = ccw_dev->sch;
 | |
|     Error *err = NULL;
 | |
| 
 | |
|     if (k->unplug) {
 | |
|         k->unplug(hotplug_dev, dev, &err);
 | |
|         if (err) {
 | |
|             error_propagate(errp, err);
 | |
|             return;
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     /*
 | |
|      * We should arrive here only for device_del, since we don't support
 | |
|      * direct hot(un)plug of channels.
 | |
|      */
 | |
|     assert(sch != NULL);
 | |
|     /* Subchannel is now disabled and no longer valid. */
 | |
|     sch->curr_status.pmcw.flags &= ~(PMCW_FLAGS_MASK_ENA |
 | |
|                                      PMCW_FLAGS_MASK_DNV);
 | |
| 
 | |
|     css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid, 1, 0);
 | |
| 
 | |
|     qdev_unrealize(dev);
 | |
| }
 | |
| 
 | |
| static void virtual_css_bus_reset(BusState *qbus)
 | |
| {
 | |
|     /* This should actually be modelled via the generic css */
 | |
|     css_reset();
 | |
| }
 | |
| 
 | |
| static char *virtual_css_bus_get_dev_path(DeviceState *dev)
 | |
| {
 | |
|     CcwDevice *ccw_dev = CCW_DEVICE(dev);
 | |
|     SubchDev *sch = ccw_dev->sch;
 | |
|     VirtualCssBridge *bridge =
 | |
|         VIRTUAL_CSS_BRIDGE(qdev_get_parent_bus(dev)->parent);
 | |
| 
 | |
|     /*
 | |
|      * We can't provide a dev path for backward compatibility on
 | |
|      * older machines, as it is visible in the migration stream.
 | |
|      */
 | |
|     return bridge->css_dev_path ?
 | |
|         g_strdup_printf("/%02x.%1x.%04x", sch->cssid, sch->ssid, sch->devno) :
 | |
|         NULL;
 | |
| }
 | |
| 
 | |
| static void virtual_css_bus_class_init(ObjectClass *klass, void *data)
 | |
| {
 | |
|     BusClass *k = BUS_CLASS(klass);
 | |
| 
 | |
|     k->reset = virtual_css_bus_reset;
 | |
|     k->get_dev_path = virtual_css_bus_get_dev_path;
 | |
| }
 | |
| 
 | |
| static const TypeInfo virtual_css_bus_info = {
 | |
|     .name = TYPE_VIRTUAL_CSS_BUS,
 | |
|     .parent = TYPE_BUS,
 | |
|     .instance_size = sizeof(VirtualCssBus),
 | |
|     .class_init = virtual_css_bus_class_init,
 | |
| };
 | |
| 
 | |
| VirtualCssBus *virtual_css_bus_init(void)
 | |
| {
 | |
|     VirtualCssBus *cbus;
 | |
|     BusState *bus;
 | |
|     DeviceState *dev;
 | |
| 
 | |
|     /* Create bridge device */
 | |
|     dev = qdev_new(TYPE_VIRTUAL_CSS_BRIDGE);
 | |
|     object_property_add_child(qdev_get_machine(), TYPE_VIRTUAL_CSS_BRIDGE,
 | |
|                               OBJECT(dev));
 | |
|     qdev_realize_and_unref(dev, NULL, &error_fatal);
 | |
| 
 | |
|     /* Create bus on bridge device */
 | |
|     bus = qbus_create(TYPE_VIRTUAL_CSS_BUS, dev, "virtual-css");
 | |
|     cbus = VIRTUAL_CSS_BUS(bus);
 | |
| 
 | |
|     /* Enable hotplugging */
 | |
|     qbus_set_hotplug_handler(bus, OBJECT(dev), &error_abort);
 | |
| 
 | |
|     css_register_io_adapters(CSS_IO_ADAPTER_VIRTIO, true, false,
 | |
|                              0, &error_abort);
 | |
| 
 | |
|     return cbus;
 | |
|  }
 | |
| 
 | |
| /***************** Virtual-css Bus Bridge Device ********************/
 | |
| 
 | |
| static Property virtual_css_bridge_properties[] = {
 | |
|     DEFINE_PROP_BOOL("css_dev_path", VirtualCssBridge, css_dev_path,
 | |
|                      true),
 | |
|     DEFINE_PROP_END_OF_LIST(),
 | |
| };
 | |
| 
 | |
| static bool prop_get_true(Object *obj, Error **errp)
 | |
| {
 | |
|     return true;
 | |
| }
 | |
| 
 | |
| static void virtual_css_bridge_class_init(ObjectClass *klass, void *data)
 | |
| {
 | |
|     HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
 | |
|     DeviceClass *dc = DEVICE_CLASS(klass);
 | |
| 
 | |
|     hc->unplug = ccw_device_unplug;
 | |
|     set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 | |
|     device_class_set_props(dc, virtual_css_bridge_properties);
 | |
|     object_class_property_add_bool(klass, "cssid-unrestricted",
 | |
|                                    prop_get_true, NULL);
 | |
|     object_class_property_set_description(klass, "cssid-unrestricted",
 | |
|             "A css device can use any cssid, regardless whether virtual"
 | |
|             " or not (read only, always true)");
 | |
| }
 | |
| 
 | |
| static const TypeInfo virtual_css_bridge_info = {
 | |
|     .name          = TYPE_VIRTUAL_CSS_BRIDGE,
 | |
|     .parent        = TYPE_SYS_BUS_DEVICE,
 | |
|     .instance_size = sizeof(VirtualCssBridge),
 | |
|     .class_init    = virtual_css_bridge_class_init,
 | |
|     .interfaces = (InterfaceInfo[]) {
 | |
|         { TYPE_HOTPLUG_HANDLER },
 | |
|         { }
 | |
|     }
 | |
| };
 | |
| 
 | |
| static void virtual_css_register(void)
 | |
| {
 | |
|     type_register_static(&virtual_css_bridge_info);
 | |
|     type_register_static(&virtual_css_bus_info);
 | |
| }
 | |
| 
 | |
| type_init(virtual_css_register)
 |