[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 03/12] Virtio: Add transport bindings.
From: |
Evgeny Voevodin |
Subject: |
[Qemu-devel] [RFC v2 03/12] Virtio: Add transport bindings. |
Date: |
Mon, 17 Sep 2012 14:00:33 +0400 |
Signed-off-by: Evgeny Voevodin <address@hidden>
---
hw/Makefile.objs | 1 +
hw/virtio-transport.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++++
hw/virtio-transport.h | 74 +++++++++++++++++++++++++
3 files changed, 222 insertions(+)
create mode 100644 hw/virtio-transport.c
create mode 100644 hw/virtio-transport.h
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 6dfebd2..db4c16d 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -2,6 +2,7 @@ hw-obj-y = usb/ ide/
hw-obj-y += loader.o
hw-obj-$(CONFIG_VIRTIO) += virtio-console.o
hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
+hw-obj-$(CONFIG_VIRTIO) += virtio-transport.o
hw-obj-y += fw_cfg.o
hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o pci_bridge_dev.o
hw-obj-$(CONFIG_PCI) += msix.o msi.o
diff --git a/hw/virtio-transport.c b/hw/virtio-transport.c
new file mode 100644
index 0000000..76360ba
--- /dev/null
+++ b/hw/virtio-transport.c
@@ -0,0 +1,147 @@
+/*
+ * Virtio transport bindings
+ *
+ * Copyright (c) 2011 - 2012 Samsung Electronics Co., Ltd.
+ *
+ * Author:
+ * Evgeny Voevodin <address@hidden>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "virtio-transport.h"
+
+#define VIRTIO_TRANSPORT_BUS "virtio-transport"
+
+static QTAILQ_HEAD(, VirtIOTransportLink) transport_links =
+ QTAILQ_HEAD_INITIALIZER(transport_links);
+
+/*
+ * Find transport device by its ID.
+ */
+VirtIOTransportLink* virtio_find_transport(const char *name)
+{
+ VirtIOTransportLink *trl;
+
+ assert(name != NULL);
+
+ QTAILQ_FOREACH(trl, &transport_links, sibling) {
+ if (trl->tr->id != NULL) {
+ if (!strcmp(name, trl->tr->id)) {
+ return trl;
+ }
+ }
+ }
+
+ return NULL;
+}
+
+/*
+ * Count transport devices by ID.
+ */
+uint32_t virtio_count_transports(const char *name)
+{
+ VirtIOTransportLink *trl;
+ uint32_t i = 0;
+
+ QTAILQ_FOREACH(trl, &transport_links, sibling) {
+ if (name == NULL) {
+ i++;
+ continue;
+ }
+
+ if (trl->tr->id != NULL) {
+ if (!strncmp(name, trl->tr->id,strlen(name))) {
+ i++;
+ }
+ }
+ }
+ return i;
+}
+
+/*
+ * Initialize new transport device
+ */
+char* virtio_init_transport(DeviceState *dev, VirtIOTransportLink **trl,
+ const char* name, virtio_backend_init_cb cb)
+{
+ VirtIOTransportLink *link = g_malloc0(sizeof(VirtIOTransportLink));
+ char *buf;
+ size_t len;
+ uint32_t i;
+
+ assert(dev != NULL);
+ assert(name != NULL);
+ assert(trl != NULL);
+
+ i = virtio_count_transports(name);
+ len = strlen(name) + 16;
+ buf = g_malloc(len);
+ snprintf(buf, len, "%s.%d", name, i);
+ qbus_create(TYPE_VIRTIO_BUS, dev, buf);
+
+ /* Add new transport */
+ QTAILQ_INSERT_TAIL(&transport_links, link, sibling);
+ link->tr = dev;
+ link->cb = cb;
+ // TODO: Add a link property
+ *trl = link;
+ return buf;
+}
+
+/*
+ * Unplug back-end from system bus and plug it into transport bus.
+ */
+void virtio_plug_into_transport(DeviceState *dev, VirtIOTransportLink *trl)
+{
+ BusChild *kid;
+
+ /* Unplug back-end from system bus */
+ QTAILQ_FOREACH(kid, &qdev_get_parent_bus(dev)->children, sibling) {
+ if (kid->child == dev) {
+ QTAILQ_REMOVE(&qdev_get_parent_bus(dev)->children, kid, sibling);
+ break;
+ }
+ }
+
+ /* Plug back-end into transport's bus */
+ qdev_set_parent_bus(dev, QLIST_FIRST(&trl->tr->child_bus));
+
+}
+
+/*
+ * Execute call-back on back-end initialization.
+ * Performs initialization of MMIO or PCI transport.
+ */
+int virtio_call_backend_init_cb(DeviceState *dev, VirtIOTransportLink *trl,
+ VirtIODevice *vdev)
+{
+ if (trl->cb) {
+ return trl->cb(dev, vdev, trl);
+ }
+
+ return 0;
+}
+
+static const TypeInfo virtio_bus_info = {
+ .name = TYPE_VIRTIO_BUS,
+ .parent = TYPE_BUS,
+ .instance_size = sizeof(BusState),
+};
+
+static void virtio_register_types(void)
+{
+ type_register_static(&virtio_bus_info);
+}
+
+type_init(virtio_register_types)
diff --git a/hw/virtio-transport.h b/hw/virtio-transport.h
new file mode 100644
index 0000000..43200dc
--- /dev/null
+++ b/hw/virtio-transport.h
@@ -0,0 +1,74 @@
+/*
+ * Virtio transport header
+ *
+ * Copyright (c) 2011 - 2012 Samsung Electronics Co., Ltd.
+ *
+ * Author:
+ * Evgeny Voevodin <address@hidden>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef VIRTIO_TRANSPORT_H_
+#define VIRTIO_TRANSPORT_H_
+
+#include "qdev.h"
+#include "qemu-common.h"
+
+#define VIRTIO_MMIO "virtio-mmio"
+#define VIRTIO_PCI "virtio-pci"
+
+#define TYPE_VIRTIO_BUS "virtio-bus"
+#define VIRTIO_BUS(obj) OBJECT_CHECK(virtio_bus, (obj), TYPE_VIRTIO_BUS)
+
+struct VirtIOTransportLink;
+
+typedef int (*virtio_backend_init_cb)(DeviceState *dev, VirtIODevice *vdev,
+ struct VirtIOTransportLink *trl);
+
+typedef struct VirtIOTransportLink {
+ DeviceState *tr;
+ virtio_backend_init_cb cb;
+ uint32_t host_features;
+ QTAILQ_ENTRY(VirtIOTransportLink) sibling;
+} VirtIOTransportLink;
+
+/*
+ * Find transport device by its ID.
+ */
+VirtIOTransportLink* virtio_find_transport(const char *name);
+
+/*
+ * Count transport devices by ID.
+ */
+uint32_t virtio_count_transports(const char *name);
+
+/*
+ * Initialize new transport device
+ */
+char* virtio_init_transport(DeviceState *dev, VirtIOTransportLink **trl,
+ const char* name, virtio_backend_init_cb cb);
+
+/*
+ * Unplug back-end from system bus and plug it into transport bus.
+ */
+void virtio_plug_into_transport(DeviceState *dev, VirtIOTransportLink *trl);
+
+/*
+ * Execute call-back on back-end initialization.
+ * Performs initialization of MMIO or PCI transport.
+ */
+int virtio_call_backend_init_cb(DeviceState *dev, VirtIOTransportLink *trl,
+ VirtIODevice *vdev);
+
+#endif /* VIRTIO_TRANSPORT_H_ */
--
1.7.9.5
- [Qemu-devel] [RFC v2 00/12] Virtio-mmio refactoring., Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 08/12] hw/virtio-balloon.c: Add virtio-balloon device., Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 05/12] hw/pci.c: Make pci_add_option_rom global visible, Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 02/12] virtio: Support transports which can specify the vring alignment, Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 03/12] Virtio: Add transport bindings.,
Evgeny Voevodin <=
- [Qemu-devel] [RFC v2 01/12] virtio: Add support for guest setting of queue size, Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 07/12] hw/virtio-serial-bus.c: Add virtio-serial device., Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 06/12] Add MMIO based virtio transport, Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 04/12] hw/qdev-properties.c: Add "transport" property., Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 12/12] hw/exynos4210.c: Create two virtio-mmio transport instances., Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 09/12] hw/virtio-net.c: Add virtio-net device., Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 10/12] hw/virtio-blk.c: Add virtio-blk device., Evgeny Voevodin, 2012/09/17
- [Qemu-devel] [RFC v2 11/12] hw/virtio-pci-new.c: Add VirtIOPCI device., Evgeny Voevodin, 2012/09/17