diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:39:42 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:39:42 -0500 |
| commit | 33cf629a3754b58a1e2dbbe01d91d97e712b7c06 (patch) | |
| tree | fcf874262294eba07fb2f9eca11d594096847679 /hw | |
| parent | b85a4ec8a7ce348f3f385a53df4e418f2f54c182 (diff) | |
| parent | c234572ded381423abca9801ebf5a32abd2495ef (diff) | |
Merge remote-tracking branch 'sstabellini/saverestore-8' into staging
* sstabellini/saverestore-8:
xen: do not allocate RAM during INMIGRATE runstate
xen mapcache: check if memory region has moved.
xen: record physmap changes to xenstore
Set runstate to INMIGRATE earlier
Introduce "xen-save-devices-state"
cirrus_vga: do not reset videoram
Conflicts:
qapi-schema.json
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/cirrus_vga.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 4edcb94774..afedaa43d3 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2767,10 +2767,6 @@ static void cirrus_reset(void *opaque) } s->vga.cr[0x27] = s->device_id; - /* Win2K seems to assume that the pattern buffer is at 0xff - initially ! */ - memset(s->vga.vram_ptr, 0xff, s->real_vram_size); - s->cirrus_hidden_dac_lockindex = 5; s->cirrus_hidden_dac_data = 0; } |