ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio fix for 2.4 

Fixes migration in virtio 1 mode.
 We still have a known bug with memory hotplug, it doesn't
 look like we can fix that in time for 2.4.
 
 Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVwiRjAAoJECgfDbjSjVRpps8H/0Qh6JlHLeju9gEgqmreJTuT
 xihAdocwe7tFJkvkn6Lg404DtofIhBhS+hoMtnyXRgtGqrJ/qCk/J5fgTFhxk0Bo
 SUi45eTaR0W/g1L8Fwy4cwh8oc+vaD/Eaa6PXUYLlXdx0m9GkYRN+/QyVhXUJhhG
 90qx59eXfRLI1P0gm1/u+q9aYIwJ3N2dZm4tochVk2FQP9B9ZXKjCC/ux9OTyhmF
 APTrGa519CYheICWEdrimNbLa6+gaMnga+JUaLBypGXB6hE3RbLNzfxMmm2jy4i+
 qR2Nm6gDJ9Dw+OQJ0qw2BDIcQJo7PLrGgDE13IhqXBFliLTjLwxfLaAE9OaAv5s=
 =xygJ
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio fix for 2.4

Fixes migration in virtio 1 mode.
We still have a known bug with memory hotplug, it doesn't
look like we can fix that in time for 2.4.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Wed 05 Aug 2015 15:57:39 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  virtio: fix 1.0 virtqueue migration

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-08-05 16:02:00 +01:00
parent e94867ed5f 74aae7b22b
commit 0175409df4
2 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
hw/virtio/virtio.c
View File

@ -1049,6 +1049,61 @@ static bool virtio_64bit_features_needed(void *opaque)
return (vdev->host_features >> 32) != 0; return (vdev->host_features >> 32) != 0;
} }
static bool virtio_virtqueue_needed(void *opaque)
{
VirtIODevice *vdev = opaque;
return virtio_host_has_feature(vdev, VIRTIO_F_VERSION_1);
}
static void put_virtqueue_state(QEMUFile *f, void *pv, size_t size)
{
VirtIODevice *vdev = pv;
int i;
for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
qemu_put_be64(f, vdev->vq[i].vring.avail);
qemu_put_be64(f, vdev->vq[i].vring.used);
}
}
static int get_virtqueue_state(QEMUFile *f, void *pv, size_t size)
{
VirtIODevice *vdev = pv;
int i;
for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
vdev->vq[i].vring.avail = qemu_get_be64(f);
vdev->vq[i].vring.used = qemu_get_be64(f);
}
return 0;
}
static VMStateInfo vmstate_info_virtqueue = {
.name = "virtqueue_state",
.get = get_virtqueue_state,
.put = put_virtqueue_state,
};
static const VMStateDescription vmstate_virtio_virtqueues = {
.name = "virtio/virtqueues",
.version_id = 1,
.minimum_version_id = 1,
.needed = &virtio_virtqueue_needed,
.fields = (VMStateField[]) {
{
.name = "virtqueues",
.version_id = 0,
.field_exists = NULL,
.size = 0,
.info = &vmstate_info_virtqueue,
.flags = VMS_SINGLE,
.offset = 0,
},
VMSTATE_END_OF_LIST()
}
};
static const VMStateDescription vmstate_virtio_device_endian = { static const VMStateDescription vmstate_virtio_device_endian = {
.name = "virtio/device_endian", .name = "virtio/device_endian",
.version_id = 1, .version_id = 1,
@ -1082,6 +1137,7 @@ static const VMStateDescription vmstate_virtio = {
.subsections = (const VMStateDescription*[]) { .subsections = (const VMStateDescription*[]) {
&vmstate_virtio_device_endian, &vmstate_virtio_device_endian,
&vmstate_virtio_64bit_features, &vmstate_virtio_64bit_features,
&vmstate_virtio_virtqueues,
NULL NULL
} }
}; };

6
include/hw/virtio/virtio.h
View File

@ -272,6 +272,12 @@ static inline bool virtio_has_feature(VirtIODevice *vdev, unsigned int fbit)
return __virtio_has_feature(vdev->guest_features, fbit); return __virtio_has_feature(vdev->guest_features, fbit);
} }
static inline bool virtio_host_has_feature(VirtIODevice *vdev,
unsigned int fbit)
{
return __virtio_has_feature(vdev->host_features, fbit);
}
static inline bool virtio_is_big_endian(VirtIODevice *vdev) static inline bool virtio_is_big_endian(VirtIODevice *vdev)
{ {
if (!virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) { if (!virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) {