ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Dr. David Alan Gilbert 2017-02-02 12:59:54 +00:00 committed by Juan Quintela
parent b4b076daf3
commit bc5c4f2196
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/core/qdev.c
View File

@ -935,7 +935,8 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
if (qdev_get_vmsd(dev)) { if (qdev_get_vmsd(dev)) {
vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev, vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev,
dev->instance_id_alias, dev->instance_id_alias,
dev->alias_required_for_version); dev->alias_required_for_version,
NULL);
} }
QLIST_FOREACH(bus, &dev->child_bus, sibling) { QLIST_FOREACH(bus, &dev->child_bus, sibling) {

2
hw/intc/apic_common.c
View File

@ -329,7 +329,7 @@ static void apic_common_realize(DeviceState *dev, Error **errp)
instance_id = -1; instance_id = -1;
} }
vmstate_register_with_alias_id(NULL, instance_id, &vmstate_apic_common, 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) static void apic_common_unrealize(DeviceState *dev, Error **errp)

5
include/migration/vmstate.h
View File

@ -988,14 +988,15 @@ bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque);
int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,
const VMStateDescription *vmsd, const VMStateDescription *vmsd,
void *base, int alias_id, 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, static inline int vmstate_register(DeviceState *dev, int instance_id,
const VMStateDescription *vmsd, const VMStateDescription *vmsd,
void *opaque) void *opaque)
{ {
return vmstate_register_with_alias_id(dev, instance_id, vmsd, 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, void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd,

3
migration/savevm.c
View File

@ -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, int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,
const VMStateDescription *vmsd, const VMStateDescription *vmsd,
void *opaque, int alias_id, void *opaque, int alias_id,
int required_for_version) int required_for_version,
Error **errp)
{ {
SaveStateEntry *se; SaveStateEntry *se;

3
stubs/vmstate.c
View File

@ -8,7 +8,8 @@ int vmstate_register_with_alias_id(DeviceState *dev,
int instance_id, int instance_id,
const VMStateDescription *vmsd, const VMStateDescription *vmsd,
void *base, int alias_id, void *base, int alias_id,
int required_for_version) int required_for_version,
Error **errp)
{ {
return 0; return 0;
} }