From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=56006 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pvswn-0000HX-Sx
	for qemu-devel@nongnu.org; Sat, 05 Mar 2011 09:59:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Pvswm-0007ks-Ns
	for qemu-devel@nongnu.org; Sat, 05 Mar 2011 09:59:09 -0500
Received: from mx1.redhat.com ([209.132.183.28]:32754)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1Pvswm-0007kA-F0
	for qemu-devel@nongnu.org; Sat, 05 Mar 2011 09:59:08 -0500
Message-ID: <4D724FB5.1040601@redhat.com>
Date: Sat, 05 Mar 2011 15:59:01 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1299270860-8927-1-git-send-email-peter.maydell@linaro.org>	<1299270860-8927-2-git-send-email-peter.maydell@linaro.org>	<4D722880.6090103@redhat.com>
	<AANLkTik=DHLVVCouZj_L6fZ7Y-ycPvCgD+usKj=+WU0+@mail.gmail.com>
In-Reply-To: <AANLkTik=DHLVVCouZj_L6fZ7Y-ycPvCgD+usKj=+WU0+@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH v2 1/2] hw/arm_sysctl.c: Add the Versatile
 Express system registers
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: Peter Maydell <peter.maydell@linaro.org>
Cc: Juan Quintela <quintela@redhat.com>, patches@linaro.org, =?UTF-8?B?RGF3aWQgQ2nEmcW8YXJraWV3aWN6?= <dawidc@b-labs.com>, Amit Mahajan <amit.mahajan@b-labs.com>, qemu-devel@nongnu.org, Bahadir Balban <bbalban@b-labs.com>

On 03/05/2011 01:34 PM, Peter Maydell wrote:
>>> >>  +        VMSTATE_UINT32(sys_cfgdata, arm_sysctl_state),
>>> >>  +        VMSTATE_UINT32(sys_cfgctrl, arm_sysctl_state),
>>> >>  +        VMSTATE_UINT32(sys_cfgstat, arm_sysctl_state),
>>> >>            VMSTATE_END_OF_LIST()
>>> >>        }
>> >
>> >  You need to present the fields as version 2-only.
> Can you give an example/explanation? docs/migration.txt doesn't
> seem to cover this...

Sure, sorry for being terse. It simply needs to be:

         VMSTATE_UINT32_V(sys_cfgdata, arm_sysctl_state, 2),
         VMSTATE_UINT32_V(sys_cfgctrl, arm_sysctl_state, 2),
         VMSTATE_UINT32_V(sys_cfgstat, arm_sysctl_state, 2),

Also, minimum_version_id needs to remain 1 since you do support loading 
version 1 saved virtual machines.

Paolo