From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmp44-0005cp-D7 for qemu-devel@nongnu.org; Fri, 29 Jul 2011 11:33:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qmp43-0001G2-Ii for qemu-devel@nongnu.org; Fri, 29 Jul 2011 11:33:28 -0400 Received: from mail-gx0-f173.google.com ([209.85.161.173]:48867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmp43-0001Cq-Fs for qemu-devel@nongnu.org; Fri, 29 Jul 2011 11:33:27 -0400 Received: by mail-gx0-f173.google.com with SMTP id 26so3117836gxk.4 for ; Fri, 29 Jul 2011 08:33:27 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 29 Jul 2011 17:33:05 +0200 Message-Id: <1311953585-16021-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1311953585-16021-1-git-send-email-pbonzini@redhat.com> References: <1311953585-16021-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 0.15 4/4] Partially revert "savevm: fix corruption in vmstate_subsection_load()." List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This reverts the additional check in commit eb60260d (but not the assertions). The new format does not require the check, and with the old format it traded one kind of bogus failure for a different kind of silent failure. Signed-off-by: Paolo Bonzini --- savevm.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/savevm.c b/savevm.c index 197af4b..c849914 100644 --- a/savevm.c +++ b/savevm.c @@ -1687,10 +1687,6 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, { const VMStateSubsection *sub = vmsd->subsections; - if (!sub || !sub->needed) { - return 0; - } - while (qemu_peek_byte(f) == QEMU_VM_SUBSECTION) { char idstr[256]; int ret; -- 1.7.6