From patchwork Wed Sep 26 03:21:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 186938 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 9AFAA2C0086 for ; Wed, 26 Sep 2012 13:25:35 +1000 (EST) Received: from localhost ([::1]:60116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGiBi-0001Y6-Of for incoming@patchwork.ozlabs.org; Tue, 25 Sep 2012 23:21:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGiAw-00087A-TE for qemu-devel@nongnu.org; Tue, 25 Sep 2012 23:20:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGiAu-0005ly-Mn for qemu-devel@nongnu.org; Tue, 25 Sep 2012 23:20:38 -0400 Received: from ozlabs.org ([203.10.76.45]:50166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGiAu-0005lT-Bn for qemu-devel@nongnu.org; Tue, 25 Sep 2012 23:20:36 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 7E7DC2C0097; Wed, 26 Sep 2012 13:20:34 +1000 (EST) From: David Gibson To: aliguori@us.ibm.com Date: Wed, 26 Sep 2012 13:21:18 +1000 Message-Id: <1348629678-13182-7-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1348629678-13182-1-git-send-email-david@gibson.dropbear.id.au> References: <1348629678-13182-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 6/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 --- vmstate.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vmstate.h b/vmstate.h index 4b393a0..6bfdb6a 100644 --- a/vmstate.h +++ b/vmstate.h @@ -372,14 +372,14 @@ extern const VMStateInfo vmstate_info_unused_buffer; .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), \ }