From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L4eC4-0002Ry-8y for qemu-devel@nongnu.org; Mon, 24 Nov 2008 11:21:48 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L4eBy-0002Oz-Us for qemu-devel@nongnu.org; Mon, 24 Nov 2008 11:21:44 -0500 Received: from [199.232.76.173] (port=55400 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4eBy-0002Oj-IG for qemu-devel@nongnu.org; Mon, 24 Nov 2008 11:21:42 -0500 Received: from mx2.redhat.com ([66.187.237.31]:51820) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L4eBx-0005SE-E2 for qemu-devel@nongnu.org; Mon, 24 Nov 2008 11:21:41 -0500 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id mAOGLeI8025555 for ; Mon, 24 Nov 2008 11:21:41 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id mAOGLetH029951 for ; Mon, 24 Nov 2008 11:21:40 -0500 Received: from localhost.localdomain (vpn-14-24.rdu.redhat.com [10.11.14.24]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id mAOGLbrX029407 for ; Mon, 24 Nov 2008 11:21:39 -0500 From: Glauber Costa Date: Mon, 24 Nov 2008 16:17:45 -0200 Message-Id: <1227550668-19416-2-git-send-email-glommer@redhat.com> In-Reply-To: <1227550668-19416-1-git-send-email-glommer@redhat.com> References: <1227550668-19416-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] better type checking for vga Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org unsigned long is too bad of a type. Use ram_addr_t instead. Signed-off-by: Glauber Costa --- hw/cirrus_vga.c | 4 ++-- hw/vga.c | 2 +- hw/vga_int.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index af9c9e6..3cdc8e6 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3231,7 +3231,7 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci) ***************************************/ 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 @@ static void cirrus_pci_mmio_map(PCIDevice *d, int region_num, } 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; diff --git a/hw/vga.c b/hw/vga.c index bd59aae..b44b77d 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2105,7 +2105,7 @@ static void vga_map(PCIDevice *pci_dev, int region_num, } 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; diff --git a/hw/vga_int.h b/hw/vga_int.h index 82a755e..8a7a925 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -100,7 +100,7 @@ typedef void (* vga_update_retrace_info_fn)(struct VGAState *s); #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 @@ static inline int c6_to_8(int v) } 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); -- 1.5.6.5