diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-02-02 12:59:54 +0000 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-02-06 13:36:49 +0100 |
| commit | bc5c4f21966977c4ff00ae77979b95a2b39142a3 (patch) | |
| tree | eeb36b5d488465ce493ed5926bac13f4a9208348 | |
| parent | b4b076daf324894dd288cbdb67ff1e3c7434df7b (diff) | |
vmstate_register_with_alias_id: Take an Error **
I'll be adding an error to it in a subsequent patch.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20170202125956.21942-2-dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | hw/core/qdev.c | 3 | ||||
| -rw-r--r-- | hw/intc/apic_common.c | 2 | ||||
| -rw-r--r-- | include/migration/vmstate.h | 5 | ||||
| -rw-r--r-- | migration/savevm.c | 3 | ||||
| -rw-r--r-- | stubs/vmstate.c | 3 |
5 files changed, 10 insertions, 6 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 57834423b9..ea97b15f45 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -935,7 +935,8 @@ 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); + dev->alias_required_for_version, + NULL); } 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) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 3bbe3ed984..c38b00a6f1 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -988,14 +988,15 @@ bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque); 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); static inline int vmstate_register(DeviceState *dev, int instance_id, const VMStateDescription *vmsd, void *opaque) { return vmstate_register_with_alias_id(dev, instance_id, vmsd, - opaque, -1, 0); + opaque, -1, 0, NULL); } void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd, diff --git a/migration/savevm.c b/migration/savevm.c index f3644ca1d7..b11b4a22bf 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -656,7 +656,8 @@ void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque) int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, const VMStateDescription *vmsd, void *opaque, int alias_id, - int required_for_version) + int required_for_version, + Error **errp) { SaveStateEntry *se; 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; } |