From patchwork Mon Oct 19 18:42:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 36399 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AD62BB7B72 for ; Tue, 20 Oct 2009 05:57:52 +1100 (EST) Received: from localhost ([127.0.0.1]:60681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MzxQT-0003cy-PD for incoming@patchwork.ozlabs.org; Mon, 19 Oct 2009 14:57:49 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MzxD3-00066i-1I for qemu-devel@nongnu.org; Mon, 19 Oct 2009 14:43:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MzxCx-00062n-PT for qemu-devel@nongnu.org; Mon, 19 Oct 2009 14:43:55 -0400 Received: from [199.232.76.173] (port=49041 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MzxCx-00062b-Cc for qemu-devel@nongnu.org; Mon, 19 Oct 2009 14:43:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15871) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MzxCw-0006JJ-SF for qemu-devel@nongnu.org; Mon, 19 Oct 2009 14:43:51 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9JIhoEw011286 for ; Mon, 19 Oct 2009 14:43:50 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9JIhcC1012656; Mon, 19 Oct 2009 14:43:49 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 19 Oct 2009 20:42:53 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 08/25] vmstate: factor vmstate_offset_pointer 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 Signed-off-by: Juan Quintela --- hw/hw.h | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/hw.h b/hw/hw.h index d1395e9..a331844 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -342,6 +342,10 @@ extern const VMStateInfo vmstate_info_buffer; (offsetof(_state, _field) + \ type_check(_type, typeof_field(_state, _field))) +#define vmstate_offset_pointer(_state, _field, _type) \ + (offsetof(_state, _field) + \ + type_check_pointer(_type, typeof_field(_state, _field))) + #define VMSTATE_SINGLE(_field, _state, _version, _info, _type) { \ .name = (stringify(_field)), \ .version_id = (_version), \ @@ -398,8 +402,7 @@ extern const VMStateInfo vmstate_info_buffer; .info = &(_info), \ .size = sizeof(_type), \ .flags = VMS_VARRAY_INT32|VMS_POINTER, \ - .offset = offsetof(_state, _field) \ - + type_check_pointer(_type,typeof_field(_state, _field)) \ + .offset = vmstate_offset_pointer(_state, _field, _type), \ } #define VMSTATE_STRUCT(_field, _state, _version, _vmsd, _type) { \