Commit 331cf66e authored by Thomas Huth's avatar Thomas Huth Committed by Cornelia Huck
Browse files

hw/s390x: Move virtio-ccw-blk code to a separate file 



The code should only be enabled if CONFIG_VIRTIO_BLK has been set.
This can be done best if the code resides in a separate file.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <1532542110-9017-1-git-send-email-thuth@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent efbc1783

hw/s390x/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-ccw-crypto.o 
obj-$(CONFIG_VIRTIO_GPU) += virtio-ccw-gpu.o

obj-$(CONFIG_VIRTIO_INPUT) += virtio-ccw-input.o

obj-$(CONFIG_VIRTIO_NET) += virtio-ccw-net.o

obj-$(CONFIG_VIRTIO_BLK) += virtio-ccw-blk.o

obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) += virtio-ccw-9p.o

obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-ccw.o

obj-y += css-bridge.o

hw/s390x/virtio-ccw-blk.c

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

 * virtio ccw block implementation

 *

 * Copyright 2012, 2015 IBM Corp.

 * Author(s): Cornelia Huck <cornelia.huck@de.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 "hw/virtio/virtio.h"

#include "qapi/error.h"

#include "virtio-ccw.h"



static void virtio_ccw_blk_realize(VirtioCcwDevice *ccw_dev, Error **errp)

{

    VirtIOBlkCcw *dev = VIRTIO_BLK_CCW(ccw_dev);

    DeviceState *vdev = DEVICE(&dev->vdev);



    qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

}



static void virtio_ccw_blk_instance_init(Object *obj)

{

    VirtIOBlkCcw *dev = VIRTIO_BLK_CCW(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_BLK);

    object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),

                              "bootindex", &error_abort);

}



static Property virtio_ccw_blk_properties[] = {

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,

                       VIRTIO_CCW_MAX_REV),

    DEFINE_PROP_END_OF_LIST(),

};



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

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->realize = virtio_ccw_blk_realize;

    dc->props = virtio_ccw_blk_properties;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

}



static const TypeInfo virtio_ccw_blk = {

    .name          = TYPE_VIRTIO_BLK_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(VirtIOBlkCcw),

    .instance_init = virtio_ccw_blk_instance_init,

    .class_init    = virtio_ccw_blk_class_init,

};



static void virtio_ccw_blk_register(void)

{

    type_register_static(&virtio_ccw_blk);

}



type_init(virtio_ccw_blk_register)

hw/s390x/virtio-ccw.c

+0 −46
Original line number Diff line number Diff line
@@ -767,25 +767,6 @@ static void virtio_ccw_device_unrealize(VirtioCcwDevice *dev, Error **errp) 
    }

}



static void virtio_ccw_blk_realize(VirtioCcwDevice *ccw_dev, Error **errp)

{

    VirtIOBlkCcw *dev = VIRTIO_BLK_CCW(ccw_dev);

    DeviceState *vdev = DEVICE(&dev->vdev);



    qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

}



static void virtio_ccw_blk_instance_init(Object *obj)

{

    VirtIOBlkCcw *dev = VIRTIO_BLK_CCW(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_BLK);

    object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),

                              "bootindex", &error_abort);

}



/* DeviceState to VirtioCcwDevice. Note: used on datapath,

 * be careful and test performance if you change this.

 */
@@ -1160,32 +1141,6 @@ static void virtio_ccw_device_unplugged(DeviceState *d) 
}

/**************** Virtio-ccw Bus Device Descriptions *******************/



static Property virtio_ccw_blk_properties[] = {

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,

                       VIRTIO_CCW_MAX_REV),

    DEFINE_PROP_END_OF_LIST(),

};



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

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->realize = virtio_ccw_blk_realize;

    dc->props = virtio_ccw_blk_properties;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

}



static const TypeInfo virtio_ccw_blk = {

    .name          = TYPE_VIRTIO_BLK_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(VirtIOBlkCcw),

    .instance_init = virtio_ccw_blk_instance_init,

    .class_init    = virtio_ccw_blk_class_init,

};



static void virtio_ccw_busdev_realize(DeviceState *dev, Error **errp)

{

    VirtioCcwDevice *_dev = (VirtioCcwDevice *)dev;
@@ -1275,7 +1230,6 @@ static void virtio_ccw_register(void) 
{

    type_register_static(&virtio_ccw_bus_info);

    type_register_static(&virtio_ccw_device_info);

    type_register_static(&virtio_ccw_blk);

}



type_init(virtio_ccw_register)