From patchwork Tue Jan 12 12:29:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 566534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 94DF8140662 for ; Tue, 12 Jan 2016 23:30:26 +1100 (AEDT) Received: from localhost ([::1]:59574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIy5g-0007es-Dg for incoming@patchwork.ozlabs.org; Tue, 12 Jan 2016 07:30:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIy56-0006jo-Il for qemu-devel@nongnu.org; Tue, 12 Jan 2016 07:29:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIy53-0007mD-Aa for qemu-devel@nongnu.org; Tue, 12 Jan 2016 07:29:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIy53-0007m3-52 for qemu-devel@nongnu.org; Tue, 12 Jan 2016 07:29:45 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id BCDB6C0BF2A3 for ; Tue, 12 Jan 2016 12:29:44 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-29.ams2.redhat.com [10.36.116.29]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0CCTh3K003583; Tue, 12 Jan 2016 07:29:44 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 8ED94816C8; Tue, 12 Jan 2016 13:29:42 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 12 Jan 2016 13:29:35 +0100 Message-Id: <1452601779-5790-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1452601779-5790-1-git-send-email-kraxel@redhat.com> References: <1452601779-5790-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Marcelo Tosatti , Markus Armbruster , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 3/7] console: use qemu_console_lookup_by_device_name in vnc_display_open X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrange --- ui/vnc.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 09756cd..95ef3bd 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3725,19 +3725,12 @@ void vnc_display_open(const char *id, Error **errp) device_id = qemu_opt_get(opts, "display"); if (device_id) { - DeviceState *dev; int head = qemu_opt_get_number(opts, "head", 0); + Error *err = NULL; - dev = qdev_find_recursive(sysbus_get_default(), device_id); - if (dev == NULL) { - error_setg(errp, "Device '%s' not found", device_id); - goto fail; - } - - con = qemu_console_lookup_by_device(dev, head); - if (con == NULL) { - error_setg(errp, "Device %s is not bound to a QemuConsole", - device_id); + con = qemu_console_lookup_by_device_name(device_id, head, &err); + if (err) { + error_propagate(errp, err); goto fail; } } else {