From patchwork Mon Apr 7 03:21:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 337371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A98A814008B for ; Mon, 7 Apr 2014 15:22:53 +1000 (EST) Received: from localhost ([::1]:60393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0dA-00019u-N3 for incoming@patchwork.ozlabs.org; Sun, 06 Apr 2014 23:53:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0AT-00004v-I9 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX0AN-0000J3-En for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0AN-0000Ip-4l for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:11 -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 s373OAZi006210 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:24:10 -0400 Received: from trasno.mitica (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s373LuY4020053; Sun, 6 Apr 2014 23:24:09 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 7 Apr 2014 05:21:54 +0200 Message-Id: <1396840915-10384-97-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 96/97] vmstate: Rename VMS_VBUFFER to VMST_VBUFFER_INT32 for consintency 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 Signed-off-by: Juan Quintela --- include/migration/vmstate.h | 6 +++--- vmstate.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 976d83e..145c198 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -96,7 +96,7 @@ enum VMStateFlags { VMS_BUFFER = 0x020, /* static sized buffer */ VMS_ARRAY_OF_POINTER = 0x040, VMS_VARRAY_UINT16 = 0x080, /* Array with size in uint16_t field */ - VMS_VBUFFER = 0x100, /* Buffer with size in int32_t field */ + VMS_VBUFFER_INT32 = 0x100, /* Buffer with size in int32_t field */ VMS_VBUFFER_UINT32 = 0x200, /* Buffer with size in uint32_t field */ VMS_VARRAY_UINT8 = 0x400, /* Array with size in uint8_t field*/ VMS_VARRAY_UINT32 = 0x800, /* Array with size in uint32_t field*/ @@ -436,7 +436,7 @@ extern const VMStateInfo vmstate_info_bitmap; .name = (stringify(_field)), \ .size_offset = vmstate_offset_value(_state, _field_size, int32_t),\ .info = &vmstate_info_buffer, \ - .flags = VMS_VBUFFER|VMS_POINTER, \ + .flags = VMS_VBUFFER_INT32|VMS_POINTER, \ .offset = offsetof(_state, _field), \ } @@ -480,7 +480,7 @@ extern const VMStateInfo vmstate_info_bitmap; .name = (stringify(_field)), \ .size_offset = vmstate_offset_value(_state, _field_size, int32_t),\ .info = &vmstate_info_bitmap, \ - .flags = VMS_VBUFFER|VMS_POINTER, \ + .flags = VMS_VBUFFER_INT32|VMS_POINTER, \ .offset = offsetof(_state, _field), \ } diff --git a/vmstate.c b/vmstate.c index da5c49d..b1ff280 100644 --- a/vmstate.c +++ b/vmstate.c @@ -33,7 +33,7 @@ static int vmstate_size(void *opaque, VMStateField *field) { int size = field->size; - if (field->flags & VMS_VBUFFER) { + if (field->flags & VMS_VBUFFER_INT32) { size = *(int32_t *)(opaque+field->size_offset); } else if (field->flags & VMS_VBUFFER_UINT32) { size = *(uint32_t *)(opaque+field->size_offset);