summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2011-06-14 12:53:08 -0700
committerAnthony Liguori <aliguori@us.ibm.com>2011-07-23 11:19:02 -0500
commit0fe28e0d9f549fab79793d3fa2f139e643d3f134 (patch)
tree43caf4cc6558becfcc5620e9c8cf91f708e615db
parent6e1db57b2ac9025c2443c665a0d9e78748637b26 (diff)
downloadfocaccia-qemu-0fe28e0d9f549fab79793d3fa2f139e643d3f134.tar.gz
focaccia-qemu-0fe28e0d9f549fab79793d3fa2f139e643d3f134.zip
vga: Fix type of lfb/map_addr/end.
These addresses have been passed through pci_to_cpu_addr,
and thus need to be full target_phys_addr_t.

Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/vga_int.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/vga_int.h b/hw/vga_int.h
index d2811bdf1c..eee91a84f3 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -106,13 +106,13 @@ typedef void (* vga_update_retrace_info_fn)(struct VGACommonState *s);
 typedef struct VGACommonState {
     uint8_t *vram_ptr;
     ram_addr_t vram_offset;
+    target_phys_addr_t lfb_addr;
+    target_phys_addr_t lfb_end;
+    target_phys_addr_t map_addr;
+    target_phys_addr_t map_end;
     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 */
     uint32_t latch;
+    uint32_t lfb_vram_mapped; /* whether 0xa0000 is mapped as ram */
     uint8_t sr_index;
     uint8_t sr[256];
     uint8_t gr_index;