From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQIk7-0000SV-C6 for qemu-devel@nongnu.org; Wed, 19 Mar 2014 11:49:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQIk1-0001PK-7d for qemu-devel@nongnu.org; Wed, 19 Mar 2014 11:49:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQIk0-0001Oz-W5 for qemu-devel@nongnu.org; Wed, 19 Mar 2014 11:49:17 -0400 From: Stefan Hajnoczi Date: Wed, 19 Mar 2014 16:48:55 +0100 Message-Id: <1395244138-8834-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1395244138-8834-1-git-send-email-stefanha@redhat.com> References: <1395244138-8834-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [RFC 2/5] virtio: add child alias properties for virtio-blk List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Andreas Faerber , Stefan Hajnoczi , fred.konrad@greensocs.com Now that qdev child alias properties exist, define aliases for virtio-blk properties. The aliases will replace the duplicated properties that current live in virtio-blk-pci, virtio-blk-ccw, and friends. Signed-off-by: Stefan Hajnoczi --- include/hw/block/block.h | 14 ++++++++++++++ include/hw/virtio/virtio-blk.h | 17 +++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/include/hw/block/block.h b/include/hw/block/block.h index 7c3d6c8..702f1eb 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -52,11 +52,25 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) DEFINE_PROP_UINT32("discard_granularity", _state, \ _conf.discard_granularity, -1) +#define DEFINE_BLOCK_CHILD_ALIASES(_state, _field) \ + DEFINE_PROP_CHILD_ALIAS("drive", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("logical_block_size", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("physical_block_size", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("min_io_size", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("opt_io_size", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("bootindex", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("discard_granularity", _state, _field) + #define DEFINE_BLOCK_CHS_PROPERTIES(_state, _conf) \ DEFINE_PROP_UINT32("cyls", _state, _conf.cyls, 0), \ DEFINE_PROP_UINT32("heads", _state, _conf.heads, 0), \ DEFINE_PROP_UINT32("secs", _state, _conf.secs, 0) +#define DEFINE_BLOCK_CHS_CHILD_ALIASES(_state, _field) \ + DEFINE_PROP_CHILD_ALIAS("cyls", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("heads", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("secs", _state, _field) + /* Configuration helpers */ void blkconf_serial(BlockConf *conf, char **serial); diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index e4c41ff..5095ff4 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -153,6 +153,23 @@ typedef struct VirtIOBlock { DEFINE_PROP_IOTHREAD("x-iothread", _state, _field.iothread) #endif /* __linux__ */ +#ifdef __linux__ +#define DEFINE_VIRTIO_BLK_CHILD_ALIASES(_state, _field) \ + DEFINE_BLOCK_CHILD_ALIASES(_state, _field), \ + DEFINE_BLOCK_CHS_CHILD_ALIASES(_state, _field), \ + DEFINE_PROP_CHILD_ALIAS("serial", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("config-wce", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("scsi", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("x-iothread", _state, _field) +#else +#define DEFINE_VIRTIO_BLK_CHILD_ALIASES(_state, _field) \ + DEFINE_BLOCK_CHILD_ALIASES(_state, _field), \ + DEFINE_BLOCK_CHS_CHILD_ALIASES(_state, _field), \ + DEFINE_PROP_CHILD_ALIAS("serial", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("config-wce", _state, _field), \ + DEFINE_PROP_CHILD_ALIAS("x-iothread", _state, _field) +#endif /* __linux__ */ + void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk); #endif -- 1.8.5.3