ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qdev: ignore GlobalProperty.errp for hotplugged devices 

This patch ensures QEMU won't terminate while hotplugging a device if the
global property cannot be set and errp points to error_fatal or error_abort.

While here, it also fixes indentation of the typename argument.

Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Greg Kurz 2016-07-21 23:58:37 +02:00 committed by Eduardo Habkost
parent 78a3930685
commit b3443f43f4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/core/qdev-properties.c
View File

@ -1084,7 +1084,7 @@ int qdev_prop_check_globals(void)
} }
static void qdev_prop_set_globals_for_type(DeviceState *dev, static void qdev_prop_set_globals_for_type(DeviceState *dev,
const char *typename) const char *typename)
{ {
GList *l; GList *l;
@ -1100,7 +1100,7 @@ static void qdev_prop_set_globals_for_type(DeviceState *dev,
if (err != NULL) { if (err != NULL) {
error_prepend(&err, "can't apply global %s.%s=%s: ", error_prepend(&err, "can't apply global %s.%s=%s: ",
prop->driver, prop->property, prop->value); prop->driver, prop->property, prop->value);
if (prop->errp) { if (!dev->hotplugged && prop->errp) {
error_propagate(prop->errp, err); error_propagate(prop->errp, err);
} else { } else {
assert(prop->user_provided); assert(prop->user_provided);

4
include/hw/qdev-core.h
View File

@ -261,7 +261,9 @@ struct PropertyInfo {
* @used: Set to true if property was used when initializing a device. * @used: Set to true if property was used when initializing a device.
* @errp: Error destination, used like first argument of error_setg() * @errp: Error destination, used like first argument of error_setg()
* in case property setting fails later. If @errp is NULL, we * in case property setting fails later. If @errp is NULL, we
* print warnings instead of ignoring errors silently. * print warnings instead of ignoring errors silently. For
* hotplugged devices, errp is always ignored and warnings are
* printed instead.
*/ */
typedef struct GlobalProperty { typedef struct GlobalProperty {
const char *driver; const char *driver;