From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0A9-00089B-8S for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX0A2-0000DX-W4 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0A2-0000DP-NC for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:50 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s373NolG027387 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:23:50 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:21:39 +0200 Message-Id: <1396840915-10384-82-git-send-email-quintela@redhat.com> In-Reply-To: <1396840915-10384-1-git-send-email-quintela@redhat.com> References: <1396840915-10384-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 81/97] vmstate: version_id is gone from fields List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org And after all this work, fields don't have version_id anymore. Signed-off-by: Juan Quintela --- include/migration/vmstate.h | 1 - vmstate.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 12020d9..84533eb 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -112,7 +112,6 @@ typedef struct { const VMStateInfo *info; enum VMStateFlags flags; const VMStateDescription *vmsd; - int version_id; bool (*field_exists)(void *opaque, int version_id); } VMStateField; diff --git a/vmstate.c b/vmstate.c index ce197d2..ca6691b 100644 --- a/vmstate.c +++ b/vmstate.c @@ -74,10 +74,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, } } while (field->name) { - if ((field->field_exists && - field->field_exists(opaque, version_id)) || - (!field->field_exists && - field->version_id <= version_id)) { + if (!field->field_exists || field->field_exists(opaque, version_id)) { void *base_addr = vmstate_base_addr(opaque, field); int i, n_elems = vmstate_n_elems(opaque, field); int size = vmstate_size(opaque, field); -- 1.9.0