From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mh2aI-0000gn-Qb for qemu-devel@nongnu.org; Fri, 28 Aug 2009 10:37:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mh2aC-0000WZ-QQ for qemu-devel@nongnu.org; Fri, 28 Aug 2009 10:37:46 -0400 Received: from [199.232.76.173] (port=44491 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh2aC-0000WO-NK for qemu-devel@nongnu.org; Fri, 28 Aug 2009 10:37:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30665) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mh2aC-0001h5-5j for qemu-devel@nongnu.org; Fri, 28 Aug 2009 10:37:40 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7SEbdOD004217 for ; Fri, 28 Aug 2009 10:37:39 -0400 From: Gerd Hoffmann Date: Fri, 28 Aug 2009 16:37:35 +0200 Message-Id: <1251470255-1753-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [STABLE PATCH] ide: fix migration bug List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann ide_cmd_write() sets cmd field for both master and slave interface. Do the same when loading state. Signed-off-by: Gerd Hoffmann --- hw/ide.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/ide.c b/hw/ide.c index 1e38ae3..99d8016 100644 --- a/hw/ide.c +++ b/hw/ide.c @@ -3271,6 +3271,7 @@ static int pci_ide_load(QEMUFile* f, void *opaque, int version_id) qemu_get_8s(f, &s->cmd); qemu_get_8s(f, &drive1_selected); s->cur_drive = &d->ide_if[i * 2 + (drive1_selected != 0)]; + s[1].cmd = s[0].cmd; } /* per IDE drive data */ @@ -3755,6 +3756,7 @@ static int pmac_ide_load(QEMUFile *f, void *opaque, int version_id) qemu_get_8s(f, &s->cmd); qemu_get_8s(f, &drive1_selected); s->cur_drive = &s[(drive1_selected != 0)]; + s[1].cmd = s[0].cmd; /* per IDE drive data */ for(i = 0; i < 2; i++) { @@ -4196,6 +4198,7 @@ static int md_load(QEMUFile *f, void *opaque, int version_id) qemu_get_8s(f, &s->ide->cmd); qemu_get_8s(f, &drive1_selected); s->ide->cur_drive = &s->ide[(drive1_selected != 0)]; + s->ide[1].cmd = s->ide[0].cmd; for (i = 0; i < 2; i ++) ide_load(f, &s->ide[i], version_id); -- 1.6.2.5