diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-22 08:05:05 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-22 08:05:05 -0500 |
| commit | 6165daa4c8431d9d60382352864b46f34dd61ab4 (patch) | |
| tree | 9d49f1cb3dca5ce3da719738550ca10c8c248b0c /hw/s390x/virtio-ccw.h | |
| parent | d639498852773a6019cf1b970dd8dc2f3791c45b (diff) | |
| parent | d6e51919a7e3250bbfb4bb0ad0f208ab6fd688a4 (diff) | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
# By Paolo Bonzini (5) and others
# Via Paolo Bonzini
* bonzini/scsi-next:
vhost-scsi-s390: new device supporting the tcm_vhost Linux kernel module
vhost-scsi-ccw: new device supporting the tcm_vhost Linux kernel module
vhost-scsi-pci: new device supporting the tcm_vhost Linux kernel module
vhost-scsi: new device supporting the tcm_vhost Linux kernel module
virtio: simplify Makefile conditionals
virtio-scsi: create VirtIOSCSICommon
vhost: Add vhost_commit callback for SeaBIOS ROM region re-mapping
scsi: VMWare PVSCSI paravirtual device implementation
scsi: avoid assertion failure on VERIFY command
Message-id: 1366381460-6041-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/s390x/virtio-ccw.h')
| -rw-r--r-- | hw/s390x/virtio-ccw.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 35ab1a5ef2..84055e71da 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -16,6 +16,9 @@ #include <hw/virtio/virtio-net.h> #include <hw/virtio/virtio-serial.h> #include <hw/virtio/virtio-scsi.h> +#ifdef CONFIG_VHOST_SCSI +#include <hw/virtio/vhost-scsi.h> +#endif #include <hw/virtio/virtio-balloon.h> #include <hw/virtio/virtio-rng.h> #include <hw/virtio/virtio-bus.h> @@ -101,6 +104,17 @@ typedef struct VirtIOSCSICcw { VirtIOSCSI vdev; } VirtIOSCSICcw; +/* vhost-scsi-ccw */ + +#define TYPE_VHOST_SCSI_CCW "vhost-scsi-ccw" +#define VHOST_SCSI_CCW(obj) \ + OBJECT_CHECK(VHostSCSICcw, (obj), TYPE_VHOST_SCSI_CCW) + +typedef struct VHostSCSICcw { + VirtioCcwDevice parent_obj; + VHostSCSI vdev; +} VHostSCSICcw; + /* virtio-blk-ccw */ #define TYPE_VIRTIO_BLK_CCW "virtio-blk-ccw" |