Message ID | 20231019190831.20363-3-quintela@redhat.com |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | migration: Check for duplicates on vmstate_register() | expand |
On 10/19/23 15:08, Juan Quintela wrote: > This are the easiest cases, where we were already using > VMSTATE_INSTANCE_ID_ANY. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> > --- > backends/dbus-vmstate.c | 3 +-- > backends/tpm/tpm_emulator.c | 3 +-- > hw/i2c/core.c | 2 +- > hw/input/adb.c | 2 +- > hw/input/ads7846.c | 2 +- > hw/input/stellaris_input.c | 3 +-- > hw/net/eepro100.c | 3 +-- > hw/pci/pci.c | 2 +- > hw/ppc/spapr_nvdimm.c | 3 +-- > hw/timer/arm_timer.c | 2 +- > hw/virtio/virtio-mem.c | 4 ++-- > 11 files changed, 12 insertions(+), 17 deletions(-) > > diff --git a/backends/dbus-vmstate.c b/backends/dbus-vmstate.c > index 57369ec0f2..a9d8cb0acd 100644 > --- a/backends/dbus-vmstate.c > +++ b/backends/dbus-vmstate.c > @@ -426,8 +426,7 @@ dbus_vmstate_complete(UserCreatable *uc, Error **errp) > return; > } > > - if (vmstate_register(VMSTATE_IF(self), VMSTATE_INSTANCE_ID_ANY, > - &dbus_vmstate, self) < 0) { > + if (vmstate_register_any(VMSTATE_IF(self), &dbus_vmstate, self) < 0) { > error_setg(errp, "Failed to register vmstate"); > } > } > diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c > index 402a2d6312..8920b75251 100644 > --- a/backends/tpm/tpm_emulator.c > +++ b/backends/tpm/tpm_emulator.c > @@ -978,8 +978,7 @@ static void tpm_emulator_inst_init(Object *obj) > qemu_add_vm_change_state_handler(tpm_emulator_vm_state_change, > tpm_emu); > > - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, > - &vmstate_tpm_emulator, obj); > + vmstate_register_any(NULL, &vmstate_tpm_emulator, obj); > } > > /* > diff --git a/hw/i2c/core.c b/hw/i2c/core.c > index bed594fe59..879a1d45cb 100644 > --- a/hw/i2c/core.c > +++ b/hw/i2c/core.c > @@ -64,7 +64,7 @@ I2CBus *i2c_init_bus(DeviceState *parent, const char *name) > bus = I2C_BUS(qbus_new(TYPE_I2C_BUS, parent, name)); > QLIST_INIT(&bus->current_devs); > QSIMPLEQ_INIT(&bus->pending_masters); > - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_i2c_bus, bus); > + vmstate_register_any(NULL, &vmstate_i2c_bus, bus); > return bus; > } > > diff --git a/hw/input/adb.c b/hw/input/adb.c > index 214ae6f42b..8aed0da2cd 100644 > --- a/hw/input/adb.c > +++ b/hw/input/adb.c > @@ -247,7 +247,7 @@ static void adb_bus_realize(BusState *qbus, Error **errp) > adb_bus->autopoll_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, adb_autopoll, > adb_bus); > > - vmstate_register(NULL, -1, &vmstate_adb_bus, adb_bus); > + vmstate_register_any(NULL, &vmstate_adb_bus, adb_bus); > } > > static void adb_bus_unrealize(BusState *qbus) > diff --git a/hw/input/ads7846.c b/hw/input/ads7846.c > index dc0998ac79..91116c6bdb 100644 > --- a/hw/input/ads7846.c > +++ b/hw/input/ads7846.c > @@ -158,7 +158,7 @@ static void ads7846_realize(SSIPeripheral *d, Error **errp) > > ads7846_int_update(s); > > - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_ads7846, s); > + vmstate_register_any(NULL, &vmstate_ads7846, s); > } > > static void ads7846_class_init(ObjectClass *klass, void *data) > diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c > index e6ee5e11f1..a58721c8cd 100644 > --- a/hw/input/stellaris_input.c > +++ b/hw/input/stellaris_input.c > @@ -88,6 +88,5 @@ void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode) > } > s->num_buttons = n; > qemu_add_kbd_event_handler(stellaris_gamepad_put_key, s); > - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, > - &vmstate_stellaris_gamepad, s); > + vmstate_register_any(NULL, &vmstate_stellaris_gamepad, s); > } > diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c > index dc07984ae9..94ce9e18ff 100644 > --- a/hw/net/eepro100.c > +++ b/hw/net/eepro100.c > @@ -1883,8 +1883,7 @@ static void e100_nic_realize(PCIDevice *pci_dev, Error **errp) > > s->vmstate = g_memdup(&vmstate_eepro100, sizeof(vmstate_eepro100)); > s->vmstate->name = qemu_get_queue(s->nic)->model; > - vmstate_register(VMSTATE_IF(&pci_dev->qdev), VMSTATE_INSTANCE_ID_ANY, > - s->vmstate, s); > + vmstate_register_any(VMSTATE_IF(&pci_dev->qdev), s->vmstate, s); > } > > static void eepro100_instance_init(Object *obj) > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index b0d21bf43a..294c3c38ea 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -147,7 +147,7 @@ static void pci_bus_realize(BusState *qbus, Error **errp) > bus->machine_done.notify = pcibus_machine_done; > qemu_add_machine_init_done_notifier(&bus->machine_done); > > - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_pcibus, bus); > + vmstate_register_any(NULL, &vmstate_pcibus, bus); > } > > static void pcie_bus_realize(BusState *qbus, Error **errp) > diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c > index b2f009c816..ad7afe7544 100644 > --- a/hw/ppc/spapr_nvdimm.c > +++ b/hw/ppc/spapr_nvdimm.c > @@ -876,8 +876,7 @@ static void spapr_nvdimm_realize(NVDIMMDevice *dimm, Error **errp) > s_nvdimm->hcall_flush_required = true; > } > > - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, > - &vmstate_spapr_nvdimm_states, dimm); > + vmstate_register_any(NULL, &vmstate_spapr_nvdimm_states, dimm); > } > > static void spapr_nvdimm_unrealize(NVDIMMDevice *dimm) > diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c > index 69c8863472..9afe8da831 100644 > --- a/hw/timer/arm_timer.c > +++ b/hw/timer/arm_timer.c > @@ -181,7 +181,7 @@ static arm_timer_state *arm_timer_init(uint32_t freq) > s->control = TIMER_CTRL_IE; > > s->timer = ptimer_init(arm_timer_tick, s, PTIMER_POLICY_LEGACY); > - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_arm_timer, s); > + vmstate_register_any(NULL, &vmstate_arm_timer, s); > return s; > } > > diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c > index 9dc3c61b5a..a5ea3be414 100644 > --- a/hw/virtio/virtio-mem.c > +++ b/hw/virtio/virtio-mem.c > @@ -1119,8 +1119,8 @@ static void virtio_mem_device_realize(DeviceState *dev, Error **errp) > host_memory_backend_set_mapped(vmem->memdev, true); > vmstate_register_ram(&vmem->memdev->mr, DEVICE(vmem)); > if (vmem->early_migration) { > - vmstate_register(VMSTATE_IF(vmem), VMSTATE_INSTANCE_ID_ANY, > - &vmstate_virtio_mem_device_early, vmem); > + vmstate_register_any(VMSTATE_IF(vmem), > + &vmstate_virtio_mem_device_early, vmem); > } > qemu_register_reset(virtio_mem_system_reset, vmem); >
diff --git a/backends/dbus-vmstate.c b/backends/dbus-vmstate.c index 57369ec0f2..a9d8cb0acd 100644 --- a/backends/dbus-vmstate.c +++ b/backends/dbus-vmstate.c @@ -426,8 +426,7 @@ dbus_vmstate_complete(UserCreatable *uc, Error **errp) return; } - if (vmstate_register(VMSTATE_IF(self), VMSTATE_INSTANCE_ID_ANY, - &dbus_vmstate, self) < 0) { + if (vmstate_register_any(VMSTATE_IF(self), &dbus_vmstate, self) < 0) { error_setg(errp, "Failed to register vmstate"); } } diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index 402a2d6312..8920b75251 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -978,8 +978,7 @@ static void tpm_emulator_inst_init(Object *obj) qemu_add_vm_change_state_handler(tpm_emulator_vm_state_change, tpm_emu); - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, - &vmstate_tpm_emulator, obj); + vmstate_register_any(NULL, &vmstate_tpm_emulator, obj); } /* diff --git a/hw/i2c/core.c b/hw/i2c/core.c index bed594fe59..879a1d45cb 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -64,7 +64,7 @@ I2CBus *i2c_init_bus(DeviceState *parent, const char *name) bus = I2C_BUS(qbus_new(TYPE_I2C_BUS, parent, name)); QLIST_INIT(&bus->current_devs); QSIMPLEQ_INIT(&bus->pending_masters); - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_i2c_bus, bus); + vmstate_register_any(NULL, &vmstate_i2c_bus, bus); return bus; } diff --git a/hw/input/adb.c b/hw/input/adb.c index 214ae6f42b..8aed0da2cd 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -247,7 +247,7 @@ static void adb_bus_realize(BusState *qbus, Error **errp) adb_bus->autopoll_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, adb_autopoll, adb_bus); - vmstate_register(NULL, -1, &vmstate_adb_bus, adb_bus); + vmstate_register_any(NULL, &vmstate_adb_bus, adb_bus); } static void adb_bus_unrealize(BusState *qbus) diff --git a/hw/input/ads7846.c b/hw/input/ads7846.c index dc0998ac79..91116c6bdb 100644 --- a/hw/input/ads7846.c +++ b/hw/input/ads7846.c @@ -158,7 +158,7 @@ static void ads7846_realize(SSIPeripheral *d, Error **errp) ads7846_int_update(s); - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_ads7846, s); + vmstate_register_any(NULL, &vmstate_ads7846, s); } static void ads7846_class_init(ObjectClass *klass, void *data) diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c index e6ee5e11f1..a58721c8cd 100644 --- a/hw/input/stellaris_input.c +++ b/hw/input/stellaris_input.c @@ -88,6 +88,5 @@ void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode) } s->num_buttons = n; qemu_add_kbd_event_handler(stellaris_gamepad_put_key, s); - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, - &vmstate_stellaris_gamepad, s); + vmstate_register_any(NULL, &vmstate_stellaris_gamepad, s); } diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index dc07984ae9..94ce9e18ff 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -1883,8 +1883,7 @@ static void e100_nic_realize(PCIDevice *pci_dev, Error **errp) s->vmstate = g_memdup(&vmstate_eepro100, sizeof(vmstate_eepro100)); s->vmstate->name = qemu_get_queue(s->nic)->model; - vmstate_register(VMSTATE_IF(&pci_dev->qdev), VMSTATE_INSTANCE_ID_ANY, - s->vmstate, s); + vmstate_register_any(VMSTATE_IF(&pci_dev->qdev), s->vmstate, s); } static void eepro100_instance_init(Object *obj) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index b0d21bf43a..294c3c38ea 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -147,7 +147,7 @@ static void pci_bus_realize(BusState *qbus, Error **errp) bus->machine_done.notify = pcibus_machine_done; qemu_add_machine_init_done_notifier(&bus->machine_done); - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_pcibus, bus); + vmstate_register_any(NULL, &vmstate_pcibus, bus); } static void pcie_bus_realize(BusState *qbus, Error **errp) diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c index b2f009c816..ad7afe7544 100644 --- a/hw/ppc/spapr_nvdimm.c +++ b/hw/ppc/spapr_nvdimm.c @@ -876,8 +876,7 @@ static void spapr_nvdimm_realize(NVDIMMDevice *dimm, Error **errp) s_nvdimm->hcall_flush_required = true; } - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, - &vmstate_spapr_nvdimm_states, dimm); + vmstate_register_any(NULL, &vmstate_spapr_nvdimm_states, dimm); } static void spapr_nvdimm_unrealize(NVDIMMDevice *dimm) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 69c8863472..9afe8da831 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -181,7 +181,7 @@ static arm_timer_state *arm_timer_init(uint32_t freq) s->control = TIMER_CTRL_IE; s->timer = ptimer_init(arm_timer_tick, s, PTIMER_POLICY_LEGACY); - vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_arm_timer, s); + vmstate_register_any(NULL, &vmstate_arm_timer, s); return s; } diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 9dc3c61b5a..a5ea3be414 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -1119,8 +1119,8 @@ static void virtio_mem_device_realize(DeviceState *dev, Error **errp) host_memory_backend_set_mapped(vmem->memdev, true); vmstate_register_ram(&vmem->memdev->mr, DEVICE(vmem)); if (vmem->early_migration) { - vmstate_register(VMSTATE_IF(vmem), VMSTATE_INSTANCE_ID_ANY, - &vmstate_virtio_mem_device_early, vmem); + vmstate_register_any(VMSTATE_IF(vmem), + &vmstate_virtio_mem_device_early, vmem); } qemu_register_reset(virtio_mem_system_reset, vmem);
This are the easiest cases, where we were already using VMSTATE_INSTANCE_ID_ANY. Signed-off-by: Juan Quintela <quintela@redhat.com> --- backends/dbus-vmstate.c | 3 +-- backends/tpm/tpm_emulator.c | 3 +-- hw/i2c/core.c | 2 +- hw/input/adb.c | 2 +- hw/input/ads7846.c | 2 +- hw/input/stellaris_input.c | 3 +-- hw/net/eepro100.c | 3 +-- hw/pci/pci.c | 2 +- hw/ppc/spapr_nvdimm.c | 3 +-- hw/timer/arm_timer.c | 2 +- hw/virtio/virtio-mem.c | 4 ++-- 11 files changed, 12 insertions(+), 17 deletions(-)