[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/19] hw/s390x: Move vhost-vsock-ccw code to a separ
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 14/19] hw/s390x: Move vhost-vsock-ccw code to a separate file |
Date: |
Wed, 29 Aug 2018 11:41:38 +0200 |
From: Thomas Huth <address@hidden>
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: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
[CH: updated MAINTAINERS]
Signed-off-by: Cornelia Huck <address@hidden>
---
MAINTAINERS | 1 +
hw/s390x/Makefile.objs | 1 +
hw/s390x/vhost-vsock-ccw.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++
hw/s390x/virtio-ccw.c | 47 ------------------------------------
4 files changed, 62 insertions(+), 47 deletions(-)
create mode 100644 hw/s390x/vhost-vsock-ccw.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 03fe7893bc..aa1dd76dc2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1238,6 +1238,7 @@ M: Cornelia Huck <address@hidden>
M: Christian Borntraeger <address@hidden>
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: address@hidden
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
index 1073cfaef2..f1c058e6f2 100644
--- a/hw/s390x/Makefile.objs
+++ b/hw/s390x/Makefile.objs
@@ -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
diff --git a/hw/s390x/vhost-vsock-ccw.c b/hw/s390x/vhost-vsock-ccw.c
new file mode 100644
index 0000000000..cddc5cf652
--- /dev/null
+++ b/hw/s390x/vhost-vsock-ccw.c
@@ -0,0 +1,60 @@
+/*
+ * 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)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 5a7896f76d..1f68e04bac 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -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);
--
2.14.4
- [Qemu-devel] [PULL 00/19] next batch of s390x changes, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 16/19] hw/s390x: Move virtio-ccw-input code to a separate file, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 17/19] hw/s390x: Move virtio-ccw-net code to a separate file, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 18/19] hw/s390x: Move virtio-ccw-blk code to a separate file, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 13/19] hw/s390x: Move virtio-ccw-crypto code to a separate file, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 14/19] hw/s390x: Move vhost-vsock-ccw code to a separate file,
Cornelia Huck <=
- [Qemu-devel] [PULL 19/19] target/s390x: use regular spaces in translate.c, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 12/19] hw/s390x: Move virtio-ccw-9p code to a separate file, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 11/19] hw/s390x: Move virtio-ccw-rng code to a separate file, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 07/19] hw/s390x/virtio-ccw: Consolidate calls to virtio_ccw_unrealize(), Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 10/19] hw/s390x: Move virtio-ccw-scsi code to a separate file, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 09/19] hw/s390x: Move virtio-ccw-balloon code to a separate file, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 08/19] hw/s390x: Move virtio-ccw-serial code to a separate file, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 15/19] hw/s390x: Move virtio-ccw-gpu code to a separate file, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 06/19] target/s390x: fix PACK reading 1 byte less and writing 1 byte more, Cornelia Huck, 2018/08/29
- [Qemu-devel] [PULL 05/19] target/s390x: add EX support for TRT and TRTR, Cornelia Huck, 2018/08/29