mirror of https://github.com/proxmox/mirror_qemu
virtio-ccw: add support for 9pfs
This patch adds 9pfs support for virtio-ccw by registering the virtio_ccw_9p_info type and adding associated callbacks. Signed-off-by: Pierre Morel <pmorel@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>master
parent
42d58e7c67
commit
de6a92185e
|
@ -1,8 +1,9 @@
|
||||||
/*
|
/*
|
||||||
* virtio ccw target implementation
|
* virtio ccw target implementation
|
||||||
*
|
*
|
||||||
* Copyright 2012,2014 IBM Corp.
|
* Copyright 2012,2015 IBM Corp.
|
||||||
* Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
|
* 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
|
* 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
|
* your option) any later version. See the COPYING file in the top-level
|
||||||
|
@ -1730,6 +1731,56 @@ static const TypeInfo virtio_ccw_bus_info = {
|
||||||
.class_init = virtio_ccw_bus_class_init,
|
.class_init = virtio_ccw_bus_class_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef CONFIG_VIRTFS
|
||||||
|
static Property virtio_ccw_9p_properties[] = {
|
||||||
|
DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
|
||||||
|
DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,
|
||||||
|
VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),
|
||||||
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
|
};
|
||||||
|
|
||||||
|
static void virtio_ccw_9p_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
||||||
|
{
|
||||||
|
V9fsCCWState *dev = VIRTIO_9P_CCW(ccw_dev);
|
||||||
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
||||||
|
Error *err = NULL;
|
||||||
|
|
||||||
|
qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
|
||||||
|
object_property_set_bool(OBJECT(vdev), true, "realized", &err);
|
||||||
|
if (err) {
|
||||||
|
error_propagate(errp, err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void virtio_ccw_9p_class_init(ObjectClass *klass, void *data)
|
||||||
|
{
|
||||||
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
|
||||||
|
|
||||||
|
k->exit = virtio_ccw_exit;
|
||||||
|
k->realize = virtio_ccw_9p_realize;
|
||||||
|
dc->reset = virtio_ccw_reset;
|
||||||
|
dc->props = virtio_ccw_9p_properties;
|
||||||
|
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void virtio_ccw_9p_instance_init(Object *obj)
|
||||||
|
{
|
||||||
|
V9fsCCWState *dev = VIRTIO_9P_CCW(obj);
|
||||||
|
|
||||||
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
||||||
|
TYPE_VIRTIO_9P);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const TypeInfo virtio_ccw_9p_info = {
|
||||||
|
.name = TYPE_VIRTIO_9P_CCW,
|
||||||
|
.parent = TYPE_VIRTIO_CCW_DEVICE,
|
||||||
|
.instance_size = sizeof(V9fsCCWState),
|
||||||
|
.instance_init = virtio_ccw_9p_instance_init,
|
||||||
|
.class_init = virtio_ccw_9p_class_init,
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
static void virtio_ccw_register(void)
|
static void virtio_ccw_register(void)
|
||||||
{
|
{
|
||||||
type_register_static(&virtio_ccw_bus_info);
|
type_register_static(&virtio_ccw_bus_info);
|
||||||
|
@ -1745,6 +1796,9 @@ static void virtio_ccw_register(void)
|
||||||
#endif
|
#endif
|
||||||
type_register_static(&virtio_ccw_rng);
|
type_register_static(&virtio_ccw_rng);
|
||||||
type_register_static(&virtual_css_bridge_info);
|
type_register_static(&virtual_css_bridge_info);
|
||||||
|
#ifdef CONFIG_VIRTFS
|
||||||
|
type_register_static(&virtio_ccw_9p_info);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
type_init(virtio_ccw_register)
|
type_init(virtio_ccw_register)
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
/*
|
/*
|
||||||
* virtio ccw target definitions
|
* virtio ccw target definitions
|
||||||
*
|
*
|
||||||
* Copyright 2012 IBM Corp.
|
* Copyright 2012,2015 IBM Corp.
|
||||||
* Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
|
* 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
|
* 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
|
* your option) any later version. See the COPYING file in the top-level
|
||||||
|
@ -189,4 +190,19 @@ typedef struct VirtIORNGCcw {
|
||||||
VirtualCssBus *virtual_css_bus_init(void);
|
VirtualCssBus *virtual_css_bus_init(void);
|
||||||
void virtio_ccw_device_update_status(SubchDev *sch);
|
void virtio_ccw_device_update_status(SubchDev *sch);
|
||||||
VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch);
|
VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch);
|
||||||
|
|
||||||
|
#ifdef CONFIG_VIRTFS
|
||||||
|
#include "hw/9pfs/virtio-9p.h"
|
||||||
|
|
||||||
|
#define TYPE_VIRTIO_9P_CCW "virtio-9p-ccw"
|
||||||
|
#define VIRTIO_9P_CCW(obj) \
|
||||||
|
OBJECT_CHECK(V9fsCCWState, (obj), TYPE_VIRTIO_9P_CCW)
|
||||||
|
|
||||||
|
typedef struct V9fsCCWState {
|
||||||
|
VirtioCcwDevice parent_obj;
|
||||||
|
V9fsState vdev;
|
||||||
|
} V9fsCCWState;
|
||||||
|
|
||||||
|
#endif /* CONFIG_VIRTFS */
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue