From: Paolo Bonzini Date: Mon, 23 Feb 2015 16:17:59 +0000 (-0500) Subject: ide: migrate initial request state via IDEBus X-Git-Tag: v2.3.0-rc0~31^2~28 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d12b9ff2a4e21587e5b180008c88a0e6e1ec8ac5;p=users%2Fdwmw2%2Fqemu.git ide: migrate initial request state via IDEBus This only breaks backwards migration compatibility if the bus is in an error state. It is in principle possible to avoid this by making two subsections (one for version 1, and one for version 2, but with the same name) with different "_needed" callbacks. The v1 callback would return true if error_status != 0 and the bus is PATA; the v2 callback would return true if error_status != 0 and the bus is AHCI. Forward migration keeps working. Signed-off-by: Paolo Bonzini Signed-off-by: John Snow Message-id: 1424708286-16483-11-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- diff --git a/hw/ide/core.c b/hw/ide/core.c index 71ec1e76dc..b62a94aac2 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2643,10 +2643,13 @@ const VMStateDescription vmstate_ide_drive = { static const VMStateDescription vmstate_ide_error_status = { .name ="ide_bus/error", - .version_id = 1, + .version_id = 2, .minimum_version_id = 1, .fields = (VMStateField[]) { VMSTATE_INT32(error_status, IDEBus), + VMSTATE_INT64_V(retry_sector_num, IDEBus, 2), + VMSTATE_UINT32_V(retry_nsector, IDEBus, 2), + VMSTATE_UINT8_V(retry_unit, IDEBus, 2), VMSTATE_END_OF_LIST() } };