]> xenbits.xensource.com Git - qemu-xen-4.0-testing.git/commitdiff
cirrus_vga fix save/restore lfb_addr/lfb_end printfs xen-3.3.1-rc1
authorIan Jackson <ian.jackson@eu.citrix.com>
Thu, 27 Nov 2008 12:04:32 +0000 (12:04 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 27 Nov 2008 12:04:32 +0000 (12:04 +0000)
A couple of printf calls needed casts to (unsigned long) adding to
avoid compiler compliants, following commits
 97e3066c43477c79b56f4afeb08c330fc2c244b7
 ea324bf41565322b370b27253b1a7eaa3cc360b9

hw/cirrus_vga.c
hw/vga.c

index eae8f2df3cf1c819bc3303693fce9f53e56c0038..9c56960f8e22851f049e64cc005b1807c9e7e4d5 100644 (file)
@@ -3185,7 +3185,7 @@ void cirrus_restart_acc(CirrusVGAState *s)
     if (s->lfb_addr && s->lfb_end) {
         void *vram_pointer, *old_vram;
         fprintf(stderr, "cirrus_vga_load:re-enable vga acc.lfb_addr=0x%lx, lfb_end=0x%lx.\n",
-                s->lfb_addr, s->lfb_end);
+                (unsigned long)s->lfb_addr, (unsigned long)s->lfb_end);
         vram_pointer = set_vram_mapping(s->lfb_addr ,s->lfb_end);
         if (!vram_pointer){
             fprintf(stderr, "cirrus_vga_load:NULL vram_pointer\n");
index fd66c086d3b155258d80b54b23ed79db67071dc3..3420edf4b213a6ee87fc3dd25beac5b2d562e956 100644 (file)
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1552,7 +1552,7 @@ static void vga_draw_graphic(VGAState *s, int full_update)
                 /* ENODATA just means we have changed mode and will succeed
                  * next time */
                 if (errno != ENODATA)
-                    fprintf(stderr, "track_dirty_vram(%lx, %lx) failed (%d, %d)\n", s->lfb_addr + y, npages, err, errno);
+                    fprintf(stderr, "track_dirty_vram(%lx, %lx) failed (%d, %d)\n", (unsigned long)s->lfb_addr + y, npages, err, errno);
             }
         }