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

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



The code should only be enabled if CONFIG_VIRTIO_INPUT 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-11-git-send-email-thuth@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 5c765468

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-$(CONFIG_VIRTIO_GPU) += virtio-ccw-gpu.o

obj-$(CONFIG_VIRTIO_INPUT) += virtio-ccw-input.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-input.c

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

 * virtio ccw scsi implementation

 *

 * Copyright 2012, 2015 IBM Corp.

 *

 * 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_input_realize(VirtioCcwDevice *ccw_dev, Error **errp)

{

    VirtIOInputCcw *dev = VIRTIO_INPUT_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 Property virtio_ccw_input_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_input_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->realize = virtio_ccw_input_realize;

    dc->props = virtio_ccw_input_properties;

    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

}



static void virtio_ccw_keyboard_instance_init(Object *obj)

{

    VirtIOInputHIDCcw *dev = VIRTIO_INPUT_HID_CCW(obj);

    VirtioCcwDevice *ccw_dev = VIRTIO_CCW_DEVICE(obj);



    ccw_dev->force_revision_1 = true;

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

                                TYPE_VIRTIO_KEYBOARD);

}



static void virtio_ccw_mouse_instance_init(Object *obj)

{

    VirtIOInputHIDCcw *dev = VIRTIO_INPUT_HID_CCW(obj);

    VirtioCcwDevice *ccw_dev = VIRTIO_CCW_DEVICE(obj);



    ccw_dev->force_revision_1 = true;

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

                                TYPE_VIRTIO_MOUSE);

}



static void virtio_ccw_tablet_instance_init(Object *obj)

{

    VirtIOInputHIDCcw *dev = VIRTIO_INPUT_HID_CCW(obj);

    VirtioCcwDevice *ccw_dev = VIRTIO_CCW_DEVICE(obj);



    ccw_dev->force_revision_1 = true;

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

                                TYPE_VIRTIO_TABLET);

}



static const TypeInfo virtio_ccw_input = {

    .name          = TYPE_VIRTIO_INPUT_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(VirtIOInputCcw),

    .class_init    = virtio_ccw_input_class_init,

    .abstract = true,

};



static const TypeInfo virtio_ccw_input_hid = {

    .name          = TYPE_VIRTIO_INPUT_HID_CCW,

    .parent        = TYPE_VIRTIO_INPUT_CCW,

    .instance_size = sizeof(VirtIOInputHIDCcw),

    .abstract = true,

};



static const TypeInfo virtio_ccw_keyboard = {

    .name          = TYPE_VIRTIO_KEYBOARD_CCW,

    .parent        = TYPE_VIRTIO_INPUT_HID_CCW,

    .instance_size = sizeof(VirtIOInputHIDCcw),

    .instance_init = virtio_ccw_keyboard_instance_init,

};



static const TypeInfo virtio_ccw_mouse = {

    .name          = TYPE_VIRTIO_MOUSE_CCW,

    .parent        = TYPE_VIRTIO_INPUT_HID_CCW,

    .instance_size = sizeof(VirtIOInputHIDCcw),

    .instance_init = virtio_ccw_mouse_instance_init,

};



static const TypeInfo virtio_ccw_tablet = {

    .name          = TYPE_VIRTIO_TABLET_CCW,

    .parent        = TYPE_VIRTIO_INPUT_HID_CCW,

    .instance_size = sizeof(VirtIOInputHIDCcw),

    .instance_init = virtio_ccw_tablet_instance_init,

};



static void virtio_ccw_input_register(void)

{

    type_register_static(&virtio_ccw_input);

    type_register_static(&virtio_ccw_input_hid);

    type_register_static(&virtio_ccw_keyboard);

    type_register_static(&virtio_ccw_mouse);

    type_register_static(&virtio_ccw_tablet);

}



type_init(virtio_ccw_input_register)

hw/s390x/virtio-ccw.c

+0 −98
Original line number Diff line number Diff line
@@ -808,15 +808,6 @@ static void virtio_ccw_blk_instance_init(Object *obj) 
                              "bootindex", &error_abort);

}



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

{

    VirtIOInputCcw *dev = VIRTIO_INPUT_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);

}



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

 * be careful and test performance if you change this.

 */
@@ -1243,90 +1234,6 @@ static const TypeInfo virtio_ccw_blk = { 
    .class_init    = virtio_ccw_blk_class_init,

};



static Property virtio_ccw_input_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_input_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->realize = virtio_ccw_input_realize;

    dc->props = virtio_ccw_input_properties;

    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

}



static void virtio_ccw_keyboard_instance_init(Object *obj)

{

    VirtIOInputHIDCcw *dev = VIRTIO_INPUT_HID_CCW(obj);

    VirtioCcwDevice *ccw_dev = VIRTIO_CCW_DEVICE(obj);



    ccw_dev->force_revision_1 = true;

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

                                TYPE_VIRTIO_KEYBOARD);

}



static void virtio_ccw_mouse_instance_init(Object *obj)

{

    VirtIOInputHIDCcw *dev = VIRTIO_INPUT_HID_CCW(obj);

    VirtioCcwDevice *ccw_dev = VIRTIO_CCW_DEVICE(obj);



    ccw_dev->force_revision_1 = true;

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

                                TYPE_VIRTIO_MOUSE);

}



static void virtio_ccw_tablet_instance_init(Object *obj)

{

    VirtIOInputHIDCcw *dev = VIRTIO_INPUT_HID_CCW(obj);

    VirtioCcwDevice *ccw_dev = VIRTIO_CCW_DEVICE(obj);



    ccw_dev->force_revision_1 = true;

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

                                TYPE_VIRTIO_TABLET);

}



static const TypeInfo virtio_ccw_input = {

    .name          = TYPE_VIRTIO_INPUT_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(VirtIOInputCcw),

    .class_init    = virtio_ccw_input_class_init,

    .abstract = true,

};



static const TypeInfo virtio_ccw_input_hid = {

    .name          = TYPE_VIRTIO_INPUT_HID_CCW,

    .parent        = TYPE_VIRTIO_INPUT_CCW,

    .instance_size = sizeof(VirtIOInputHIDCcw),

    .abstract = true,

};



static const TypeInfo virtio_ccw_keyboard = {

    .name          = TYPE_VIRTIO_KEYBOARD_CCW,

    .parent        = TYPE_VIRTIO_INPUT_HID_CCW,

    .instance_size = sizeof(VirtIOInputHIDCcw),

    .instance_init = virtio_ccw_keyboard_instance_init,

};



static const TypeInfo virtio_ccw_mouse = {

    .name          = TYPE_VIRTIO_MOUSE_CCW,

    .parent        = TYPE_VIRTIO_INPUT_HID_CCW,

    .instance_size = sizeof(VirtIOInputHIDCcw),

    .instance_init = virtio_ccw_mouse_instance_init,

};



static const TypeInfo virtio_ccw_tablet = {

    .name          = TYPE_VIRTIO_TABLET_CCW,

    .parent        = TYPE_VIRTIO_INPUT_HID_CCW,

    .instance_size = sizeof(VirtIOInputHIDCcw),

    .instance_init = virtio_ccw_tablet_instance_init,

};



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

{

    VirtioCcwDevice *_dev = (VirtioCcwDevice *)dev;
@@ -1418,11 +1325,6 @@ static void virtio_ccw_register(void) 
    type_register_static(&virtio_ccw_device_info);

    type_register_static(&virtio_ccw_blk);

    type_register_static(&virtio_ccw_net);

    type_register_static(&virtio_ccw_input);

    type_register_static(&virtio_ccw_input_hid);

    type_register_static(&virtio_ccw_keyboard);

    type_register_static(&virtio_ccw_mouse);

    type_register_static(&virtio_ccw_tablet);

}



type_init(virtio_ccw_register)