diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-07-03 16:45:34 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-07-06 09:13:54 +0300 |
| commit | 319627006a8f4c43b3618932ccac615c4662dfdc (patch) | |
| tree | f962bba62008d10c71535ec69ec3a7d74c880d05 | |
| parent | b7c9285b8d60d1b235a2ef03d48168d372367c5a (diff) | |
| download | qemu-319627006a8f4c43b3618932ccac615c4662dfdc.zip qemu-319627006a8f4c43b3618932ccac615c4662dfdc.tar.gz qemu-319627006a8f4c43b3618932ccac615c4662dfdc.tar.bz2 | |
qdev: Don't abort() in case globals can't be set
It would be much better if we didn't terminate QEMU inside
device_post_init(), but at least exiting cleanly is better than aborting
and dumping core.
Before this patch:
$ qemu-system-x86_64 -global cpu.xxx=y
qemu-system-x86_64: Property '.xxx' not found
Aborted (core dumped)
After this patch:
$ qemu-system-x86_64 -global cpu.xxx=y
qemu-system-x86_64: Property '.xxx' not found
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-By: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | hw/core/qdev.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 3bdda8e..da1ba48 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -957,7 +957,13 @@ static void device_initfn(Object *obj) static void device_post_init(Object *obj) { - qdev_prop_set_globals(DEVICE(obj), &error_abort); + Error *err = NULL; + qdev_prop_set_globals(DEVICE(obj), &err); + if (err) { + qerror_report_err(err); + error_free(err); + exit(EXIT_FAILURE); + } } /* Unlink device from bus and free the structure. */ |