From 085a89bef5de5f66a37b29e5fb505e36950b344a Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Sat, 17 Feb 2018 18:03:32 -0500 Subject: [PATCH] error: More error_setg() usage A few uses of error_set(ERROR_CLASS_GENERIC_ERROR) were missed in c6bd8c706, or have snuck in since. Nuke them. Backports commit 455b0fde8c38a0794743e2e7c1a40018b7bee9f6 from qemu --- qemu/qom/object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu/qom/object.c b/qemu/qom/object.c index 2db48cd0..66fa6c48 100644 --- a/qemu/qom/object.c +++ b/qemu/qom/object.c @@ -1110,8 +1110,8 @@ static Object *object_resolve_link(struct uc_struct *uc, Object *obj, const char target = object_resolve_path_type(uc, path, target_type, &ambiguous); if (ambiguous) { - error_set(errp, ERROR_CLASS_GENERIC_ERROR, - "Path '%s' does not uniquely identify an object", path); + error_setg(errp, "Path '%s' does not uniquely identify an object", + path); } else if (!target) { target = object_resolve_path(uc, path, &ambiguous); if (target || ambiguous) {