[Xen-changelog] [qemu-xen-3.3-testing] add two missing cirrus_update_memory_access

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

commit a71b1c5e1232c8fe10e4858f2ede358f3e8135a5
Author: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Date:   Tue Aug 4 15:23:43 2009 +0100

    add two missing cirrus_update_memory_access
    
    the cirrus emulation code misses two calls to
    cirrus_update_memory_access; this fact together with the condition on the
    call to cirrus_update_memory_access in cirrus_bitblt_reset can cause
    segfaults in qemu.
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
    (cherry picked from commit 5a369fdfe6eeb8aa2a2cd52387bf03fed83e925c)
    (cherry picked from commit b9935ce33bcc20ae722a8945a6fbc0f23d84f9e5)
---
 hw/cirrus_vga.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 9c56960..4dd8885 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -1288,6 +1288,7 @@ cirrus_hook_read_sr(CirrusVGAState * s, unsigned 
reg_index, int *reg_value)
        break;
     case 0x05:                 // ???
     case 0x07:                 // Extended Sequencer Mode
+        cirrus_update_memory_access(s);
     case 0x08:                 // EEPROM Control
     case 0x09:                 // Scratch Register 0
     case 0x0a:                 // Scratch Register 1
@@ -1539,6 +1540,7 @@ cirrus_hook_write_gr(CirrusVGAState * s, unsigned 
reg_index, int reg_value)
        s->gr[reg_index] = reg_value;
        cirrus_update_bank_ptr(s, 0);
        cirrus_update_bank_ptr(s, 1);
+        cirrus_update_memory_access(s);
         break;
     case 0x0B:
        s->gr[reg_index] = reg_value;
--
generated by git-patchbot for /home/xen/git/qemu-xen-3.3-testing.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog