diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-16 11:06:06 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-16 11:06:06 +0100 |
commit | 0bbac62618356794097b99a9b8b7634357170b03 (patch) | |
tree | 3861bb55883487e6d57385ee750d675c6e37c27e /hw/pci-bridge/xio3130_upstream.c | |
parent | 06a59afac4505f5ed942db4200e5ca16fcbba74d (diff) | |
parent | db80facefa62dff42bb50c73b0f03eda5f732b49 (diff) |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140616' into staging
migration/next for 20140616
# gpg: Signature made Mon 16 Jun 2014 04:10:18 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found
* remotes/juanquintela/tags/migration/20140616:
migration: catch unknown flags in ram_load
rdma: Fix block during rdma migration
migration: Increase default max_downtime from 30ms to 300ms
vmstate: Refactor opening of files
savevm: Remove all the unneeded version_minimum_id_old (x86)
savevm: Remove all the unneeded version_minimum_id_old (ppc)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pci-bridge/xio3130_upstream.c')
-rw-r--r-- | hw/pci-bridge/xio3130_upstream.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c index 59f97f6ff1..eada5828af 100644 --- a/hw/pci-bridge/xio3130_upstream.c +++ b/hw/pci-bridge/xio3130_upstream.c @@ -131,7 +131,6 @@ static const VMStateDescription vmstate_xio3130_upstream = { .name = "xio3130-express-upstream-port", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .fields = (VMStateField[]) { VMSTATE_PCIE_DEVICE(parent_obj.parent_obj, PCIEPort), VMSTATE_STRUCT(parent_obj.parent_obj.exp.aer_log, PCIEPort, 0, |