summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorJuan Quintela2009-09-21 14:35:17 +0200
committerAnthony Liguori2009-10-05 16:32:36 +0200
commitf22f5b077c164b864dae9776f63ed9e48a973fb6 (patch)
tree14aa5b7e55915ac0873d54bd062750b2af3fb0b8 /hw
parentRevert "eepro100: Remove unused device status entries" (diff)
downloadqemu-f22f5b077c164b864dae9776f63ed9e48a973fb6.tar.gz
qemu-f22f5b077c164b864dae9776f63ed9e48a973fb6.tar.xz
qemu-f22f5b077c164b864dae9776f63ed9e48a973fb6.zip
cirrus_vga: also assign gr0/1 when writting shadow_gr0/1
This is a regression/bug caused by previous vga_cleanup. This fixes Ubuntu installer reported by: Pierre Riteau Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/cirrus_vga.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 7e95f10bdb..ae4be82e47 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -1490,9 +1490,11 @@ cirrus_vga_write_gr(CirrusVGAState * s, unsigned reg_index, int reg_value)
#endif
switch (reg_index) {
case 0x00: // Standard VGA, BGCOLOR 0x000000ff
+ s->vga.gr[reg_index] = reg_value & gr_mask[reg_index];
s->cirrus_shadow_gr0 = reg_value;
break;
case 0x01: // Standard VGA, FGCOLOR 0x000000ff
+ s->vga.gr[reg_index] = reg_value & gr_mask[reg_index];
s->cirrus_shadow_gr1 = reg_value;
break;
case 0x02: // Standard VGA