diff options
| author | Greg Kurz <groug@kaod.org> | 2016-07-21 23:58:37 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-07-27 11:25:06 -0300 |
| commit | b3443f43f45e06971d87c985bb0316c1e40259c9 (patch) | |
| tree | aa46a4cdab5f81f177e7d938e6bbbf9910b5c8bf /hw/core/qdev-properties.c | |
| parent | 78a3930685c3159c4b8f953bd9f9e7a28655d823 (diff) | |
| download | focaccia-qemu-b3443f43f45e06971d87c985bb0316c1e40259c9.tar.gz focaccia-qemu-b3443f43f45e06971d87c985bb0316c1e40259c9.zip | |
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>
Diffstat (limited to 'hw/core/qdev-properties.c')
| -rw-r--r-- | hw/core/qdev-properties.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 14e544ab17..311af6da76 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1084,7 +1084,7 @@ int qdev_prop_check_globals(void) } static void qdev_prop_set_globals_for_type(DeviceState *dev, - const char *typename) + const char *typename) { GList *l; @@ -1100,7 +1100,7 @@ static void qdev_prop_set_globals_for_type(DeviceState *dev, if (err != NULL) { error_prepend(&err, "can't apply global %s.%s=%s: ", prop->driver, prop->property, prop->value); - if (prop->errp) { + if (!dev->hotplugged && prop->errp) { error_propagate(prop->errp, err); } else { assert(prop->user_provided); |