diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-26 08:32:13 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-26 08:32:13 -0500 |
| commit | 186b027d98a3c91c1c6dee631a027d5b2a0fce25 (patch) | |
| tree | 81d11194e1f5c5e2bce14a807d0b01876c0a3e53 /hw/s390x/virtio-ccw.h | |
| parent | a1bff71c56f2d1048244c829b63797940dd4ba0e (diff) | |
| parent | 6ea8430d98c48eb67e47d14dfe8c0fdb86413555 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By Ed Maste (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
bsd-user: Track change in FreeBSD SYSCTL(9) types
virtio: Fix compilation without CONFIG_VHOST_SCSI
qemu-doc: Option -ignore-environment removed.
s390x: use CONFIG_INT128 to detect __uint128_t
linux-user: fix compile error due to stray colon at end of #ifdef line
Message-id: 1366975563-16216-1-git-send-email-stefanha@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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 04ba1b99ee..121a5f8c4a 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 */ |