[Qemu-devel] [5790] better type checking for vga (Glauber Costa)

[Anthony Liguori]

Revision: 5790
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5790
Author:   aliguori
Date:     2008-11-24 19:33:59 +0000 (Mon, 24 Nov 2008)

Log Message:
-----------
better type checking for vga (Glauber Costa)

unsigned long is too bad of a type. Use ram_addr_t instead.

aligurori: fixed a compile warning in this patch

Signed-off-by: Glauber Costa <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/hw/cirrus_vga.c
    trunk/hw/pc.h
    trunk/hw/vga.c
    trunk/hw/vga_int.h

Modified: trunk/hw/cirrus_vga.c
===================================================================
--- trunk/hw/cirrus_vga.c       2008-11-24 19:29:13 UTC (rev 5789)
+++ trunk/hw/cirrus_vga.c       2008-11-24 19:33:59 UTC (rev 5790)
@@ -3231,7 +3231,7 @@
  ***************************************/
 
 void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base,
-                         unsigned long vga_ram_offset, int vga_ram_size)
+                         ram_addr_t vga_ram_offset, int vga_ram_size)
 {
     CirrusVGAState *s;
 
@@ -3273,7 +3273,7 @@
 }
 
 void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
-                         unsigned long vga_ram_offset, int vga_ram_size)
+                         ram_addr_t vga_ram_offset, int vga_ram_size)
 {
     PCICirrusVGAState *d;
     uint8_t *pci_conf;

Modified: trunk/hw/pc.h
===================================================================
--- trunk/hw/pc.h       2008-11-24 19:29:13 UTC (rev 5789)
+++ trunk/hw/pc.h       2008-11-24 19:33:59 UTC (rev 5790)
@@ -134,9 +134,9 @@
 
 /* cirrus_vga.c */
 void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
-                         unsigned long vga_ram_offset, int vga_ram_size);
+                         ram_addr_t vga_ram_offset, int vga_ram_size);
 void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base,
-                         unsigned long vga_ram_offset, int vga_ram_size);
+                         ram_addr_t vga_ram_offset, int vga_ram_size);
 
 /* ide.c */
 void isa_ide_init(int iobase, int iobase2, qemu_irq irq,

Modified: trunk/hw/vga.c
===================================================================
--- trunk/hw/vga.c      2008-11-24 19:29:13 UTC (rev 5789)
+++ trunk/hw/vga.c      2008-11-24 19:33:59 UTC (rev 5790)
@@ -2105,7 +2105,7 @@
 }
 
 void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base,
-                     unsigned long vga_ram_offset, int vga_ram_size)
+                     ram_addr_t vga_ram_offset, int vga_ram_size)
 {
     int i, j, v, b;
 

Modified: trunk/hw/vga_int.h
===================================================================
--- trunk/hw/vga_int.h  2008-11-24 19:29:13 UTC (rev 5789)
+++ trunk/hw/vga_int.h  2008-11-24 19:33:59 UTC (rev 5790)
@@ -100,7 +100,7 @@
 
 #define VGA_STATE_COMMON                                                \
     uint8_t *vram_ptr;                                                  \
-    unsigned long vram_offset;                                          \
+    ram_addr_t vram_offset;                                             \
     unsigned int vram_size;                                             \
     unsigned long bios_offset;                                          \
     unsigned int bios_size;                                             \
@@ -186,7 +186,7 @@
 }
 
 void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base,
-                     unsigned long vga_ram_offset, int vga_ram_size);
+                     ram_addr_t vga_ram_offset, int vga_ram_size);
 void vga_init(VGAState *s);
 uint32_t vga_mem_readb(void *opaque, target_phys_addr_t addr);
 void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val);