[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/16] piix3: use new vmstate infrastructure
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 16/16] piix3: use new vmstate infrastructure |
Date: |
Fri, 28 Aug 2009 15:28:27 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/piix_pci.c | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 5c33741..ef3463b 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -317,33 +317,17 @@ static void piix3_reset(void *opaque)
memset(d->pci_irq_levels, 0, sizeof(d->pci_irq_levels));
}
-static void piix3_save(QEMUFile* f, void *opaque)
-{
- PIIX3State *d = opaque;
- int i;
-
- pci_device_save(&d->dev, f);
-
- for (i = 0; i < 4; i++)
- qemu_put_be32(f, d->pci_irq_levels[i]);
-}
-
-static int piix3_load(QEMUFile* f, void *opaque, int version_id)
-{
- PIIX3State *d = opaque;
- int i, ret;
-
- if (version_id > 3 || version_id < 2)
- return -EINVAL;
- ret = pci_device_load(&d->dev, f);
- if (ret < 0)
- return ret;
- if (version_id >= 3) {
- for (i = 0; i < 4; i++)
- d->pci_irq_levels[i] = qemu_get_be32(f);
+static const VMStateDescription vmstate_piix3 = {
+ .name = "PIIX3",
+ .version_id = 3,
+ .minimum_version_id = 2,
+ .minimum_version_id_old = 2,
+ .fields = (VMStateField []) {
+ VMSTATE_PCI_DEVICE(dev, PIIX3State),
+ VMSTATE_INT32_ARRAY_V(pci_irq_levels, PIIX3State, 4, 3),
+ VMSTATE_END_OF_LIST()
}
- return 0;
-}
+};
static int piix3_initfn(PCIDevice *dev)
{
@@ -351,7 +335,7 @@ static int piix3_initfn(PCIDevice *dev)
uint8_t *pci_conf;
isa_bus_new(&d->dev.qdev);
- register_savevm("PIIX3", 0, 3, piix3_save, piix3_load, d);
+ vmstate_register(0, &vmstate_piix3, d);
pci_conf = d->dev.config;
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
--
1.6.2.5
- [Qemu-devel] [PATCH 06/16] We want the argument pass to set_irq to be opaque, (continued)
- [Qemu-devel] [PATCH 06/16] We want the argument pass to set_irq to be opaque, Juan Quintela, 2009/08/28
- [Qemu-devel] [PATCH 07/16] Create PIIX3State instead of using PCIDevice for PIIX3, Juan Quintela, 2009/08/28
- [Qemu-devel] [PATCH 08/16] Introduce PIIX3IrqState for piix3 irq's state, Juan Quintela, 2009/08/28
- [Qemu-devel] [PATCH 09/16] Fold piix3_init() intto i440fx_init, Juan Quintela, 2009/08/28
- [Qemu-devel] [PATCH 10/16] We can add piix3_dev now to PIIX3IrqState, Juan Quintela, 2009/08/28
- [Qemu-devel] [PATCH 12/16] pci_irq_levels[] belong to PIIX3State, Juan Quintela, 2009/08/28
- [Qemu-devel] [PATCH 11/16] Save irq_state into PCII440FXState, Juan Quintela, 2009/08/28
- [Qemu-devel] [PATCH 13/16] Update SaveVM versions, Juan Quintela, 2009/08/28
- [Qemu-devel] [PATCH 14/16] VMState: Fix sub-structs versioning, Juan Quintela, 2009/08/28
- [Qemu-devel] [PATCH 15/16] i440fx: use new vmstate infrastructure, Juan Quintela, 2009/08/28
- [Qemu-devel] [PATCH 16/16] piix3: use new vmstate infrastructure,
Juan Quintela <=
- [Qemu-devel] Re: [PATCH 00/16] *** SUBJECT HERE ***, Juan Quintela, 2009/08/28