diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2014-06-18 17:58:36 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-07-01 09:15:02 +0200 |
| commit | 32a877e4059ad7fd428bdd31d3e954fed72fa21b (patch) | |
| tree | 747407243e34e13a7f0a50dbef75d05a8754a1f4 /hw/block | |
| parent | c5d49db4469dfc0cc7f4c01dfb4ed4e8b96bdbcd (diff) | |
virtio-blk: move qdev properties into virtio-blk.c
There is no need to make DEFINE_VIRTIO_BLK_PROPERTIES() public. Inline
it into virtio-blk.c so it cannot be used by mistake from other source
files.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/virtio-blk.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index f1a667c672..b8d51bb360 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -785,7 +785,17 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp) } static Property virtio_blk_properties[] = { - DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlock, blk), + DEFINE_BLOCK_PROPERTIES(VirtIOBlock, blk.conf), + DEFINE_BLOCK_CHS_PROPERTIES(VirtIOBlock, blk.conf), + DEFINE_PROP_STRING("serial", VirtIOBlock, blk.serial), + DEFINE_PROP_BIT("config-wce", VirtIOBlock, blk.config_wce, 0, true), + DEFINE_PROP_IOTHREAD("x-iothread", VirtIOBlock, blk.iothread), +#ifdef __linux__ + DEFINE_PROP_BIT("scsi", VirtIOBlock, blk.scsi, 0, true), +#endif +#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE + DEFINE_PROP_BIT("x-data-plane", VirtIOBlock, blk.data_plane, 0, false), +#endif DEFINE_PROP_END_OF_LIST(), }; |