From patchwork Mon Feb 18 22:22:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [8/8] virtio-blk: fill in the feature table Date: Mon, 18 Feb 2013 12:22:45 -0000 From: Jesse Larrew X-Patchwork-Id: 221560 Message-Id: <1361226165-19030-9-git-send-email-jlarrew@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, Jesse Larrew Fill in the feature table with the last field of struct virtio_blk_config at the time that the feature flag was introduced. The table was constructed by searching through the git history. Signed-off-by: Jesse Larrew --- hw/virtio-blk.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 788a4c7..47c57d8 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -26,8 +26,26 @@ #endif static VirtIOFeature feature_sizes[] = { - {.flags = 0xffffffff, /* dummy table -- all features included */ - .end = sizeof(struct virtio_blk_config)}, + {.flags = 1 << VIRTIO_BLK_F_BARRIER, + .end = endof(struct virtio_blk_config, sectors)}, + {.flags = 1 << VIRTIO_BLK_F_SIZE_MAX, + .end = endof(struct virtio_blk_config, sectors)}, + {.flags = 1 << VIRTIO_BLK_F_SEG_MAX, + .end = endof(struct virtio_blk_config, sectors)}, + {.flags = 1 << VIRTIO_BLK_F_GEOMETRY, + .end = endof(struct virtio_blk_config, sectors)}, + {.flags = 1 << VIRTIO_BLK_F_RO, + .end = endof(struct virtio_blk_config, sectors)}, + {.flags = 1 << VIRTIO_BLK_F_BLK_SIZE, + .end = endof(struct virtio_blk_config, sectors)}, + {.flags = 1 << VIRTIO_BLK_F_SCSI, + .end = endof(struct virtio_blk_config, sectors)}, + {.flags = 1 << VIRTIO_BLK_F_WCE, + .end = endof(struct virtio_blk_config, blk_size)}, + {.flags = 1 << VIRTIO_BLK_F_TOPOLOGY, + .end = endof(struct virtio_blk_config, opt_io_size)}, + {.flags = 1 << VIRTIO_BLK_F_CONFIG_WCE, + .end = endof(struct virtio_blk_config, wce)}, {} };