ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-sparc update 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJZDD0iAAoJEFvCxW+uDzIfHykH/3bNwYXW6uo3z75fTBLo61If
 Mtt/zV7R5F+fPtiYfR3KHc26Zop90GDJEyPMw/kOU6LV5YWLrzWzMpNkXLgQrc6B
 3blhkeuVYXBWsrBJmYaEwjNXEnCF1AhNQTCv58AhggzH0E7mzAFyvhMUSz2h/K5m
 wOTKRh6tBkmW/jT2ohI7tMxnVqREnW7gjOO4NaU7yKwUDAeFjb96kzhmAdOWHqRX
 oXRmexEnLXTRy1dctMlgweVfmgA5rtLKy3+cnbqca4MynU1GAAvHVKL/xcF/CYUD
 jtkJ7f5DmLC2/RHeZdnQRf7WyA3Fmh+1XFHHlKcRo4Nbx0WsWROzJuJ1PuYUBVU=
 =mvtV
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Stefan Hajnoczi 2017-05-08 12:43:15 -04:00
parent 6225820136 8eb57ae3f9
commit 2fd463854c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/display/cg3.c
View File

@ -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) {

1
hw/display/tcx.c
View File

@ -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));
}