diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-14 15:59:24 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-14 15:59:24 +0000 |
| commit | 16abfb36c582aae4ac81e5aac1198ed3081deeba (patch) | |
| tree | 1d4aa920bf5787d8f9bff436987c97c879bb3769 /hw | |
| parent | 7e407466b1efbd65225cc72fe09c0c5ec79df75b (diff) | |
| parent | 42824b4d16da56a50ff4027f6cd22378e0e2666e (diff) | |
| download | qemu-16abfb36c582aae4ac81e5aac1198ed3081deeba.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
Fix a virtio-blk migration regression.
# gpg: Signature made Thu 14 Feb 2019 04:32:55 GMT
# gpg: using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
virtio-blk: set correct config size for the host driver
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/virtio-blk.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 843bb2bec8..cf7f47eaba 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -28,6 +28,10 @@ #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" +/* We don't support discard yet, hide associated config fields. */ +#define VIRTIO_BLK_CFG_SIZE offsetof(struct virtio_blk_config, \ + max_discard_sectors) + static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq, VirtIOBlockReq *req) { @@ -757,7 +761,8 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) blkcfg.alignment_offset = 0; blkcfg.wce = blk_enable_write_cache(s->blk); virtio_stw_p(vdev, &blkcfg.num_queues, s->conf.num_queues); - memcpy(config, &blkcfg, sizeof(struct virtio_blk_config)); + memcpy(config, &blkcfg, VIRTIO_BLK_CFG_SIZE); + QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg)); } static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config) @@ -765,7 +770,8 @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config) VirtIOBlock *s = VIRTIO_BLK(vdev); struct virtio_blk_config blkcfg; - memcpy(&blkcfg, config, sizeof(blkcfg)); + memcpy(&blkcfg, config, VIRTIO_BLK_CFG_SIZE); + QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg)); aio_context_acquire(blk_get_aio_context(s->blk)); blk_set_enable_write_cache(s->blk, blkcfg.wce != 0); @@ -948,8 +954,7 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp) return; } - virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, - sizeof(struct virtio_blk_config)); + virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, VIRTIO_BLK_CFG_SIZE); s->blk = conf->conf.blk; s->rq = NULL; |