openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virtio: Fix compilation without CONFIG_VHOST_SCSI 

Signed-off-by: Ed Maste <emaste@freebsd.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Ed Maste 2013-04-25 13:38:28 -04:00 committed by Stefan Hajnoczi
parent 48c75f484d
commit b702d2aebe
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/s390-virtio-bus.c
View File

@ -691,7 +691,9 @@ static void s390_virtio_register_types(void)
type_register_static(&s390_virtio_blk); type_register_static(&s390_virtio_blk);
type_register_static(&s390_virtio_net); type_register_static(&s390_virtio_net);
type_register_static(&s390_virtio_scsi); type_register_static(&s390_virtio_scsi);
#ifdef CONFIG_VHOST_SCSI
type_register_static(&s390_vhost_scsi); type_register_static(&s390_vhost_scsi);
#endif
type_register_static(&s390_virtio_rng); type_register_static(&s390_virtio_rng);
type_register_static(&s390_virtio_bridge_info); type_register_static(&s390_virtio_bridge_info);
} }

2
hw/s390x/virtio-ccw.c
View File

@ -1095,7 +1095,9 @@ static void virtio_ccw_register(void)
type_register_static(&virtio_ccw_net); type_register_static(&virtio_ccw_net);
type_register_static(&virtio_ccw_balloon); type_register_static(&virtio_ccw_balloon);
type_register_static(&virtio_ccw_scsi); type_register_static(&virtio_ccw_scsi);
#ifdef CONFIG_VHOST_SCSI
type_register_static(&vhost_ccw_scsi); type_register_static(&vhost_ccw_scsi);
#endif
type_register_static(&virtio_ccw_rng); type_register_static(&virtio_ccw_rng);
type_register_static(&virtual_css_bridge_info); type_register_static(&virtual_css_bridge_info);
} }

2
hw/s390x/virtio-ccw.h
View File

@ -101,6 +101,7 @@ typedef struct VirtIOSCSICcw {
VirtIOSCSI vdev; VirtIOSCSI vdev;
} VirtIOSCSICcw; } VirtIOSCSICcw;
#ifdef CONFIG_VHOST_SCSI
/* vhost-scsi-ccw */ /* vhost-scsi-ccw */
#define TYPE_VHOST_SCSI_CCW "vhost-scsi-ccw" #define TYPE_VHOST_SCSI_CCW "vhost-scsi-ccw"
@ -111,6 +112,7 @@ typedef struct VHostSCSICcw {
VirtioCcwDevice parent_obj; VirtioCcwDevice parent_obj;
VHostSCSI vdev; VHostSCSI vdev;
} VHostSCSICcw; } VHostSCSICcw;
#endif
/* virtio-blk-ccw */ /* virtio-blk-ccw */