From patchwork Wed Mar 23 00:16:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 87980 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 CE4E9B6F77 for ; Wed, 23 Mar 2011 11:26:40 +1100 (EST) Received: from localhost ([127.0.0.1]:42920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2BuI-0001Vb-5O for incoming@patchwork.ozlabs.org; Tue, 22 Mar 2011 20:26:38 -0400 Received: from [140.186.70.92] (port=44164 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2Bkk-0004L0-7n for qemu-devel@nongnu.org; Tue, 22 Mar 2011 20:16:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q2BkU-0003dM-Ct for qemu-devel@nongnu.org; Tue, 22 Mar 2011 20:16:45 -0400 Received: from e4.ny.us.ibm.com ([32.97.182.144]:39833) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q2BkU-0003dI-9G for qemu-devel@nongnu.org; Tue, 22 Mar 2011 20:16:30 -0400 Received: from d01dlp01.pok.ibm.com (d01dlp01.pok.ibm.com [9.56.224.56]) by e4.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p2MNuvDR003610 for ; Tue, 22 Mar 2011 19:56:57 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id EF75B38C8039 for ; Tue, 22 Mar 2011 20:16:24 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2N0GTul383650 for ; Tue, 22 Mar 2011 20:16:29 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2N0GTCJ008509 for ; Tue, 22 Mar 2011 20:16:29 -0400 Received: from localhost.localdomain (sig-9-65-76-198.mts.ibm.com [9.65.76.198]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p2N0GNiQ007989; Tue, 22 Mar 2011 20:16:29 -0400 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Tue, 22 Mar 2011 19:16:12 -0500 Message-Id: <1300839376-22520-8-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1300839376-22520-1-git-send-email-aliguori@us.ibm.com> References: <1300839376-22520-1-git-send-email-aliguori@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.144 Cc: Jan Kiszka , Anthony Liguori , Juan Quintela Subject: [Qemu-devel] [PATCH 07/11] eeprom93xx: Use the new hack macro to avoid duplicate field names 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 I don't fully understand this hack business but we need field to be unique so.. Signed-off-by: Anthony Liguori --- hw/eeprom93xx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/eeprom93xx.c b/hw/eeprom93xx.c index cfa695d..f1d75ec 100644 --- a/hw/eeprom93xx.c +++ b/hw/eeprom93xx.c @@ -114,7 +114,7 @@ static const VMStateInfo vmstate_hack_uint16_from_uint8 = { }; #define VMSTATE_UINT16_HACK_TEST(_f, _s, _t) \ - VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_hack_uint16_from_uint8, uint16_t) + VMSTATE_SINGLE_TEST_HACK(_f, _s, _t, 0, vmstate_hack_uint16_from_uint8, uint16_t) static bool is_old_eeprom_version(void *opaque, int version_id) {