diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-28 12:56:33 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-28 12:56:34 +0100 |
| commit | 13de54eedd40a1b01fa7176dfb96d1c22c5cfa71 (patch) | |
| tree | 6662ce703da44cec201298be591d4a263d027999 /qom/object.c | |
| parent | a41b2c995b52b2ce26c171c52ac7dc11c7dccd99 (diff) | |
| parent | 0b9f0e2fd7c5070fa06cd6bd5ec69055e3a7d2b1 (diff) | |
| download | focaccia-qemu-13de54eedd40a1b01fa7176dfb96d1c22c5cfa71.tar.gz focaccia-qemu-13de54eedd40a1b01fa7176dfb96d1c22c5cfa71.zip | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp: monitor: fix qmp_getfd() fd leak in error case HMP: support specifying dump format for dump-guest-memory HMP: fix doc of dump-guest-memory qmp: object-add: Validate class before creating object monitor: Add device_add and device_del completion. monitor: Add command_completion callback to mon_cmd_t. monitor: Fix drive_del id argument type completion. error: Remove some unused headers qerror.h: Replace QERR_NOT_SUPPORTED with QERR_UNSUPPORTED qerror.h: Remove QERR defines that are only used once qerror.h: Remove unused error classes error: Print error_report() to stderr if using qmp monitor: Remove unused monitor_print_filename error: Privatize error_print_loc vnc: Remove default_mon usage slirp: Remove default_mon usage Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom/object.c')
| -rw-r--r-- | qom/object.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qom/object.c b/qom/object.c index 9a730e74c1..e42b254303 100644 --- a/qom/object.c +++ b/qom/object.c @@ -768,7 +768,7 @@ ObjectProperty *object_property_find(Object *obj, const char *name, } } - error_set(errp, QERR_PROPERTY_NOT_FOUND, "", name); + error_setg(errp, "Property '.%s' not found", name); return NULL; } @@ -1075,7 +1075,8 @@ static Object *object_resolve_link(Object *obj, const char *name, target = object_resolve_path_type(path, target_type, &ambiguous); if (ambiguous) { - error_set(errp, QERR_AMBIGUOUS_PATH, path); + error_set(errp, ERROR_CLASS_GENERIC_ERROR, + "Path '%s' does not uniquely identify an object", path); } else if (!target) { target = object_resolve_path(path, &ambiguous); if (target || ambiguous) { |