diff options
| author | Ed Maste <emaste@freebsd.org> | 2013-04-25 13:38:28 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-04-26 13:23:31 +0200 |
| commit | b702d2aebeb6b1392f42262f537f70e6890233a7 (patch) | |
| tree | d9bd138c707ebcce251d8380d65caf438b036186 /hw/s390x | |
| parent | 48c75f484de13d59df6ae0e6becfe4ad4cd41ad5 (diff) | |
| download | qemu-b702d2aebeb6b1392f42262f537f70e6890233a7.zip qemu-b702d2aebeb6b1392f42262f537f70e6890233a7.tar.gz qemu-b702d2aebeb6b1392f42262f537f70e6890233a7.tar.bz2 | |
virtio: Fix compilation without CONFIG_VHOST_SCSI
Signed-off-by: Ed Maste <emaste@freebsd.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/s390-virtio-bus.c | 2 | ||||
| -rw-r--r-- | hw/s390x/virtio-ccw.c | 2 | ||||
| -rw-r--r-- | hw/s390x/virtio-ccw.h | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index cf51a85..a7e81d1 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -691,7 +691,9 @@ static void s390_virtio_register_types(void) type_register_static(&s390_virtio_blk); type_register_static(&s390_virtio_net); type_register_static(&s390_virtio_scsi); +#ifdef CONFIG_VHOST_SCSI type_register_static(&s390_vhost_scsi); +#endif type_register_static(&s390_virtio_rng); type_register_static(&s390_virtio_bridge_info); } diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index b857413..c0f2646 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1095,7 +1095,9 @@ static void virtio_ccw_register(void) type_register_static(&virtio_ccw_net); type_register_static(&virtio_ccw_balloon); type_register_static(&virtio_ccw_scsi); +#ifdef CONFIG_VHOST_SCSI type_register_static(&vhost_ccw_scsi); +#endif type_register_static(&virtio_ccw_rng); type_register_static(&virtual_css_bridge_info); } diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 04ba1b9..121a5f8 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -101,6 +101,7 @@ typedef struct VirtIOSCSICcw { VirtIOSCSI vdev; } VirtIOSCSICcw; +#ifdef CONFIG_VHOST_SCSI /* vhost-scsi-ccw */ #define TYPE_VHOST_SCSI_CCW "vhost-scsi-ccw" @@ -111,6 +112,7 @@ typedef struct VHostSCSICcw { VirtioCcwDevice parent_obj; VHostSCSI vdev; } VHostSCSICcw; +#endif /* virtio-blk-ccw */ |