diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-11 14:52:08 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 18:44:21 +0300 |
| commit | b7b34d055d82abaa511b35c9fc24efbb63dca0b1 (patch) | |
| tree | 8cc5097e1ef8a65e729f2ebae9b0160211c52524 /hw/core/qdev.c | |
| parent | 0d156683f667ef20fa20abc21e85ee776e6c1472 (diff) | |
| download | focaccia-qemu-b7b34d055d82abaa511b35c9fc24efbb63dca0b1.tar.gz focaccia-qemu-b7b34d055d82abaa511b35c9fc24efbb63dca0b1.zip | |
qdev: reorganize error reporting in bus_set_realized
No semantic change. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Tested-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | hw/core/qdev.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 3226a71d30..65aa041285 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -573,27 +573,19 @@ static void bus_set_realized(Object *obj, bool value, Error **errp) if (value && !bus->realized) { if (bc->realize) { bc->realize(bus, &local_err); - - if (local_err != NULL) { - goto error; - } - } } else if (!value && bus->realized) { if (bc->unrealize) { bc->unrealize(bus, &local_err); - - if (local_err != NULL) { - goto error; - } } } - bus->realized = value; - return; + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } -error: - error_propagate(errp, local_err); + bus->realized = value; } void qbus_create_inplace(void *bus, size_t size, const char *typename, |