Commit 6abee260 authored by Roman Kagan's avatar Roman Kagan Committed by Kevin Wolf
Browse files

virtio-blk: store opt_io_size with correct size 



The width of opt_io_size in virtio_blk_config is 32bit.  However, it's
written with virtio_stw_p; this may result in value truncation, and on
big-endian systems with legacy virtio in completely bogus readings in
the guest.

Use the appropriate accessor to store it.

Signed-off-by: default avatarRoman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-Id: <20200528225516.1676602-2-rvkagan@yandex-team.ru>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent d54f36ea

hw/block/virtio-blk.c

+1 −1
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) 
    virtio_stw_p(vdev, &blkcfg.geometry.cylinders, conf->cyls);

    virtio_stl_p(vdev, &blkcfg.blk_size, blk_size);

    virtio_stw_p(vdev, &blkcfg.min_io_size, conf->min_io_size / blk_size);

    virtio_stw_p(vdev, &blkcfg.opt_io_size, conf->opt_io_size / blk_size);

    virtio_stl_p(vdev, &blkcfg.opt_io_size, conf->opt_io_size / blk_size);

    blkcfg.geometry.heads = conf->heads;

    /*

     * We must ensure that the block device capacity is a multiple of