From patchwork Tue Aug 10 09:22:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TeLeMan X-Patchwork-Id: 61366 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]) by ozlabs.org (Postfix) with ESMTP id B84F7B7101 for ; Tue, 10 Aug 2010 19:29:37 +1000 (EST) Received: from localhost ([127.0.0.1]:54445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oil3l-0001hs-HK for incoming@patchwork.ozlabs.org; Tue, 10 Aug 2010 05:23:49 -0400 Received: from [140.186.70.92] (port=44606 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oil2E-0001Uc-VZ for qemu-devel@nongnu.org; Tue, 10 Aug 2010 05:22:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oil2D-0007cV-MH for qemu-devel@nongnu.org; Tue, 10 Aug 2010 05:22:14 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:45092) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oil2D-0007cF-K1 for qemu-devel@nongnu.org; Tue, 10 Aug 2010 05:22:13 -0400 Received: by vws19 with SMTP id 19so7704977vws.4 for ; Tue, 10 Aug 2010 02:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:content-type; bh=5yRp4GjD/IQyTArCPi+t5GkIweZ/NCvrB90TP/wZV28=; b=Z6jTbku76dO3BpD5Sf0HzBnJ1h5mFVDn9pPcj2P3qEXOlcX1B9Z07s88kMF2NbtTWM xmzyVtKLaM2EGJ8hBZKlzqrU4LIvHH4jo/ulcOUN0pzpAXck92qfWVy5vgI/Fzpk1lRG oNLW93MkOSGD7xxYOI1xfJmfu16brwlsjCRos= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=Je1f6hRfBevzdSXyyhXZm/EDliDcU3XwMk9aH5txq1nj7+1BHaiDtRpEQAGj/SjPMl v7PaOrc95eHcNUOu7e4mnLHN/Iu7L2evR6SrK5NlNwgbamwfBT/Bvhplbl/VGRVjPb6u hCLMW2eets/qJlU3ytMmCluTJcBl04zEXZmKk= MIME-Version: 1.0 Received: by 10.220.129.73 with SMTP id n9mr10353882vcs.191.1281432131336; Tue, 10 Aug 2010 02:22:11 -0700 (PDT) Received: by 10.220.40.205 with HTTP; Tue, 10 Aug 2010 02:22:11 -0700 (PDT) Date: Tue, 10 Aug 2010 17:22:11 +0800 Message-ID: From: TeLeMan To: Juan Quintela , qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [Qemu-devel] [PATCH] vmstate: fix vmstate_load_state for subsections 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 If one vmstate includes subsections and its last field flag is VMS_STRUCT, vmstate_load_state will be always failed when the subsections exist. This fix is not perfect because if the last field includes subsections too, vmstate_load_state will maybe be failed when not all of the subsections exist. I think vmstate subsections needs to be redesigned. Signed-off-by: TeLeMan --- savevm.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) return vmsd->post_load(opaque, version_id); diff --git a/savevm.c b/savevm.c index 2082b8c..feca8fa 100644 --- a/savevm.c +++ b/savevm.c @@ -1286,9 +1286,11 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, } field++; } - ret = vmstate_subsection_load(f, vmsd, opaque); - if (ret != 0) { - return ret; + if (vmsd->subsections) { + ret = vmstate_subsection_load(f, vmsd, opaque); + if (ret != 0) { + return ret; + } } if (vmsd->post_load) {