[Qemu-devel] [PATCH] vga: Fix type of map_addr/end.

[Richard Henderson]

These addresses have been passed through pci_to_cpu_addr,
and thus need to be full target_phys_addr_t.

Signed-off-by: Richard Henderson <address@hidden>
Cc: Jan Kiszka <address@hidden>
---
 hw/vga_int.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Jan's recent patch series reminded me that I found a related
problem in my alpha-softmmu port this past weekend.  Note that
the slight re-ordering of the members avoids extra padding in
the structure due to alignment.


diff --git a/hw/vga_int.h b/hw/vga_int.h
index d2811bd..b65775b 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -109,9 +109,9 @@ typedef struct VGACommonState {
     uint32_t vram_size;
     uint32_t lfb_addr;
     uint32_t lfb_end;
-    uint32_t map_addr;
-    uint32_t map_end;
     uint32_t lfb_vram_mapped; /* whether 0xa0000 is mapped as ram */
+    target_phys_addr_t map_addr;
+    target_phys_addr_t map_end;
     uint32_t latch;
     uint8_t sr_index;
     uint8_t sr[256];
-- 
1.7.5.2