openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pull request 

Fix a virtio-blk migration regression.
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJcZO93AAoJEJykq7OBq3PIQygH/0/KvpFrVZK0a73yZ361sNuY
 w6N3OCo2TUMRBzmaTp31njJWg48s9kiyvtjcsALBsN53paGGfN+7W6UZNpaNWfGM
 Enzpt2kks+wlsqlVoYaCwqQuoJuodWSNVs6im3TCxECwdSXr39SkzsudjByoDx7j
 wkJ28K06fzppaSxx0lJf6B/lMBnL/OhBrSuqJor6EGGJ1Q7Zq0z5W0SMfM4+g7k4
 iqb35Z8SGh/Pbragg7gMMl4M1uh1s9CduU8nStaXVG8ifwd8Cu760Iv4DDrXAayu
 YKF8gZkJ2Jh4lhNl2tFC6qTaiPjwI+nzLmKp/r4M1ReSJ6JyzKhMkLsrq8epHOA=
 =Lxlz
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2019-02-14 15:59:24 +00:00
parent 7e407466b1 42824b4d16
commit 16abfb36c5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/block/virtio-blk.c
View File

@ -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;