mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 17:53:56 -06:00
save VGA PCI state
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2113 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
dfd92d3a46
commit
d2269f6f64
3 changed files with 94 additions and 54 deletions
|
@ -2905,6 +2905,9 @@ static void cirrus_vga_save(QEMUFile *f, void *opaque)
|
|||
{
|
||||
CirrusVGAState *s = opaque;
|
||||
|
||||
if (s->pci_dev)
|
||||
pci_device_save(s->pci_dev, f);
|
||||
|
||||
qemu_put_be32s(f, &s->latch);
|
||||
qemu_put_8s(f, &s->sr_index);
|
||||
qemu_put_buffer(f, s->sr, 256);
|
||||
|
@ -2943,10 +2946,17 @@ static void cirrus_vga_save(QEMUFile *f, void *opaque)
|
|||
static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id)
|
||||
{
|
||||
CirrusVGAState *s = opaque;
|
||||
int ret;
|
||||
|
||||
if (version_id != 1)
|
||||
if (version_id > 2)
|
||||
return -EINVAL;
|
||||
|
||||
if (s->pci_dev && version_id >= 2) {
|
||||
ret = pci_device_load(s->pci_dev, f);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
qemu_get_be32s(f, &s->latch);
|
||||
qemu_get_8s(f, &s->sr_index);
|
||||
qemu_get_buffer(f, s->sr, 256);
|
||||
|
@ -3100,7 +3110,7 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)
|
|||
s->cursor_invalidate = cirrus_cursor_invalidate;
|
||||
s->cursor_draw_line = cirrus_cursor_draw_line;
|
||||
|
||||
register_savevm("cirrus_vga", 0, 1, cirrus_vga_save, cirrus_vga_load, s);
|
||||
register_savevm("cirrus_vga", 0, 2, cirrus_vga_save, cirrus_vga_load, s);
|
||||
}
|
||||
|
||||
/***************************************
|
||||
|
@ -3178,6 +3188,7 @@ void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
|
|||
vga_common_init((VGAState *)s,
|
||||
ds, vga_ram_base, vga_ram_offset, vga_ram_size);
|
||||
cirrus_init_common(s, device_id, 1);
|
||||
s->pci_dev = (PCIDevice *)d;
|
||||
|
||||
/* setup memory space */
|
||||
/* memory #0 LFB */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue