On Tue, 7 Jul 2015 13:47:23 +0200
Christian Borntraeger <[email protected]> wrote:
> commit 213941d73b ("virtio-ccw: migrate ->revision") broke
> migration:
> 2015-07-07T11:22:55.570968Z qemu-system-s390x: VQ 39 address 0x0 inconsistent
> with Host index 0x100
> 2015-07-07T11:22:55.571008Z qemu-system-s390x: error while loading state for
> instance 0x0 of
>
> If thinint support is active, the config_load function returns early.
> Make sure to load the revision all the time.
>
> Signed-off-by: Christian Borntraeger <[email protected]>
> Fixes: 213941d73b ("virtio-ccw: migrate ->revision")
Hmpf, somebody was sloppy with testing... applied to my s390-next tree.
> ---
> hw/s390x/virtio-ccw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index d631337..cc74c5c 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -1508,12 +1508,12 @@ static int virtio_ccw_load_config(DeviceState *d,
> QEMUFile *f)
> qemu_get_be16s(f, &vdev->config_vector);
> dev->routes.adapter.ind_offset = qemu_get_be64(f);
> dev->thinint_isc = qemu_get_byte(f);
> + dev->revision = qemu_get_be32(f);
> if (s->thinint_active) {
> return css_register_io_adapter(CSS_IO_ADAPTER_VIRTIO,
> dev->thinint_isc, true, false,
> &dev->routes.adapter.adapter_id);
> }
> - dev->revision = qemu_get_be32(f);
>
> return 0;
> }
