[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH] Fix compilation without CONFIG_VHOST_SCSI
From: |
Ed Maste |
Subject: |
[Qemu-trivial] [PATCH] Fix compilation without CONFIG_VHOST_SCSI |
Date: |
Thu, 25 Apr 2013 13:38:28 -0400 |
Signed-off-by: Ed Maste <address@hidden>
---
hw/s390x/s390-virtio-bus.c | 2 ++
hw/s390x/virtio-ccw.c | 2 ++
hw/s390x/virtio-ccw.h | 2 ++
3 files changed, 6 insertions(+)
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 56e4872..86b1477 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -1089,7 +1089,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 */
--
1.7.11.5
- [Qemu-trivial] [PATCH] Fix compilation without CONFIG_VHOST_SCSI,
Ed Maste <=