| Message ID | 56ec427cdaf204091bae2df63b63a7baba88ba9b.1424912878.git.zhugh.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Feb 26, 2015 at 09:16:50AM +0800, Zhu Guihua wrote: > Memory hotplug code will use qdev_get_hotplug_handler(). > > Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com> don't send patches like this pls. Just merge this with code that uses it. > --- > hw/core/qdev.c | 2 +- > include/hw/qdev-core.h | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 2eacac0..2f3d1df 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -273,7 +273,7 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, > dev->alias_required_for_version = required_for_version; > } > > -static HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) > +HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) > { > HotplugHandler *hotplug_ctrl = NULL; > > diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h > index 15a226f..03d6239 100644 > --- a/include/hw/qdev-core.h > +++ b/include/hw/qdev-core.h > @@ -266,6 +266,7 @@ int qdev_init(DeviceState *dev) QEMU_WARN_UNUSED_RESULT; > void qdev_init_nofail(DeviceState *dev); > void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, > int required_for_version); > +HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev); > void qdev_unplug(DeviceState *dev, Error **errp); > void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp); > -- > 1.9.3
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 2eacac0..2f3d1df 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -273,7 +273,7 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, dev->alias_required_for_version = required_for_version; } -static HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) +HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) { HotplugHandler *hotplug_ctrl = NULL; diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 15a226f..03d6239 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -266,6 +266,7 @@ int qdev_init(DeviceState *dev) QEMU_WARN_UNUSED_RESULT; void qdev_init_nofail(DeviceState *dev); void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, int required_for_version); +HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev); void qdev_unplug(DeviceState *dev, Error **errp); void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp);
Memory hotplug code will use qdev_get_hotplug_handler(). Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com> --- hw/core/qdev.c | 2 +- include/hw/qdev-core.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)