diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-07 15:29:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-07 15:29:26 +0000 |
| commit | d0dff238a87fa81393ed72754d4dc8b09e50b08b (patch) | |
| tree | 56c8b09d2ccb16b4dd2a574a2471e9b00b8316a9 /stubs/vmstate.c | |
| parent | 3c457da147e14a45ea8c363e4e190066763973ff (diff) | |
| parent | ef8d6488d2767fe81bb4bb9bcdc52af5ff718b56 (diff) | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170206' into staging
migration/next for 20170206
# gpg: Signature made Mon 06 Feb 2017 16:13:26 GMT
# gpg: using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723
* remotes/juanquintela/tags/migration/20170206:
postcopy: Recover block devices on early failure
Postcopy: Reset state to avoid cleanup assert
vmstate registration: check return values
migration: Check for ID length
vmstate_register_with_alias_id: Take an Error **
migration: create Migration Incoming State at init time
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'stubs/vmstate.c')
| -rw-r--r-- | stubs/vmstate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stubs/vmstate.c b/stubs/vmstate.c index 65906271d2..bbe158fe3b 100644 --- a/stubs/vmstate.c +++ b/stubs/vmstate.c @@ -8,7 +8,8 @@ int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, const VMStateDescription *vmsd, void *base, int alias_id, - int required_for_version) + int required_for_version, + Error **errp) { return 0; } |