From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=58222 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q2Mza-0005FT-R0
	for qemu-devel@nongnu.org; Wed, 23 Mar 2011 08:16:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Q2MzZ-0005HE-9B
	for qemu-devel@nongnu.org; Wed, 23 Mar 2011 08:16:50 -0400
Received: from mail-gw0-f45.google.com ([74.125.83.45]:57752)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Q2MzZ-0005H8-2x
	for qemu-devel@nongnu.org; Wed, 23 Mar 2011 08:16:49 -0400
Received: by gwb19 with SMTP id 19so3982749gwb.4
	for <qemu-devel@nongnu.org>; Wed, 23 Mar 2011 05:16:48 -0700 (PDT)
Message-ID: <4D89E4A8.6080903@codemonkey.ws>
Date: Wed, 23 Mar 2011 07:16:40 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] Re: [PATCH 04/11] sb16: fix migration quirk
References: <1300839376-22520-1-git-send-email-aliguori@us.ibm.com>	<1300839376-22520-5-git-send-email-aliguori@us.ibm.com>
	<m3mxkmgo5s.fsf@neno.mitica>
In-Reply-To: <m3mxkmgo5s.fsf@neno.mitica>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: quintela@redhat.com
Cc: Jan Kiszka <jan.kiszka@siemens.com>, Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org

On 03/23/2011 04:51 AM, Juan Quintela wrote:
> Anthony Liguori<aliguori@us.ibm.com>  wrote:
>> We seem to migrate the same field twice.  It's been this way since Fabrice
>> committed the original file.  Since semantically, we basically ignore the first
>> value, make this an unused entry.
>>
>> Signed-off-by: Anthony Liguori<aliguori@us.ibm.com>
>> ---
>>   hw/sb16.c |    3 ++-
>>   1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/hw/sb16.c b/hw/sb16.c
>> index c98546a..1c30e4c 100644
>> --- a/hw/sb16.c
>> +++ b/hw/sb16.c
>> @@ -77,6 +77,7 @@ typedef struct SB16State {
>>
>>       int v2x6;
>>
>> +    uint8_t csp_param_dummy;
>>       uint8_t csp_param;
>>       uint8_t csp_value;
>>       uint8_t csp_mode;
>> @@ -1313,7 +1314,7 @@ static const VMStateDescription vmstate_sb16 = {
>>           VMSTATE_INT32(can_write, SB16State),
>>           VMSTATE_INT32(v2x6, SB16State),
>>
>> -        VMSTATE_UINT8(csp_param, SB16State),
>> +        VMSTATE_UINT8(csp_param_dummy, SB16State),
>>           VMSTATE_UINT8(csp_value, SB16State),
>>           VMSTATE_UINT8(csp_mode, SB16State),
>>           VMSTATE_UINT8(csp_param, SB16State),
> VMSTATE_UNUSED(1) instead?

Ack.  I forgot to update this patch to do that.

Regards,

Anthony Liguori

> Later, Juan.
>