From patchwork Sun Mar 10 13:47:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mitsyanko X-Patchwork-Id: 226437 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 747C22C030A for ; Mon, 11 Mar 2013 00:50:16 +1100 (EST) Received: from localhost ([::1]:55090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEgdi-00069Q-Oi for incoming@patchwork.ozlabs.org; Sun, 10 Mar 2013 09:50:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEgbm-0003eQ-RD for qemu-devel@nongnu.org; Sun, 10 Mar 2013 09:48:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UEgbj-0001Up-NB for qemu-devel@nongnu.org; Sun, 10 Mar 2013 09:48:14 -0400 Received: from mail-la0-x22e.google.com ([2a00:1450:4010:c03::22e]:41197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEgbj-0001Ue-FH for qemu-devel@nongnu.org; Sun, 10 Mar 2013 09:48:11 -0400 Received: by mail-la0-f46.google.com with SMTP id fq12so3075105lab.33 for ; Sun, 10 Mar 2013 06:48:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=jRsNoJb9LRhiuOmLfDcGfKxXd077Q4FL3NrbTPCW4lM=; b=gMPp66wiXl28lVuTp6QaDHqGzSbu89ZEMPxo7ezuCrOzxt7m0rT5x+DkJ3ZvptLhZT sKv21YUUKIhdbkzMb6kS/Wervc18n3HTsuPyo6BvN+PbuFYoEtWFm2CH9i49ECTO4bg1 TYXmGKyK3QoI7H6xMdSENbd6gPIpQAwrHTAEbdoYo52L+8mx3IW4oUG72JiWsNEsv2uk x0jLIsN8cdwHzO7j22SCpHejmB/Z7m1K8RBDF1sI7ewkkpCn6QMYrnRUb2m+qSCDCL4w eddVVFdJOZVrtkZ4MVy5091S6d8oSlHowp2JU7hpmn5Midm/b53p+aVkdm4r/vt4ZThx uDAw== X-Received: by 10.112.14.40 with SMTP id m8mr3334870lbc.88.1362923290416; Sun, 10 Mar 2013 06:48:10 -0700 (PDT) Received: from localhost ([79.164.43.133]) by mx.google.com with ESMTPS id fz16sm5647664lab.5.2013.03.10.06.48.08 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 10 Mar 2013 06:48:09 -0700 (PDT) From: Igor Mitsyanko To: qemu-devel@nongnu.org Date: Sun, 10 Mar 2013 17:47:58 +0400 Message-Id: <1362923278-4080-4-git-send-email-i.mitsyanko@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362923278-4080-1-git-send-email-i.mitsyanko@gmail.com> References: <1362923278-4080-1-git-send-email-i.mitsyanko@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22e Cc: peter.maydell@linaro.org, i.mitsyanko@gmail.com, andrew@openedhand.com, michael@walle.cc, paul@codesourcery.com, anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH 3/3] hw/onenand.c: fix migration of dynamically allocated buffer "otp" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org VMSTATE_BUFFER_UNSAFE should be used for buffers inlined in device state, not for buffers allocated dynamically. Change to VMSTATE_BUFFER_POINTER_UNSAFE macro, which will do migration right. Signed-off-by: Igor Mitsyanko --- hw/onenand.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/onenand.c b/hw/onenand.c index 00a8738..12ccb67f 100644 --- a/hw/onenand.c +++ b/hw/onenand.c @@ -185,7 +185,8 @@ static const VMStateDescription vmstate_onenand = { VMSTATE_UINT8(ecc.cp, OneNANDState), VMSTATE_UINT16_ARRAY(ecc.lp, OneNANDState, 2), VMSTATE_UINT16(ecc.count, OneNANDState), - VMSTATE_BUFFER_UNSAFE(otp, OneNANDState, 0, ((64 + 2) << PAGE_SHIFT)), + VMSTATE_BUFFER_POINTER_UNSAFE(otp, OneNANDState, 0, + ((64 + 2) << PAGE_SHIFT)), VMSTATE_END_OF_LIST() } };