From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRPWz-0008Ft-C2 for qemu-devel@nongnu.org; Fri, 27 Feb 2015 13:21:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRPWu-0001t9-Ir for qemu-devel@nongnu.org; Fri, 27 Feb 2015 13:20:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRPWu-0001t0-5l for qemu-devel@nongnu.org; Fri, 27 Feb 2015 13:20:52 -0500 From: Stefan Hajnoczi Date: Fri, 27 Feb 2015 18:18:43 +0000 Message-Id: <1425061147-1411-46-git-send-email-stefanha@redhat.com> In-Reply-To: <1425061147-1411-1-git-send-email-stefanha@redhat.com> References: <1425061147-1411-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 45/69] ide: migrate initial request state via IDEBus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , John Snow , Stefan Hajnoczi , Paolo Bonzini From: Paolo Bonzini 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 --- hw/ide/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 71ec1e7..b62a94a 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() } }; -- 2.1.0