Commit bc5c4f21 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Juan Quintela
Browse files

vmstate_register_with_alias_id: Take an Error ** 



I'll be adding an error to it in a subsequent patch.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Message-Id: <20170202125956.21942-2-dgilbert@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent b4b076da

hw/core/qdev.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {

hw/intc/apic_common.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/migration/vmstate.h

+3 −2
Original line number Diff line number Diff line
@@ -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,

migration/savevm.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

stubs/vmstate.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

}