| commit | 94ffe0f46aeccbafee9ae4abd1470195a475e2cb | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 20 Dec 2009 15:08:30 +0000 (20 17:08 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 20 Dec 2009 15:08:30 +0000 (20 17:08 +0200) | ||
| tree | 8dab048b00f06a986364038941f2765ddd47dd1d | treesnapshot (tar.gz zip) |
| parent | 70641b6d90f49d4c1553b213a94e73a17a2060ef | commitdiff |
| parent | b5cc6e32baa9d98d50debe23229b303f89fe84f1 | commitdiff |
Merge commit 'b5cc6e32baa9d98d50debe23229b303f89fe84f1' into upstream-merge
* commit 'b5cc6e32baa9d98d50debe23229b303f89fe84f1':
VMware VGA: Only enable dirty log tracking when fifo is disabled
Fix VMware VGA depth computation
Make sure to enable dirty log tracking for VMware VGA
Conflicts:
hw/vga_int.h
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'b5cc6e32baa9d98d50debe23229b303f89fe84f1':
VMware VGA: Only enable dirty log tracking when fifo is disabled
Fix VMware VGA depth computation
Make sure to enable dirty log tracking for VMware VGA
Conflicts:
hw/vga_int.h
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/vga.c | diff1 | diff2 | blobhistory |
| hw/vga_int.h | diff1 | diff2 | blobhistory |