Skip to contentSkip to conversation

Remove wrong savevm sections

PATCH In review Juan Quintela 2 participants 5 messages Feb 24, 2011 – Mar 6, 2011

lore
Share & tools
lore

Juan Quintela

author
#0 lore raw

cover Remove wrong savevm sections

Hi

This devices savevm support is "Not Even Wrong". Just remove it. It has never work for sure.

Anthony, please apply.

Later, Juan.

Juan Quintela (3):
vmstate: remove grackle_pci savevm code
vmstate: remove uninorth savevm code
gt64xxx: remove savevm support

 hw/grackle_pci.c |   19 -------------------
 hw/gt64xxx.c     |   21 ---------------------
 hw/unin_pci.c    |   21 ---------------------
 3 files changed, 0 insertions(+), 61 deletions(-)
Signature · 1 line
1.7.4
author
#1 lore raw

PATCH 1/3 vmstate: remove grackle_pci savevm code

It was migrating the wrong structures, no way it would work

Signed-off-by Juan Quintela <[email protected]>
---
 hw/grackle_pci.c |   19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)
hw/grackle_pci.c +0 -19
index bd3d6b0..d35701f 100644
@@ -57,23 +57,6 @@ static void pci_grackle_set_irq(void *opaque, int irq_num, int level)
     qemu_set_irq(pic[irq_num + 0x15], level);
 }
 
-static void pci_grackle_save(QEMUFile* f, void *opaque)
-{
-    PCIDevice *d = opaque;
-
-    pci_device_save(d, f);
-}
-
-static int pci_grackle_load(QEMUFile* f, void *opaque, int version_id)
-{
-    PCIDevice *d = opaque;
-
-    if (version_id != 1)
-        return -EINVAL;
-
-    return pci_device_load(d, f);
-}
-
 static void pci_grackle_reset(void *opaque)
 {
 }

@@ -115,8 +98,6 @@ static int pci_grackle_init_device(SysBusDevice *dev)
     sysbus_init_mmio(dev, 0x1000, pci_mem_config);
     sysbus_init_mmio(dev, 0x1000, pci_mem_data);
 
-    register_savevm(&dev->qdev, "grackle", 0, 1, pci_grackle_save,
-                    pci_grackle_load, &s->host_state);
     qemu_register_reset(pci_grackle_reset, &s->host_state);
     return 0;
 }
Signature · 1 line
1.7.4
author
#2 lore raw

PATCH 2/3 vmstate: remove uninorth savevm code

In reply to Juan Quintela

It was migrating the wrong structures, no way it would work

Signed-off-by Juan Quintela <[email protected]>
---
 hw/unin_pci.c |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)
hw/unin_pci.c +0 -21
index 5f15058..c57c0a1 100644
@@ -63,23 +63,6 @@ static void pci_unin_set_irq(void *opaque, int irq_num, int level)
     qemu_set_irq(pic[unin_irq_line[irq_num]], level);
 }
 
-static void pci_unin_save(QEMUFile* f, void *opaque)
-{
-    PCIDevice *d = opaque;
-
-    pci_device_save(d, f);
-}
-
-static int pci_unin_load(QEMUFile* f, void *opaque, int version_id)
-{
-    PCIDevice *d = opaque;
-
-    if (version_id != 1)
-        return -EINVAL;
-
-    return pci_device_load(d, f);
-}
-
 static void pci_unin_reset(void *opaque)
 {
 }

@@ -158,8 +141,6 @@ static int pci_unin_main_init_device(SysBusDevice *dev)
     sysbus_init_mmio(dev, 0x1000, pci_mem_config);
     sysbus_init_mmio(dev, 0x1000, pci_mem_data);
 
-    register_savevm(&dev->qdev, "uninorth", 0, 1,
-                    pci_unin_save, pci_unin_load, &s->host_state);
     qemu_register_reset(pci_unin_reset, &s->host_state);
     return 0;
 }

@@ -181,8 +162,6 @@ static int pci_u3_agp_init_device(SysBusDevice *dev)
     sysbus_init_mmio(dev, 0x1000, pci_mem_config);
     sysbus_init_mmio(dev, 0x1000, pci_mem_data);
 
-    register_savevm(&dev->qdev, "uninorth", 0, 1,
-                    pci_unin_save, pci_unin_load, &s->host_state);
     qemu_register_reset(pci_unin_reset, &s->host_state);
 
     return 0;
Signature · 1 line
1.7.4
author
#3 lore raw

PATCH 3/3 gt64xxx: remove savevm support

In reply to Juan Quintela
Signed-off-by Juan Quintela <[email protected]>
---
 hw/gt64xxx.c |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)
hw/gt64xxx.c +0 -21
index 923073b..c66188f 100644
@@ -1080,25 +1080,6 @@ static void gt64120_reset(void *opaque)
     gt64120_pci_mapping(s);
 }
 
-static void gt64120_save(QEMUFile* f, void *opaque)
-{
-    PCIDevice *d = opaque;
-    pci_device_save(d, f);
-}
-
-static int gt64120_load(QEMUFile* f, void *opaque, int version_id)
-{
-    PCIDevice *d = opaque;
-    int ret;
-
-    if (version_id != 1)
-        return -EINVAL;
-    ret = pci_device_load(d, f);
-    if (ret < 0)
-        return ret;
-    return 0;
-}
-
 PCIBus *gt64120_register(qemu_irq *pic)
 {
     SysBusDevice *s;

@@ -1131,8 +1112,6 @@ static int gt64120_init(SysBusDevice *dev)
        does not fully work. */
     isa_mem_base = 0x10000000;
     qemu_register_reset(gt64120_reset, s);
-    register_savevm(&dev->qdev, "GT64120 PCI Bus", 0, 1,
-                    gt64120_save, gt64120_load, &s->pci);
     return 0;
 }
Signature · 1 line
1.7.4
#4 lore raw
In reply to Juan Quintela
Quoted 14 lines · Juan Quintela

Hi

This devices savevm support is "Not Even Wrong". Just remove it. It has never work for sure.

Anthony, please apply.

Later, Juan.

Juan Quintela (3):
vmstate: remove grackle_pci savevm code
vmstate: remove uninorth savevm code
gt64xxx: remove savevm support

Quoted 5 lines
 hw/grackle_pci.c |   19 -------------------
 hw/gt64xxx.c     |   21 ---------------------
 hw/unin_pci.c    |   21 ---------------------
 3 files changed, 0 insertions(+), 61 deletions(-)

Thanks, all applied.

Signature · 2 lines
Aurelien Jarno                          GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net