From patchwork Tue Mar 12 03:06:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 226749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4EDCC2C029F for ; Tue, 12 Mar 2013 14:07:05 +1100 (EST) Received: from localhost ([::1]:43673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFFYN-0004sq-CJ for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2013 23:07:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFFXj-0004ct-GK for qemu-devel@nongnu.org; Mon, 11 Mar 2013 23:06:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFFXY-0000SM-TY for qemu-devel@nongnu.org; Mon, 11 Mar 2013 23:06:23 -0400 Received: from ozlabs.org ([203.10.76.45]:49534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFFXY-0000SC-In for qemu-devel@nongnu.org; Mon, 11 Mar 2013 23:06:12 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id A873F2C02B8; Tue, 12 Mar 2013 14:06:09 +1100 (EST) From: David Gibson To: aliguori@us.ibm.com, quintela@redhat.com Date: Tue, 12 Mar 2013 14:06:04 +1100 Message-Id: <1363057565-23671-6-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363057565-23671-1-git-send-email-david@gibson.dropbear.id.au> References: <1363057565-23671-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 203.10.76.45 Cc: David Gibson , qemu-devel@nongnu.org, agraf@suse.de Subject: [Qemu-devel] [PATCH 5/6] savevm: Fix bugs in the VMSTATE_VBUFFER_MULTIPLY definition 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 The VMSTATE_BUFFER_MULTIPLY macro is misnamed - it actually specifies a variably sized buffer with VMS_VBUFFER, so should be named VMSTATE_VBUFFER_MULTIPLY. This patch fixes this (the macro had no current users under either name). In addition, unlike the other VMSTATE_VBUFFER variants, this macro did not specify VMS_POINTER. This patch fixes this bug as well. Signed-off-by: David Gibson --- include/migration/vmstate.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index fe39cd9..249e76f 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -389,14 +389,14 @@ extern const VMStateInfo vmstate_info_bitmap; .offset = vmstate_offset_buffer(_state, _field) + _start, \ } -#define VMSTATE_BUFFER_MULTIPLY(_field, _state, _version, _test, _start, _field_size, _multiply) { \ +#define VMSTATE_VBUFFER_MULTIPLY(_field, _state, _version, _test, _start, _field_size, _multiply) { \ .name = (stringify(_field)), \ .version_id = (_version), \ .field_exists = (_test), \ .size_offset = vmstate_offset_value(_state, _field_size, uint32_t),\ .size = (_multiply), \ .info = &vmstate_info_buffer, \ - .flags = VMS_VBUFFER|VMS_MULTIPLY, \ + .flags = VMS_VBUFFER|VMS_POINTER|VMS_MULTIPLY, \ .offset = offsetof(_state, _field), \ .start = (_start), \ }