From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag89k-0002ZE-NO for qemu-devel@nongnu.org; Wed, 16 Mar 2016 05:54:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag89f-0008BW-Hl for qemu-devel@nongnu.org; Wed, 16 Mar 2016 05:54:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44306) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag89f-0008BS-Bm for qemu-devel@nongnu.org; Wed, 16 Mar 2016 05:54:15 -0400 From: Markus Armbruster Date: Wed, 16 Mar 2016 10:54:09 +0100 Message-Id: <1458122051-9174-2-git-send-email-armbru@redhat.com> In-Reply-To: <1458122051-9174-1-git-send-email-armbru@redhat.com> References: <1458122051-9174-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 1/3] qdev-monitor: improve error message when alias device is unavailable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sascha Silbe From: Sascha Silbe When trying to instantiate an alias that points to a device class that doesn't exist, the error message looks like qemu misunderstood the request: $ s390x-softmmu/qemu-system-s390x -device virtio-gpu qemu-system-s390x: -device virtio-gpu: 'virtio-gpu-ccw' is not a valid device model name Special-case the error message to make it explicit that alias expansion is going on: $ s390x-softmmu/qemu-system-s390x -device virtio-gpu qemu-system-s390x: -device virtio-gpu: 'virtio-gpu' (alias 'virtio-gpu-ccw') is not a valid device model name Suggested-By: Cornelia Huck Signed-off-by: Sascha Silbe Message-Id: <1455831854-49013-2-git-send-email-silbe@linux.vnet.ibm.com> Reviewed-by: Cornelia Huck Reviewed-by: Michael S. Tsirkin Signed-off-by: Markus Armbruster --- qdev-monitor.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 81e3ff3..e5136d7 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -188,6 +188,7 @@ static DeviceClass *qdev_get_device_class(const char **driver, Error **errp) { ObjectClass *oc; DeviceClass *dc; + const char *original_name = *driver; oc = object_class_by_name(*driver); if (!oc) { @@ -200,7 +201,12 @@ static DeviceClass *qdev_get_device_class(const char **driver, Error **errp) } if (!object_class_dynamic_cast(oc, TYPE_DEVICE)) { - error_setg(errp, "'%s' is not a valid device model name", *driver); + if (*driver != original_name) { + error_setg(errp, "'%s' (alias '%s') is not a valid device model" + " name", original_name, *driver); + } else { + error_setg(errp, "'%s' is not a valid device model name", *driver); + } return NULL; } -- 2.4.3