[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/16] vga: create is_vbe_vmstate field
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 01/16] vga: create is_vbe_vmstate field |
Date: |
Wed, 14 Oct 2009 19:34:52 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/vga.c | 17 ++++++++++-------
hw/vga_int.h | 1 +
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/hw/vga.c b/hw/vga.c
index 6cbd3d3..99edf25 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2159,23 +2159,21 @@ void vga_common_save(QEMUFile *f, void *opaque)
qemu_put_buffer(f, s->palette, 768);
qemu_put_be32(f, s->bank_offset);
+ qemu_put_byte(f, s->is_vbe_vmstate);
#ifdef CONFIG_BOCHS_VBE
- qemu_put_byte(f, 1);
qemu_put_be16s(f, &s->vbe_index);
for(i = 0; i < VBE_DISPI_INDEX_NB; i++)
qemu_put_be16s(f, &s->vbe_regs[i]);
qemu_put_be32s(f, &s->vbe_start_addr);
qemu_put_be32s(f, &s->vbe_line_offset);
qemu_put_be32s(f, &s->vbe_bank_mask);
-#else
- qemu_put_byte(f, 0);
#endif
}
int vga_common_load(QEMUFile *f, void *opaque, int version_id)
{
VGACommonState *s = opaque;
- int is_vbe, i;
+ int i;
if (version_id > 2)
return -EINVAL;
@@ -2203,9 +2201,9 @@ int vga_common_load(QEMUFile *f, void *opaque, int
version_id)
qemu_get_buffer(f, s->palette, 768);
s->bank_offset=qemu_get_be32(f);
- is_vbe = qemu_get_byte(f);
+ s->is_vbe_vmstate = qemu_get_byte(f);
#ifdef CONFIG_BOCHS_VBE
- if (!is_vbe)
+ if (!s->is_vbe_vmstate)
return -EINVAL;
qemu_get_be16s(f, &s->vbe_index);
for(i = 0; i < VBE_DISPI_INDEX_NB; i++)
@@ -2214,7 +2212,7 @@ int vga_common_load(QEMUFile *f, void *opaque, int
version_id)
qemu_get_be32s(f, &s->vbe_line_offset);
qemu_get_be32s(f, &s->vbe_bank_mask);
#else
- if (is_vbe)
+ if (s->is_vbe_vmstate)
return -EINVAL;
#endif
@@ -2250,6 +2248,11 @@ void vga_common_init(VGACommonState *s, int vga_ram_size)
expand4to8[i] = v;
}
+#ifdef CONFIG_BOCHS_VBE
+ s->is_vbe_vmstate = 1;
+#else
+ s->is_vbe_vmstate = 0;
+#endif
s->vram_offset = qemu_ram_alloc(vga_ram_size);
s->vram_ptr = qemu_get_ram_ptr(s->vram_offset);
s->vram_size = vga_ram_size;
diff --git a/hw/vga_int.h b/hw/vga_int.h
index c162c07..4d5232f 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -176,6 +176,7 @@ typedef struct VGACommonState {
vga_retrace_fn retrace;
vga_update_retrace_info_fn update_retrace_info;
union vga_retrace retrace_info;
+ uint8_t is_vbe_vmstate;
} VGACommonState;
static inline int c6_to_8(int v)
--
1.6.2.5
- [Qemu-devel] [PATCH 00/16] Port rest of vga devices to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 01/16] vga: create is_vbe_vmstate field,
Juan Quintela <=
- [Qemu-devel] [PATCH 02/16] vmstate: Add support for partial buffers transmission, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 03/16] vga: port vga_common_save/load to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 06/16] vga: port vmware std vga to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 04/16] vga: port vga-isa-mm to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 05/16] vga: port vga-isa to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 07/16] vga: port vga-pci to vmstate, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 10/16] vmware_vga: Remove uselss casts from void *, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 09/16] vmware_vga: Pass pci_vmsga_state_t arg no VGACommonState, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 08/16] vga: remove unused vga_common_save/load, Juan Quintela, 2009/10/14
- [Qemu-devel] [PATCH 12/16] vmware_vga: remove !EMBED_STDVGA code, Juan Quintela, 2009/10/14