diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-08 12:43:15 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-08 12:43:22 -0400 |
| commit | 2fd463854cbf7e649ef9c9be86d2694b5d4a53e3 (patch) | |
| tree | 44434ec9da33254e3faca7546099ffc56fc36397 | |
| parent | 6225820136f8c745c71290a904da61114d766253 (diff) | |
| parent | 8eb57ae3f9afdd8d911f3b2862e05cd0bb042b4e (diff) | |
| download | qemu-2fd463854cbf7e649ef9c9be86d2694b5d4a53e3.tar.gz | |
Merge remote-tracking branch 'mcayland/tags/qemu-sparc-signed' into staging
qemu-sparc update
# gpg: Signature made Fri 05 May 2017 04:51:46 AM EDT
# gpg: using RSA key 0x5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* mcayland/tags/qemu-sparc-signed:
cg3: add explicit ram_addr_t cast to scanline page variable
tcx: fix cut/paste error in update_palette_entries()
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/display/cg3.c | 2 | ||||
| -rw-r--r-- | hw/display/tcx.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/hw/display/cg3.c b/hw/display/cg3.c index 03d9197f71..7ef8a96496 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -113,7 +113,7 @@ static void cg3_update_display(void *opaque) for (y = 0; y < height; y++) { int update = s->full_update; - page = y * width; + page = (ram_addr_t)y * width; update |= memory_region_get_dirty(&s->vram_mem, page, width, DIRTY_MEMORY_VGA); if (update) { diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 5a1115cc65..0e66dcd055 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -145,7 +145,6 @@ static void update_palette_entries(TCXState *s, int start, int end) } else { s->palette[i] = rgb_to_pixel32(s->r[i], s->g[i], s->b[i]); } - break; } tcx_set_dirty(s, 0, memory_region_size(&s->vram_mem)); } |