From nobody Sun May 5 12:00:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487663925733802.9815392437632; Mon, 20 Feb 2017 23:58:45 -0800 (PST) Received: from localhost ([::1]:42809 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cg5LP-00011D-V0 for importer@patchew.org; Tue, 21 Feb 2017 02:58:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cg5Kb-0000kH-7D for qemu-devel@nongnu.org; Tue, 21 Feb 2017 02:57:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cg5KW-0002BK-Ec for qemu-devel@nongnu.org; Tue, 21 Feb 2017 02:57:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54142) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cg5KW-0002B1-8s for qemu-devel@nongnu.org; Tue, 21 Feb 2017 02:57:48 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2A6F2C012844 for ; Tue, 21 Feb 2017 07:57:48 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-47.ams2.redhat.com [10.36.116.47]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1L7vknP013996; Tue, 21 Feb 2017 02:57:47 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 822938093B; Tue, 21 Feb 2017 08:57:44 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 21 Feb 2017 08:57:37 +0100 Message-Id: <1487663858-11731-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 21 Feb 2017 07:57:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] spice: add display & head options X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This allows to specify display and head to use, simliar to vnc. Signed-off-by: Gerd Hoffmann --- ui/spice-core.c | 6 ++++++ ui/spice-display.c | 22 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ui/spice-core.c b/ui/spice-core.c index d613f1a..e18ad77 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -498,6 +498,12 @@ static QemuOptsList qemu_spice_opts =3D { },{ .name =3D "seamless-migration", .type =3D QEMU_OPT_BOOL, + },{ + .name =3D "display", + .type =3D QEMU_OPT_STRING, + },{ + .name =3D "head", + .type =3D QEMU_OPT_NUMBER, #ifdef HAVE_SPICE_GL },{ .name =3D "gl", diff --git a/ui/spice-display.c b/ui/spice-display.c index 64e472e..9c58e5a 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -1029,9 +1029,26 @@ static void qemu_spice_display_init_one(QemuConsole = *con) =20 void qemu_spice_display_init(void) { - QemuConsole *con; + QemuOptsList *olist =3D qemu_find_opts("spice"); + QemuOpts *opts =3D QTAILQ_FIRST(&olist->head); + QemuConsole *spice_con, *con; + const char *str; int i; =20 + str =3D qemu_opt_get(opts, "display"); + if (str) { + int head =3D qemu_opt_get_number(opts, "head", 0); + Error *err =3D NULL; + + spice_con =3D qemu_console_lookup_by_device_name(str, head, &err); + if (err) { + error_report("Failed to lookup display/head"); + exit(1); + } + } else { + spice_con =3D NULL; + } + for (i =3D 0;; i++) { con =3D qemu_console_lookup_by_index(i); if (!con || !qemu_console_is_graphic(con)) { @@ -1040,6 +1057,9 @@ void qemu_spice_display_init(void) if (qemu_spice_have_display_interface(con)) { continue; } + if (spice_con !=3D NULL && spice_con !=3D con) { + continue; + } qemu_spice_display_init_one(con); } } --=20 1.8.3.1