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.
This commit is contained in:
commit
f930820704
|
@ -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(),
|
||||
};
|
||||
|
||||
|
|
|
@ -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(),
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue