| Message ID | 1411559299-19042-13-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
Il 24/09/2014 13:48, Igor Mammedov ha scritto: > it will be used in shallow conversion from legacy hotplug > mechanism and eventually replace all the uses of old mechanism > DeviceClass->unplug = qdev_simple_unplug_cb() > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/core/qdev.c | 5 +++++ > include/hw/qdev-core.h | 2 ++ > 2 files changed, 7 insertions(+) > > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index c89d781..1d1b113 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -286,6 +286,11 @@ int qdev_simple_unplug_cb(DeviceState *dev) > return 0; > } > > +void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > +{ > + qdev_simple_unplug_cb(dev); > +} > > /* Like qdev_init(), but terminate program via error_report() instead of > returning an error value. This is okay during machine creation. > diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h > index 48a96d2..ba812c5 100644 > --- a/include/hw/qdev-core.h > +++ b/include/hw/qdev-core.h > @@ -265,6 +265,8 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, > int required_for_version); > void qdev_unplug(DeviceState *dev, Error **errp); > int qdev_simple_unplug_cb(DeviceState *dev); > +void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp); > void qdev_machine_creation_done(void); > bool qdev_machine_modified(void); > > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index c89d781..1d1b113 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -286,6 +286,11 @@ int qdev_simple_unplug_cb(DeviceState *dev) return 0; } +void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + qdev_simple_unplug_cb(dev); +} /* Like qdev_init(), but terminate program via error_report() instead of returning an error value. This is okay during machine creation. diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 48a96d2..ba812c5 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -265,6 +265,8 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, int required_for_version); void qdev_unplug(DeviceState *dev, Error **errp); int qdev_simple_unplug_cb(DeviceState *dev); +void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp); void qdev_machine_creation_done(void); bool qdev_machine_modified(void);
it will be used in shallow conversion from legacy hotplug mechanism and eventually replace all the uses of old mechanism DeviceClass->unplug = qdev_simple_unplug_cb() Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- hw/core/qdev.c | 5 +++++ include/hw/qdev-core.h | 2 ++ 2 files changed, 7 insertions(+)