From patchwork Tue Mar 15 14:53:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 86994 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AE145B7018 for ; Wed, 16 Mar 2011 01:55:00 +1100 (EST) Received: from localhost ([127.0.0.1]:57229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzVeD-000141-1z for incoming@patchwork.ozlabs.org; Tue, 15 Mar 2011 10:54:57 -0400 Received: from [140.186.70.92] (port=60669 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzVcx-0000zi-By for qemu-devel@nongnu.org; Tue, 15 Mar 2011 10:53:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzVct-000394-5K for qemu-devel@nongnu.org; Tue, 15 Mar 2011 10:53:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63123) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzVcs-00038U-S0 for qemu-devel@nongnu.org; Tue, 15 Mar 2011 10:53:35 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2FErX7E019694 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Mar 2011 10:53:33 -0400 Received: from trasno.mitica (ovpn-113-125.phx2.redhat.com [10.3.113.125]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2FErVAr028684; Tue, 15 Mar 2011 10:53:32 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 15 Mar 2011 15:53:25 +0100 Message-Id: <1300200805-13928-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH] Fix migration uint8 arrys handled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org commit 82fa39b75181b730d6d4d09f443bd26bcfcd045c only contains half of the fix. It forgots the save state fix for UINT8 indexes. Anthony, please apply, without this migration using hpet is broken. (only current user). Signed-off-by: Juan Quintela Acked-by: Yoshiaki Tamura --- savevm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/savevm.c b/savevm.c index 60d2f2a..67459a7 100644 --- a/savevm.c +++ b/savevm.c @@ -1395,6 +1395,8 @@ void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, n_elems = *(int32_t *)(opaque+field->num_offset); } else if (field->flags & VMS_VARRAY_UINT16) { n_elems = *(uint16_t *)(opaque+field->num_offset); + } else if (field->flags & VMS_VARRAY_UINT8) { + n_elems = *(uint8_t *)(opaque+field->num_offset); } if (field->flags & VMS_POINTER) { base_addr = *(void **)base_addr + field->start;