[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/16] vga: port vga-pci to vmstate
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 07/16] vga: port vga-pci to vmstate |
Date: |
Wed, 14 Oct 2009 19:34:58 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/vga-pci.c | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index 5e75938..1edfdee 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -34,29 +34,17 @@ typedef struct PCIVGAState {
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;
+static const VMStateDescription vmstate_vga_pci = {
+ .name = "vga",
+ .version_id = 2,
+ .minimum_version_id = 2,
+ .minimum_version_id_old = 2,
+ .fields = (VMStateField []) {
+ VMSTATE_PCI_DEVICE(dev, PCIVGAState),
+ VMSTATE_STRUCT(vga, PCIVGAState, 0, vmstate_vga_common,
VGACommonState),
+ VMSTATE_END_OF_LIST()
}
- return vga_common_load(f, &s->vga, version_id);
-}
+};
static void vga_map(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type)
@@ -93,7 +81,7 @@ static int pci_vga_initfn(PCIDevice *dev)
// vga + console init
vga_common_init(s, VGA_RAM_SIZE);
vga_init(s);
- register_savevm("vga", 0, 2, pci_vga_save, pci_vga_load, d);
+ vmstate_register(0, &vmstate_vga_pci, d);
s->ds = graphic_console_init(s->update, s->invalidate,
s->screen_dump, s->text_update, s);
--
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, 2009/10/14
- [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 <=
- [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
[Qemu-devel] [PATCH 11/16] vmware_vga: qemu_malloc() returns void *, Juan Quintela, 2009/10/14