david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio-ccw, s390-virtio: Use generic virtio-blk macro.

Browse Source 
Now that virtio-ccw and s390-virtio define all common properties
for virtio-blk, we can switch to using the generic
DEFINE_VIRTIO_BLK_PROPERTIES macro.

CC: Alexander Graf <agraf@suse.de>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Cornelia Huck 2013-03-20 08:27:50 +01:00
parent da0a58b93c
commit fe42d7fb0f
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,13 +435,7 @@ static const TypeInfo s390_virtio_net = {
}; };
static Property s390_virtio_blk_properties[] = { static Property s390_virtio_blk_properties[] = {
DEFINE_BLOCK_PROPERTIES(VirtIOBlkS390, blk.conf), DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkS390, blk),
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_PROP_BIT("config-wce", VirtIOBlkS390, blk.config_wce, 0, true),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

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

@ -756,14 +756,8 @@ static const TypeInfo virtio_ccw_net = {
static Property virtio_ccw_blk_properties[] = { static Property virtio_ccw_blk_properties[] = {
DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
DEFINE_BLOCK_PROPERTIES(VirtIOBlkCcw, blk.conf),
DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlkCcw, blk.conf),
DEFINE_PROP_STRING("serial", VirtIOBlkCcw, blk.serial),
#ifdef __linux__
DEFINE_PROP_BIT("scsi", VirtIOBlkCcw, blk.scsi, 0, true),
#endif
DEFINE_PROP_BIT("config-wce", VirtIOBlkCcw, blk.config_wce, 0, true),
DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]), DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]),
DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkCcw, blk),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };