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

hw/s390x: Move vhost-vsock-ccw code to a separate file 



The code should only be enabled if CONFIG_VHOST_VSOCK 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: <1532521224-27235-9-git-send-email-thuth@redhat.com>
[CH: updated MAINTAINERS]
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent a8e1b5ff

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1238,6 +1238,7 @@ M: Cornelia Huck <cohuck@redhat.com> 
M: Christian Borntraeger <borntraeger@de.ibm.com>

S: Supported

F: hw/s390x/virtio-ccw*.[hc]

F: hw/s390x/vhost-vsock-ccw.c

T: git git://github.com/cohuck/qemu.git s390-next

T: git git://github.com/borntraeger/qemu.git s390-next

L: qemu-s390x@nongnu.org

hw/s390x/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ obj-$(CONFIG_VIRTIO_SCSI) += virtio-ccw-scsi.o 
obj-$(CONFIG_VIRTIO_RNG) += virtio-ccw-rng.o

obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-ccw-crypto.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

obj-y += ccw-device.o

obj-$(CONFIG_PCI) += s390-pci-bus.o s390-pci-inst.o

hw/s390x/vhost-vsock-ccw.c

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

 * vhost vsock ccw implementation

 *

 * 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 Property vhost_vsock_ccw_properties[] = {

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,

                       VIRTIO_CCW_MAX_REV),

    DEFINE_PROP_END_OF_LIST(),

};



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

{

    VHostVSockCCWState *dev = VHOST_VSOCK_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 vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->realize = vhost_vsock_ccw_realize;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

    dc->props = vhost_vsock_ccw_properties;

}



static void vhost_vsock_ccw_instance_init(Object *obj)

{

    VHostVSockCCWState *dev = VHOST_VSOCK_CCW(obj);



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

                                TYPE_VHOST_VSOCK);

}



static const TypeInfo vhost_vsock_ccw_info = {

    .name          = TYPE_VHOST_VSOCK_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(VHostVSockCCWState),

    .instance_init = vhost_vsock_ccw_instance_init,

    .class_init    = vhost_vsock_ccw_class_init,

};



static void vhost_vsock_ccw_register(void)

{

    type_register_static(&vhost_vsock_ccw_info);

}



type_init(vhost_vsock_ccw_register)

hw/s390x/virtio-ccw.c

+0 −47
Original line number Diff line number Diff line
@@ -1458,59 +1458,12 @@ static const TypeInfo virtio_ccw_bus_info = { 
    .class_init = virtio_ccw_bus_class_init,

};



#ifdef CONFIG_VHOST_VSOCK



static Property vhost_vsock_ccw_properties[] = {

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,

                       VIRTIO_CCW_MAX_REV),

    DEFINE_PROP_END_OF_LIST(),

};



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

{

    VHostVSockCCWState *dev = VHOST_VSOCK_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 vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->realize = vhost_vsock_ccw_realize;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

    dc->props = vhost_vsock_ccw_properties;

}



static void vhost_vsock_ccw_instance_init(Object *obj)

{

    VHostVSockCCWState *dev = VHOST_VSOCK_CCW(obj);



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

                                TYPE_VHOST_VSOCK);

}



static const TypeInfo vhost_vsock_ccw_info = {

    .name          = TYPE_VHOST_VSOCK_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(VHostVSockCCWState),

    .instance_init = vhost_vsock_ccw_instance_init,

    .class_init    = vhost_vsock_ccw_class_init,

};

#endif



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_register_static(&virtio_ccw_net);

#ifdef CONFIG_VHOST_VSOCK

    type_register_static(&vhost_vsock_ccw_info);

#endif

    type_register_static(&virtio_ccw_gpu);

    type_register_static(&virtio_ccw_input);

    type_register_static(&virtio_ccw_input_hid);