Commit dd70bd0d authored by Jing Liu's avatar Jing Liu Committed by Cornelia Huck
Browse files

s390x/css: Factor out virtual css bridge and bus 



Currently, common base layers virtual css bridge and bus are
defined in hw/s390x/virtio-ccw.c(h). In order to support
multiple types of devices in the virtual channel subsystem,
especially non virtio-ccw, refactoring work needs to be done.

This work is just a pure code move without any functional change
except dropping an empty function virtual_css_bridge_init() and
virtio_ccw_busdev_unplug() changing. virtio_ccw_busdev_unplug()
is specific to virtio-ccw but gets referenced from the common
virtual css bridge code. To keep the functional changes to a
minimum we export this function from virtio-ccw.c and continue
to reference it inside virtual_css_bridge_class_init()
(now living in hw/s390x/css-bridge.c). A follow-up patch will
clean this up.

Signed-off-by: default avatarJing Liu <liujbjl@linux.vnet.ibm.com>
Reviewed-by: default avatarSascha Silbe <silbe@linux.vnet.ibm.com>
Reviewed-by: default avatarDong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 3f9e4859

hw/s390x/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ obj-y += ipl.o 
obj-y += css.o

obj-y += s390-virtio-ccw.o

obj-y += virtio-ccw.o

obj-y += css-bridge.o

obj-y += s390-pci-bus.o s390-pci-inst.o

obj-y += s390-skeys.o

obj-$(CONFIG_KVM) += s390-skeys-kvm.o

hw/s390x/css-bridge.c

0 → 100644
+89 −0
Original line number Diff line number Diff line 
/*

 * 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 "virtio-ccw.h"

#include "hw/hotplug.h"

#include "hw/sysbus.h"

#include "qemu/bitops.h"

#include "hw/s390x/css.h"

#include "hw/s390x/css-bridge.h"



static void virtual_css_bus_reset(BusState *qbus)

{

    /* This should actually be modelled via the generic css */

    css_reset();

}



static void virtual_css_bus_class_init(ObjectClass *klass, void *data)

{

    BusClass *k = BUS_CLASS(klass);



    k->reset = virtual_css_bus_reset;

}



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_create(NULL, TYPE_VIRTUAL_CSS_BRIDGE);

    qdev_init_nofail(dev);



    /* 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, dev, &error_abort);



    return cbus;

 }



/***************** Virtual-css Bus Bridge Device ********************/



static void virtual_css_bridge_class_init(ObjectClass *klass, void *data)

{

    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);

    DeviceClass *dc = DEVICE_CLASS(klass);



    hc->unplug = virtio_ccw_busdev_unplug;

    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

}



static const TypeInfo virtual_css_bridge_info = {

    .name          = TYPE_VIRTUAL_CSS_BRIDGE,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(SysBusDevice),

    .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)

hw/s390x/s390-virtio-ccw.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "hw/compat.h"

#include "ipl.h"

#include "hw/s390x/s390-virtio-ccw.h"

#include "hw/s390x/css-bridge.h"



static const char *const reset_dev_types[] = {

    TYPE_VIRTUAL_CSS_BRIDGE,

hw/s390x/virtio-ccw.c

+3 −76
Original line number Diff line number Diff line
@@ -33,31 +33,11 @@ 
#include "hw/s390x/css.h"

#include "virtio-ccw.h"

#include "trace.h"

#include "hw/s390x/css-bridge.h"



static void virtio_ccw_bus_new(VirtioBusState *bus, size_t bus_size,

                               VirtioCcwDevice *dev);



static void virtual_css_bus_reset(BusState *qbus)

{

    /* This should actually be modelled via the generic css */

    css_reset();

}





static void virtual_css_bus_class_init(ObjectClass *klass, void *data)

{

    BusClass *k = BUS_CLASS(klass);



    k->reset = virtual_css_bus_reset;

}



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,

};



VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch)

{

    VirtIODevice *vdev = NULL;
@@ -123,26 +103,6 @@ static int virtio_ccw_ioeventfd_assign(DeviceState *d, EventNotifier *notifier, 
    return s390_assign_subch_ioeventfd(notifier, sch_id, n, assign);

}



VirtualCssBus *virtual_css_bus_init(void)

{

    VirtualCssBus *cbus;

    BusState *bus;

    DeviceState *dev;



    /* Create bridge device */

    dev = qdev_create(NULL, TYPE_VIRTUAL_CSS_BRIDGE);

    qdev_init_nofail(dev);



    /* 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, dev, &error_abort);



    return cbus;

}



/* Communication blocks used by several channel commands. */

typedef struct VqInfoBlockLegacy {

    uint64_t queue;
@@ -1565,7 +1525,7 @@ static int virtio_ccw_busdev_exit(DeviceState *dev) 
    return _info->exit(_dev);

}



static void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev,

void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev,

                              DeviceState *dev, Error **errp)

{

    VirtioCcwDevice *_dev = (VirtioCcwDevice *)dev;
@@ -1605,37 +1565,6 @@ static const TypeInfo virtio_ccw_device_info = { 
    .abstract = true,

};



/***************** Virtual-css Bus Bridge Device ********************/

/* Only required to have the virtio bus as child in the system bus */



static int virtual_css_bridge_init(SysBusDevice *dev)

{

    /* nothing */

    return 0;

}



static void virtual_css_bridge_class_init(ObjectClass *klass, void *data)

{

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);

    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);

    DeviceClass *dc = DEVICE_CLASS(klass);



    k->init = virtual_css_bridge_init;

    hc->unplug = virtio_ccw_busdev_unplug;

    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

}



static const TypeInfo virtual_css_bridge_info = {

    .name          = TYPE_VIRTUAL_CSS_BRIDGE,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(SysBusDevice),

    .class_init    = virtual_css_bridge_class_init,

    .interfaces = (InterfaceInfo[]) {

        { TYPE_HOTPLUG_HANDLER },

        { }

    }

};



/* virtio-ccw-bus */



static void virtio_ccw_bus_new(VirtioBusState *bus, size_t bus_size,
@@ -1730,7 +1659,6 @@ static const TypeInfo virtio_ccw_9p_info = { 
static void virtio_ccw_register(void)

{

    type_register_static(&virtio_ccw_bus_info);

    type_register_static(&virtual_css_bus_info);

    type_register_static(&virtio_ccw_device_info);

    type_register_static(&virtio_ccw_serial);

    type_register_static(&virtio_ccw_blk);
@@ -1741,7 +1669,6 @@ static void virtio_ccw_register(void) 
    type_register_static(&vhost_ccw_scsi);

#endif

    type_register_static(&virtio_ccw_rng);

    type_register_static(&virtual_css_bridge_info);

#ifdef CONFIG_VIRTFS

    type_register_static(&virtio_ccw_9p_info);

#endif

hw/s390x/virtio-ccw.h

+2 −12
Original line number Diff line number Diff line
@@ -101,17 +101,8 @@ static inline int virtio_ccw_rev_max(VirtioCcwDevice *dev) 
    return dev->max_rev;

}



/* virtual css bridge type */

#define TYPE_VIRTUAL_CSS_BRIDGE "virtual-css-bridge"



/* virtual css bus type */

typedef struct VirtualCssBus {

    BusState parent_obj;

} VirtualCssBus;



#define TYPE_VIRTUAL_CSS_BUS "virtual-css-bus"

#define VIRTUAL_CSS_BUS(obj) \

     OBJECT_CHECK(VirtualCssBus, (obj), TYPE_VIRTUAL_CSS_BUS)

void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev,

                              DeviceState *dev, Error **errp);



/* virtio-scsi-ccw */
@@ -192,7 +183,6 @@ typedef struct VirtIORNGCcw { 
    VirtIORNG vdev;

} VirtIORNGCcw;



VirtualCssBus *virtual_css_bus_init(void);

void virtio_ccw_device_update_status(SubchDev *sch);

VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch);