[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] s390/virtio-ccw: Fix migration
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PATCH] s390/virtio-ccw: Fix migration |
Date: |
Tue, 7 Jul 2015 13:47:23 +0200 |
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 <address@hidden>
Fixes: 213941d73b ("virtio-ccw: migrate ->revision")
---
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;
}
--
2.3.0
- [Qemu-devel] [PULL v3 for-2.4 00/11] s390x patches for 2.4, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 01/11] virtio-ccw: complete handling of guest-initiated resets, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 02/11] css: mss/mcss-e vs. migration, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 03/11] s390-ccw.img: Consume service interrupts, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 04/11] s390-ccw.img: update, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 08/11] virtio-ccw: migrate ->revision, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 07/11] s390x/virtio-ccw: support virtio-1 set_vq format, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 05/11] s390x/css: Add a callback for when subchannel gets disabled, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 06/11] s390x/virtio-ccw: add virtio set-revision call, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 09/11] s390x/ipl: Fix boot if no bootindex was specified, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 10/11] s390x/gdb: synchronize cpu state after modifying acrs, Cornelia Huck, 2015/07/02
- [Qemu-devel] [PULL v3 for-2.4 11/11] s390x/migration: Introduce 2.4 machine, Cornelia Huck, 2015/07/02
- Re: [Qemu-devel] [PULL v3 for-2.4 00/11] s390x patches for 2.4, Peter Maydell, 2015/07/02