diff options
| author | Anthony Liguori | 2013-03-22 19:05:50 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2013-03-22 19:05:50 +0100 |
| commit | f9308207040dc4a1484cee459bedaec03645b935 (patch) | |
| tree | 3656182f69f8b0afdc346c311d07ffa446ce0508 | |
| parent | microblaze: Ignore non-cpu accesses to unmapped areas (diff) | |
| parent | virtio-ccw, s390-virtio: Use generic virtio-blk macro. (diff) | |
| download | qemu-f9308207040dc4a1484cee459bedaec03645b935.tar.gz qemu-f9308207040dc4a1484cee459bedaec03645b935.tar.xz qemu-f9308207040dc4a1484cee459bedaec03645b935.zip | |
Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging
# By Cornelia Huck
# Via Cornelia Huck
* cohuck/virtio-ccw-upstr:
virtio-ccw, s390-virtio: Use generic virtio-blk macro.
s390-virtio, virtio-ccw: Add config_wce for virtio-blk.
virtio-ccw: Add missing blk chs properties.
| -rw-r--r-- | hw/s390x/s390-virtio-bus.c | 7 | ||||
| -rw-r--r-- | hw/s390x/virtio-ccw.c | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 76bc99a45a..c5d5456fa1 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -435,12 +435,7 @@ static const TypeInfo s390_virtio_net = { }; static Property s390_virtio_blk_properties[] = { - DEFINE_BLOCK_PROPERTIES(VirtIOBlkS390, blk.conf), - DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlkS390, blk.conf), - DEFINE_PROP_STRING("serial", VirtIOBlkS390, blk.serial), -#ifdef __linux__ - DEFINE_PROP_BIT("scsi", VirtIOBlkS390, blk.scsi, 0, true), -#endif + DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkS390, blk), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 9688835294..4c44b7e856 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -756,12 +756,8 @@ static const TypeInfo virtio_ccw_net = { static Property virtio_ccw_blk_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), - DEFINE_BLOCK_PROPERTIES(VirtIOBlkCcw, blk.conf), - DEFINE_PROP_STRING("serial", VirtIOBlkCcw, blk.serial), -#ifdef __linux__ - DEFINE_PROP_BIT("scsi", VirtIOBlkCcw, blk.scsi, 0, true), -#endif DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]), + DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkCcw, blk), DEFINE_PROP_END_OF_LIST(), }; |