Hi
This series are based in a patch from Peter than check if a we try to
register the same device with the same instance_id more than once. It
was not merged when he sent it because it broke "make check". So I
fixed all devices to be able to merge it.
- I create vmstate_register_any(), its the same that
vmstate_register(VMSTATE_INSTANCE_ID_ANY)
- Later I check in vmstate_register() that they are not calling it
with VMSTATE_INSTANCE_ID_ANY
- After that I change vmstate_register() to make sure that we don't
include a duplicate.
And we get all the errors that I change in patches 3, 4, 5, 6, 7.
After those patches: make check works again.
And then I reviewed all the rest of vmstate_register() callers.
There are the cases where they pass a device_id that is generated
somehow, that ones are ok.
Then we have the ones that pass always 0. This ones are only valid
when there is a maximum of one device instantiated for a given
machine.
- audio: you can choose more than one audio output.
- eeprom93xx: you can have more than one e100 card.
- vmware_vga: I am not completely sure here, it appears that you could
have more than one. Notice that VMSTATE_INSTANCE_ID_ANY will give
us the value 0 if there is only one instance, so we are in no
trouble. We can drop it if people think that we can't have more
than one vmware_vga.
- for the rest of the devices, I can't see any that can be
instantiated more than once (testing it is easy, just starting the
machine will make it fail). Notice that again, for the same
reasoning, we could change all the calls to _any(). And only left
the vmstate_register(... 0 ...) calls for devices that we know that
we only ever want one.
What needs to be done:
- icp/server: We need to rename the old icp server name. Notice that
I doubt that anyone is migrating this, but I need help from PPC
experts. As said in the commit message, it is "abusing" the interface:
- it register a new device
- it realizes that it is instantiting an old beard
- it unregister the new device
- it registers the old device
- rest of devices:
* pxa2xx devices: I can't see how you can create more than one
device in a machine
* acpi_build: I can't see how to create more than once.
* replay: neither
* cpu timers: created in vl.c
* global_state: only once
* s390 css: not a way that I can think
* spapr: looks only one
* or1ktimer: I can only see one
* tsc*: I see only use in pxa2xx and one by board
- And now, another abuser:
vmstate_register(VMSTATE_IF(tcet), tcet->liobn, &vmstate_spapr_tce_table,
tcet->liobn is an uint32_t, and instance_id is an int. And it just happens
that is value is < VMSTATE_INSTANCE_ID_ANY.
Please, review.
Juan Quintela (12):
migration: Create vmstate_register_any()
migration: Use vmstate_register_any()
migration: Use vmstate_register_any() for isa-ide
migration: Use vmstate_register_any() for ipmi-bt*
migration: Use VMSTATE_INSTANCE_ID_ANY for slirp
migration: Use VMSTATE_INSTANCE_ID_ANY for s390 devices
RFC migration: icp/server is a mess
migration: vmstate_register() check that instance_id is valid
migration: Improve example and documentation of vmstate_register()
migration: Use vmstate_register_any() for audio
migration: Use vmstate_register_any() for eeprom93xx
migration: Use vmstate_register_any() for vmware_vga
Peter Xu (1):
migration: Check in savevm_state_handler_insert for dups
docs/devel/migration.rst | 12 ++++++++----
include/migration/vmstate.h | 23 +++++++++++++++++++++++
audio/audio.c | 2 +-
backends/dbus-vmstate.c | 3 +--
backends/tpm/tpm_emulator.c | 3 +--
hw/display/vmware_vga.c | 2 +-
hw/i2c/core.c | 2 +-
hw/ide/isa.c | 2 +-
hw/input/adb.c | 2 +-
hw/input/ads7846.c | 2 +-
hw/input/stellaris_input.c | 3 +--
hw/ipmi/ipmi_bmc_extern.c | 2 +-
hw/ipmi/ipmi_bmc_sim.c | 2 +-
hw/ipmi/isa_ipmi_bt.c | 2 +-
hw/ipmi/isa_ipmi_kcs.c | 2 +-
hw/net/eepro100.c | 3 +--
hw/nvram/eeprom93xx.c | 2 +-
hw/pci/pci.c | 2 +-
hw/ppc/spapr.c | 7 ++++++-
hw/ppc/spapr_nvdimm.c | 3 +--
hw/s390x/s390-skeys.c | 3 ++-
hw/s390x/s390-stattrib.c | 3 ++-
hw/timer/arm_timer.c | 2 +-
hw/virtio/virtio-mem.c | 4 ++--
migration/savevm.c | 14 ++++++++++++++
net/slirp.c | 5 +++--
26 files changed, 78 insertions(+), 34 deletions(-)
--
2.41.0
