[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/39] virtio-scsi: Add 'iothread' property to virtio
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 22/39] virtio-scsi: Add 'iothread' property to virtio-scsi |
Date: |
Tue, 30 Sep 2014 14:25:02 +0200 |
From: Fam Zheng <address@hidden>
Similar to this property in virtio-blk for dataplane, add it as a QOM
link in virtio-scsi and an alias in virtio-scsi-pci and virtio-scsi-ccw,
in order to assign an iothread to the device.
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/s390x/virtio-ccw.c | 2 ++
hw/scsi/virtio-scsi.c | 11 +++++++++++
hw/virtio/virtio-pci.c | 2 ++
include/hw/virtio/virtio-scsi.h | 1 +
4 files changed, 16 insertions(+)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 5175d57..e7d3ea1 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -938,6 +938,8 @@ static void virtio_ccw_scsi_instance_init(Object *obj)
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
TYPE_VIRTIO_SCSI);
+ object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev), "iothread",
+ &error_abort);
}
#ifdef CONFIG_VHOST_SCSI
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 58b4200..91ead26 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -728,6 +728,16 @@ static void virtio_scsi_device_realize(DeviceState *dev,
Error **errp)
virtio_scsi_save, virtio_scsi_load, s);
}
+static void virtio_scsi_instance_init(Object *obj)
+{
+ VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(obj);
+
+ object_property_add_link(obj, "iothread", TYPE_IOTHREAD,
+ (Object **)&vs->conf.iothread,
+ qdev_prop_allow_set_link_before_realize,
+ OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
+}
+
void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
@@ -786,6 +796,7 @@ static const TypeInfo virtio_scsi_info = {
.name = TYPE_VIRTIO_SCSI,
.parent = TYPE_VIRTIO_SCSI_COMMON,
.instance_size = sizeof(VirtIOSCSI),
+ .instance_init = virtio_scsi_instance_init,
.class_init = virtio_scsi_class_init,
};
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 83a699f..bae62c8 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1186,6 +1186,8 @@ static void virtio_scsi_pci_instance_init(Object *obj)
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
TYPE_VIRTIO_SCSI);
+ object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev), "iothread",
+ &error_abort);
}
static const TypeInfo virtio_scsi_pci_info = {
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
index 6cd2f57..2ff145a 100644
--- a/include/hw/virtio/virtio-scsi.h
+++ b/include/hw/virtio/virtio-scsi.h
@@ -151,6 +151,7 @@ struct VirtIOSCSIConf {
uint32_t cmd_per_lun;
char *vhostfd;
char *wwpn;
+ IOThread *iothread;
};
typedef struct VirtIOSCSICommon {
--
1.8.3.1
- [Qemu-devel] [PULL 09/39] virtio-scsi: Make virtio_scsi_push_event public, (continued)
- [Qemu-devel] [PULL 09/39] virtio-scsi: Make virtio_scsi_push_event public, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 14/39] virtio-serial: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 15/39] virtio-serial: fix virtio-serial child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 16/39] virtio-rng: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 17/39] virtio-rng: fix virtio-rng child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 18/39] virtio-balloon: fix virtio-balloon child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 19/39] virtio-9p: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 20/39] virtio-9p: fix virtio-9p child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 21/39] virtio: add a wrapper for virtio-backend initialization, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 23/39] virtio-scsi: Add VirtIOSCSIVring in VirtIOSCSIReq, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 22/39] virtio-scsi: Add 'iothread' property to virtio-scsi,
Paolo Bonzini <=
- [Qemu-devel] [PULL 24/39] virtio-scsi-dataplane: Code to run virtio-scsi on iothread, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 25/39] virtio-scsi: Hook up with dataplane, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 26/39] virtio-scsi: Add migration state notifier for dataplane code, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 27/39] virtio-scsi: Two stages processing of cmd request, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 28/39] virtio-scsi: Batched prepare for cmd reqs, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 29/39] virtio-scsi: Call bdrv_io_plug/bdrv_io_unplug in cmd request handling, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 30/39] virtio-scsi: Process ".iothread" property, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 31/39] scsi: Drop scsi_req_abort, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 33/39] scsi: Unify request unref in scsi_req_cancel, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 32/39] scsi-generic: Handle canceled request in scsi_command_complete, Paolo Bonzini, 2014/09/30