From a4f9631ceed50ada61cb70248ce34917e3b34c56 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 14 Oct 2009 15:42:44 +0200 Subject: vga: port vga-pci to vmstate Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- hw/vga-pci.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) (limited to 'hw/vga-pci.c') diff --git a/hw/vga-pci.c b/hw/vga-pci.c index 5e75938f94..1edfdeefed 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); -- cgit v1.2.3