137 lines
4.4 KiB
Diff
137 lines
4.4 KiB
Diff
|
From fc5d5887462da813d91a3a0649214313d580d7af Mon Sep 17 00:00:00 2001
|
||
|
|
From: Claudio Imbrenda <cimbrend@redhat.com>
|
||
|
|
Date: Tue, 27 Oct 2020 12:02:16 -0400
|
||
|
|
Subject: [PATCH 03/18] virtio: add vhost-user-fs-ccw device
|
||
|
|
|
||
|
|
RH-Author: Claudio Imbrenda <cimbrend@redhat.com>
|
||
|
|
Message-id: <20201027120217.2997314-3-cimbrend@redhat.com>
|
||
|
|
Patchwork-id: 98720
|
||
|
|
O-Subject: [RHEL8.4 qemu-kvm PATCH 2/3] virtio: add vhost-user-fs-ccw device
|
||
|
|
Bugzilla: 1857733
|
||
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
|
||
|
|
From: Halil Pasic <pasic@linux.ibm.com>
|
||
|
|
|
||
|
|
upstream bd0bbb9aba2afbc2ea24b0475be04f795468b381
|
||
|
|
|
||
|
|
fixed for the backport:
|
||
|
|
* makefile logic instead of meson
|
||
|
|
* old style qdev initialization
|
||
|
|
* old style device class properties
|
||
|
|
|
||
|
|
--
|
||
|
|
|
||
|
|
Wire up the CCW device for vhost-user-fs.
|
||
|
|
|
||
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
Signed-off-by: Halil Pasic <pasic@linux.ibm.com>
|
||
|
|
Message-id: 20200901150019.29229-2-mhartmay@linux.ibm.com
|
||
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/s390x/Makefile.objs | 1 +
|
||
|
|
hw/s390x/vhost-user-fs-ccw.c | 76 ++++++++++++++++++++++++++++++++++++
|
||
|
|
2 files changed, 77 insertions(+)
|
||
|
|
create mode 100644 hw/s390x/vhost-user-fs-ccw.c
|
||
|
|
|
||
|
|
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
|
||
|
|
index a46a1c7894e..c4086ec3171 100644
|
||
|
|
--- a/hw/s390x/Makefile.objs
|
||
|
|
+++ b/hw/s390x/Makefile.objs
|
||
|
|
@@ -20,6 +20,7 @@ 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-$(CONFIG_VHOST_USER_FS) += vhost-user-fs-ccw.o
|
||
|
|
endif
|
||
|
|
obj-y += css-bridge.o
|
||
|
|
obj-y += ccw-device.o
|
||
|
|
diff --git a/hw/s390x/vhost-user-fs-ccw.c b/hw/s390x/vhost-user-fs-ccw.c
|
||
|
|
new file mode 100644
|
||
|
|
index 00000000000..e7b165d5f61
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/hw/s390x/vhost-user-fs-ccw.c
|
||
|
|
@@ -0,0 +1,76 @@
|
||
|
|
+/*
|
||
|
|
+ * virtio ccw vhost-user-fs implementation
|
||
|
|
+ *
|
||
|
|
+ * Copyright 2020 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/qdev-properties.h"
|
||
|
|
+#include "qapi/error.h"
|
||
|
|
+#include "hw/virtio/vhost-user-fs.h"
|
||
|
|
+#include "virtio-ccw.h"
|
||
|
|
+
|
||
|
|
+typedef struct VHostUserFSCcw {
|
||
|
|
+ VirtioCcwDevice parent_obj;
|
||
|
|
+ VHostUserFS vdev;
|
||
|
|
+} VHostUserFSCcw;
|
||
|
|
+
|
||
|
|
+#define TYPE_VHOST_USER_FS_CCW "vhost-user-fs-ccw"
|
||
|
|
+#define VHOST_USER_FS_CCW(obj) \
|
||
|
|
+ OBJECT_CHECK(VHostUserFSCcw, (obj), TYPE_VHOST_USER_FS_CCW)
|
||
|
|
+
|
||
|
|
+
|
||
|
|
+static Property vhost_user_fs_ccw_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 vhost_user_fs_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
||
|
|
+{
|
||
|
|
+ VHostUserFSCcw *dev = VHOST_USER_FS_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_user_fs_ccw_instance_init(Object *obj)
|
||
|
|
+{
|
||
|
|
+ VHostUserFSCcw *dev = VHOST_USER_FS_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_VHOST_USER_FS);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+static void vhost_user_fs_ccw_class_init(ObjectClass *klass, void *data)
|
||
|
|
+{
|
||
|
|
+ DeviceClass *dc = DEVICE_CLASS(klass);
|
||
|
|
+ VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
|
||
|
|
+
|
||
|
|
+ k->realize = vhost_user_fs_ccw_realize;
|
||
|
|
+ dc->props = vhost_user_fs_ccw_properties;
|
||
|
|
+ set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+static const TypeInfo vhost_user_fs_ccw = {
|
||
|
|
+ .name = TYPE_VHOST_USER_FS_CCW,
|
||
|
|
+ .parent = TYPE_VIRTIO_CCW_DEVICE,
|
||
|
|
+ .instance_size = sizeof(VHostUserFSCcw),
|
||
|
|
+ .instance_init = vhost_user_fs_ccw_instance_init,
|
||
|
|
+ .class_init = vhost_user_fs_ccw_class_init,
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
+static void vhost_user_fs_ccw_register(void)
|
||
|
|
+{
|
||
|
|
+ type_register_static(&vhost_user_fs_ccw);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+type_init(vhost_user_fs_ccw_register)
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|