diff options
author | Alex Williamson <alex.williamson@redhat.com> | 2010-06-25 11:09:07 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 10:36:28 -0500 |
commit | 0be71e324f774a77243f1a1487f468232d69542b (patch) | |
tree | f3ac4560e61b5874fd359da3ada9bd371c25efc4 /hw/ide | |
parent | 4f43c1ff3b8ce99de80db7c51423e5ba8b143802 (diff) | |
download | hqemu-0be71e324f774a77243f1a1487f468232d69542b.zip hqemu-0be71e324f774a77243f1a1487f468232d69542b.tar.gz |
savevm: Add DeviceState param
When available, we'd like to be able to access the DeviceState
when registering a savevm. For buses with a get_dev_path()
function, this will allow us to create more unique savevm
id strings.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ide')
-rw-r--r-- | hw/ide/cmd646.c | 2 | ||||
-rw-r--r-- | hw/ide/isa.c | 2 | ||||
-rw-r--r-- | hw/ide/macio.c | 2 | ||||
-rw-r--r-- | hw/ide/microdrive.c | 2 | ||||
-rw-r--r-- | hw/ide/mmio.c | 2 | ||||
-rw-r--r-- | hw/ide/piix.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 559147f..8b71a13 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -263,7 +263,7 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) ide_init2(&d->bus[0], irq[0]); ide_init2(&d->bus[1], irq[1]); - vmstate_register(0, &vmstate_ide_pci, d); + vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d); qemu_register_reset(cmd646_reset, d); return 0; } diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 10777ca..6b57e0d 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -71,7 +71,7 @@ static int isa_ide_initfn(ISADevice *dev) ide_init_ioport(&s->bus, s->iobase, s->iobase2); isa_init_irq(dev, &s->irq, s->isairq); ide_init2(&s->bus, s->irq); - vmstate_register(0, &vmstate_ide_isa, s); + vmstate_register(&dev->qdev, 0, &vmstate_ide_isa, s); return 0; }; diff --git a/hw/ide/macio.c b/hw/ide/macio.c index f76c0fa..fd4bdfd 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -321,7 +321,7 @@ int pmac_ide_init (DriveInfo **hd_table, qemu_irq irq, pmac_ide_memory = cpu_register_io_memory(pmac_ide_read, pmac_ide_write, d); - vmstate_register(0, &vmstate_pmac, d); + vmstate_register(NULL, 0, &vmstate_pmac, d); qemu_register_reset(pmac_ide_reset, d); return pmac_ide_memory; diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index a7beac5..8e20e74 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -545,7 +545,7 @@ PCMCIACardState *dscm1xxxx_init(DriveInfo *bdrv) md->bus.ifs[0].mdata_size = METADATA_SIZE; md->bus.ifs[0].mdata_storage = (uint8_t *) qemu_mallocz(METADATA_SIZE); - vmstate_register(-1, &vmstate_microdrive, md); + vmstate_register(NULL, -1, &vmstate_microdrive, md); return &md->card; } diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index e75cccf..9f20e8b 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -133,7 +133,7 @@ void mmio_ide_init (target_phys_addr_t membase, target_phys_addr_t membase2, mem2 = cpu_register_io_memory(mmio_ide_status, mmio_ide_cmd, s); cpu_register_physical_memory(membase, 16 << shift, mem1); cpu_register_physical_memory(membase2, 2 << shift, mem2); - vmstate_register(0, &vmstate_ide_mmio, s); + vmstate_register(NULL, 0, &vmstate_ide_mmio, s); qemu_register_reset(mmio_ide_reset, s); } diff --git a/hw/ide/piix.c b/hw/ide/piix.c index fa22226..9223834 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -128,7 +128,7 @@ static int pci_piix_ide_initfn(PCIIDEState *d) pci_register_bar(&d->dev, 4, 0x10, PCI_BASE_ADDRESS_SPACE_IO, bmdma_map); - vmstate_register(0, &vmstate_ide_pci, d); + vmstate_register(&d->dev.qdev, 0, &vmstate_ide_pci, d); ide_bus_new(&d->bus[0], &d->dev.qdev); ide_bus_new(&d->bus[1], &d->dev.qdev); |