* Marc-André Lureau (marcandre.lur...@redhat.com) wrote: > Add an interface to get the instance id, instead of depending on > Device and qdev_get_dev_path(). > > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> > --- > hw/core/Makefile.objs | 1 + > hw/core/qdev.c | 14 ++++++++++++++ > hw/core/vmstate-if.c | 23 +++++++++++++++++++++++ > include/hw/vmstate-if.h | 32 ++++++++++++++++++++++++++++++++ > include/migration/register.h | 2 ++ > include/migration/vmstate.h | 2 ++ > tests/Makefile.include | 1 + > 7 files changed, 75 insertions(+) > create mode 100644 hw/core/vmstate-if.c > create mode 100644 include/hw/vmstate-if.h > > diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs > index fd0550d1d9..0edd9e635d 100644 > --- a/hw/core/Makefile.objs > +++ b/hw/core/Makefile.objs > @@ -9,6 +9,7 @@ common-obj-y += hotplug.o > common-obj-$(CONFIG_SOFTMMU) += nmi.o > common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o > common-obj-y += cpu.o > +common-obj-y += vmstate-if.o > > common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o > common-obj-$(CONFIG_XILINX_AXI) += stream.o > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 60d66c2f39..7e083dfcae 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -1047,9 +1047,18 @@ static void device_unparent(Object *obj) > } > } > > +static char * > +device_vmstate_if_get_id(VMStateIf *obj) > +{ > + DeviceState *dev = DEVICE(obj); > + > + return qdev_get_dev_path(dev); > +} > + > static void device_class_init(ObjectClass *class, void *data) > { > DeviceClass *dc = DEVICE_CLASS(class); > + VMStateIfClass *vc = VMSTATE_IF_CLASS(class); > > class->unparent = device_unparent; > > @@ -1061,6 +1070,7 @@ static void device_class_init(ObjectClass *class, void > *data) > */ > dc->hotpluggable = true; > dc->user_creatable = true; > + vc->get_id = device_vmstate_if_get_id; > } > > void device_class_set_parent_reset(DeviceClass *dc, > @@ -1118,6 +1128,10 @@ static const TypeInfo device_type_info = { > .class_init = device_class_init, > .abstract = true, > .class_size = sizeof(DeviceClass), > + .interfaces = (InterfaceInfo[]) { > + { TYPE_VMSTATE_IF }, > + { } > + } > }; > > static void qdev_register_types(void) > diff --git a/hw/core/vmstate-if.c b/hw/core/vmstate-if.c > new file mode 100644 > index 0000000000..d0b2392b0a > --- /dev/null > +++ b/hw/core/vmstate-if.c > @@ -0,0 +1,23 @@ > +/* > + * VMState interface > + * > + * Copyright (c) 2009-2017 Red Hat Inc
You might want to update the years; but other than from the migration side this looks OK to me, but it needs checking by a QOM person. Acked-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/vmstate-if.h" > + > +static const TypeInfo vmstate_if_info = { > + .name = TYPE_VMSTATE_IF, > + .parent = TYPE_INTERFACE, > + .class_size = sizeof(VMStateIfClass), > +}; > + > +static void vmstate_register_types(void) > +{ > + type_register_static(&vmstate_if_info); > +} > + > +type_init(vmstate_register_types); > diff --git a/include/hw/vmstate-if.h b/include/hw/vmstate-if.h > new file mode 100644 > index 0000000000..92682f5bc2 > --- /dev/null > +++ b/include/hw/vmstate-if.h > @@ -0,0 +1,32 @@ > +#ifndef VMSTATE_IF_H > +#define VMSTATE_IF_H > + > +#include "qom/object.h" > + > +#define TYPE_VMSTATE_IF "vmstate-if" > + > +#define VMSTATE_IF_CLASS(klass) \ > + OBJECT_CLASS_CHECK(VMStateIfClass, (klass), TYPE_VMSTATE_IF) > +#define VMSTATE_IF_GET_CLASS(obj) \ > + OBJECT_GET_CLASS(VMStateIfClass, (obj), TYPE_VMSTATE_IF) > +#define VMSTATE_IF(obj) \ > + INTERFACE_CHECK(VMStateIf, (obj), TYPE_VMSTATE_IF) > + > +typedef struct VMStateIf VMStateIf; > + > +typedef struct VMStateIfClass { > + InterfaceClass parent_class; > + > + char * (*get_id)(VMStateIf *obj); > +} VMStateIfClass; > + > +static inline char *vmstate_if_get_id(VMStateIf *vmif) > +{ > + if (!vmif) { > + return NULL; > + } > + > + return VMSTATE_IF_GET_CLASS(vmif)->get_id(vmif); > +} > + > +#endif /* VMSTATE_IF_H */ > diff --git a/include/migration/register.h b/include/migration/register.h > index 3d0b9833c6..74f1578b29 100644 > --- a/include/migration/register.h > +++ b/include/migration/register.h > @@ -14,6 +14,8 @@ > #ifndef MIGRATION_REGISTER_H > #define MIGRATION_REGISTER_H > > +#include "hw/vmstate-if.h" > + > typedef struct SaveVMHandlers { > /* This runs inside the iothread lock. */ > SaveStateHandler *save_state; > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index 1fbfd099dd..bdcf8a1652 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -27,6 +27,8 @@ > #ifndef QEMU_VMSTATE_H > #define QEMU_VMSTATE_H > > +#include "hw/vmstate-if.h" > + > typedef struct VMStateInfo VMStateInfo; > typedef struct VMStateField VMStateField; > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index f5ac09549c..d4502a30eb 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -566,6 +566,7 @@ tests/test-qdev-global-props$(EXESUF): > tests/test-qdev-global-props.o \ > hw/core/irq.o \ > hw/core/fw-path-provider.o \ > hw/core/reset.o \ > + hw/core/vmstate-if.o \ > $(test-qapi-obj-y) > tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ > migration/vmstate.o migration/vmstate-types.o migration/qemu-file.o \ > -- > 2.23.0 > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK