Commit d7650eab authored by Andreas Färber's avatar Andreas Färber
Browse files

vmstate: Make vmstate_register() static inline 



This avoids adding a duplicate stub for CONFIG_USER_ONLY.

Suggested-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent b350ab75

include/migration/vmstate.h

+10 −2
Original line number Diff line number Diff line
@@ -638,12 +638,20 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, 
                       void *opaque, int version_id);

void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,

                        void *opaque);

int vmstate_register(DeviceState *dev, int instance_id,

                     const VMStateDescription *vmsd, void *base);



int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,

                                   const VMStateDescription *vmsd,

                                   void *base, int alias_id,

                                   int required_for_version);



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);

}



void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd,

                        void *opaque);

savevm.c

+0 −7
Original line number Diff line number Diff line
@@ -1423,13 +1423,6 @@ int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, 
    return 0;

}



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);

}



void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd,

                        void *opaque)

{