diff options
| author | Peter Maydell | 2017-02-07 16:29:26 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-02-07 16:29:26 +0100 |
| commit | d0dff238a87fa81393ed72754d4dc8b09e50b08b (patch) | |
| tree | 56c8b09d2ccb16b4dd2a574a2471e9b00b8316a9 /hw | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20170206' into staging (diff) | |
| parent | postcopy: Recover block devices on early failure (diff) | |
| download | qemu-d0dff238a87fa81393ed72754d4dc8b09e50b08b.tar.gz qemu-d0dff238a87fa81393ed72754d4dc8b09e50b08b.tar.xz qemu-d0dff238a87fa81393ed72754d4dc8b09e50b08b.zip | |
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 'hw')
| -rw-r--r-- | hw/core/qdev.c | 9 | ||||
| -rw-r--r-- | hw/intc/apic_common.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 57834423b9..06ba02e2a3 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -933,9 +933,12 @@ static void device_set_realized(Object *obj, bool value, Error **errp) } if (qdev_get_vmsd(dev)) { - vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev, - dev->instance_id_alias, - dev->alias_required_for_version); + if (vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev, + dev->instance_id_alias, + dev->alias_required_for_version, + &local_err) < 0) { + goto post_realize_fail; + } } QLIST_FOREACH(bus, &dev->child_bus, sibling) { diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 17df24c9d0..6ce8ef744a 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -329,7 +329,7 @@ static void apic_common_realize(DeviceState *dev, Error **errp) instance_id = -1; } vmstate_register_with_alias_id(NULL, instance_id, &vmstate_apic_common, - s, -1, 0); + s, -1, 0, NULL); } static void apic_common_unrealize(DeviceState *dev, Error **errp) |