OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vga: split vga_{load, save} into pci and common parts 

Once there adjust VGAState <-> VGACommonState
Export vga_common_save/vga_common_load (nreeded by wmvare_vga
Remove vga.pci_dev field, it is not needed anymore

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-08-31 16:07:14 +02:00 committed by Anthony Liguori
parent 43bf782b1a
commit 0d65ddc384
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
hw/vga.c
View File

@ -2126,14 +2126,11 @@ static CPUWriteMemoryFunc * const vga_mem_write[3] = {
vga_mem_writel,
};
static void vga_save(QEMUFile *f, void *opaque)
void vga_common_save(QEMUFile *f, void *opaque)
{
VGAState *s = opaque;
VGACommonState *s = opaque;
int i;
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, 8);
@ -2170,20 +2167,14 @@ static void vga_save(QEMUFile *f, void *opaque)
#endif
}
static int vga_load(QEMUFile *f, void *opaque, int version_id)
int vga_common_load(QEMUFile *f, void *opaque, int version_id)
{
VGAState *s = opaque;
int is_vbe, i, ret;
VGACommonState *s = opaque;
int is_vbe, i;
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, 8);
@ -2229,9 +2220,33 @@ static int vga_load(QEMUFile *f, void *opaque, int version_id)
typedef struct PCIVGAState {
PCIDevice dev;
VGAState vga;
VGACommonState vga;
} PCIVGAState;
static void pci_vga_save(QEMUFile *f, void *opaque)
{
PCIVGAState *s = opaque;
pci_device_save(&s->dev, f);
vga_common_save(f, &s->vga);
}
static int pci_vga_load(QEMUFile *f, void *opaque, int version_id)
{
PCIVGAState *s = opaque;
int ret;
if (version_id > 2)
return -EINVAL;
if (version_id >= 2) {
ret = pci_device_load(&s->dev, f);
if (ret < 0)
return ret;
}
return vga_common_load(f, &s->vga, version_id);
}
void vga_dirty_log_start(VGAState *s)
{
if (kvm_enabled() && s->map_addr)
@ -2315,7 +2330,6 @@ void vga_init(VGAState *s)
int vga_io_memory;
qemu_register_reset(vga_reset, s);
register_savevm("vga", 0, 2, vga_save, vga_load, s);
register_ioport_write(0x3c0, 16, 1, vga_ioport_write, s);
@ -2428,7 +2442,7 @@ static void vga_mm_init(VGAState *s, target_phys_addr_t vram_base,
s_ioport_ctrl = cpu_register_io_memory(vga_mm_read_ctrl, vga_mm_write_ctrl, s);
vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s);
register_savevm("vga", 0, 2, vga_save, vga_load, s);
register_savevm("vga", 0, 2, vga_common_save, vga_common_load, s);
cpu_register_physical_memory(ctrl_base, 0x100000, s_ioport_ctrl);
s->bank_offset = 0;
@ -2444,6 +2458,7 @@ int isa_vga_init(void)
vga_common_init(s, VGA_RAM_SIZE);
vga_init(s);
register_savevm("vga", 0, 2, vga_common_save, vga_common_load, s);
s->ds = graphic_console_init(s->update, s->invalidate,
s->screen_dump, s->text_update, s);
@ -2497,7 +2512,8 @@ static int pci_vga_initfn(PCIDevice *dev)
// vga + console init
vga_common_init(s, VGA_RAM_SIZE);
vga_init(s);
s->pci_dev = &d->dev;
register_savevm("vga", 0, 2, pci_vga_save, pci_vga_load, d);
s->ds = graphic_console_init(s->update, s->invalidate,
s->screen_dump, s->text_update, s);

3
hw/vga_int.h
View File

@ -110,7 +110,6 @@ typedef struct VGACommonState {
uint32_t bios_offset;
uint32_t bios_size;
int it_shift;
PCIDevice *pci_dev;
uint32_t latch;
uint8_t sr_index;
uint8_t sr[256];
@ -194,6 +193,8 @@ void vga_common_reset(VGACommonState *s);
void vga_dirty_log_start(VGACommonState *s);
void vga_common_save(QEMUFile *f, void *opaque);
int vga_common_load(QEMUFile *f, void *opaque, int version_id);
uint32_t vga_ioport_read(void *opaque, uint32_t addr);
void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val);
uint32_t vga_mem_readb(void *opaque, target_phys_addr_t addr);

1
hw/vmware_vga.c
View File

@ -1131,6 +1131,7 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size)
#ifdef EMBED_STDVGA
vga_common_init(&s->vga, vga_ram_size);
vga_init(&s->vga);
register_savevm("vga", 0, 2, vga_common_save, vga_common_load, &s->vga);
#else
s->vram_size = vga_ram_size;
s->vram_offset = qemu_ram_alloc(vga_ram_size);