On 22 February 2012 10:15, Igor Mitsyanko <i.mitsya...@samsung.com> wrote:
> Convert three variables in DMAChannel state from type target_phys_addr_t to
> uint32_t,
> use VMSTATE_UINT32 instead of VMSTATE_UINTTL for these variables.
> We can do it safely because:
> 1) pxa2xx has 32-bit physical address;
> 2) rest of the code in this file treats these variables as uint32_t;
> 3) we shouldn't have used VMSTATE_UINTTL in the first place because this macro
> is for target_ulong type (which can be different from target_phys_addr_t).
>
> Signed-off-by: Igor Mitsyanko <i.mitsya...@samsung.com>
> ---
> hw/pxa2xx_lcd.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
> index 9495226..4b712bb 100644
> --- a/hw/pxa2xx_lcd.c
> +++ b/hw/pxa2xx_lcd.c
> @@ -19,15 +19,15 @@
> #include "framebuffer.h"
>
> struct DMAChannel {
> - target_phys_addr_t branch;
> + uint32_t branch;
> uint8_t up;
> uint8_t palette[1024];
> uint8_t pbuffer[1024];
> void (*redraw)(PXA2xxLCDState *s, target_phys_addr_t addr,
> int *miny, int *maxy);
>
> - target_phys_addr_t descriptor;
> - target_phys_addr_t source;
> + uint32_t descriptor;
> + uint32_t source;
> uint32_t id;
> uint32_t command;
> };
> @@ -934,11 +934,11 @@ static const VMStateDescription vmstate_dma_channel = {
> .minimum_version_id = 0,
> .minimum_version_id_old = 0,
> .fields = (VMStateField[]) {
> - VMSTATE_UINTTL(branch, struct DMAChannel),
> + VMSTATE_UINT32(branch, struct DMAChannel),
> VMSTATE_UINT8(up, struct DMAChannel),
> VMSTATE_BUFFER(pbuffer, struct DMAChannel),
> - VMSTATE_UINTTL(descriptor, struct DMAChannel),
> - VMSTATE_UINTTL(source, struct DMAChannel),
> + VMSTATE_UINT32(descriptor, struct DMAChannel),
> + VMSTATE_UINT32(source, struct DMAChannel),
> VMSTATE_UINT32(id, struct DMAChannel),
> VMSTATE_UINT32(command, struct DMAChannel),
> VMSTATE_END_OF_LIST()
> --
> 1.7.4.1
>
Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
-- PMM
