From patchwork Mon Jan 6 09:33:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1218052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tuxfamily.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47rr1S6WwXz9sPK for ; Mon, 6 Jan 2020 20:34:04 +1100 (AEDT) Received: from localhost ([::1]:49800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioOlu-0004ZF-Qr for incoming@patchwork.ozlabs.org; Mon, 06 Jan 2020 04:34:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55527) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioOlc-0004Yz-LE for qemu-devel@nongnu.org; Mon, 06 Jan 2020 04:33:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioOlb-0002Vt-E8 for qemu-devel@nongnu.org; Mon, 06 Jan 2020 04:33:44 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:40090) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioOlb-0002VD-8e for qemu-devel@nongnu.org; Mon, 06 Jan 2020 04:33:43 -0500 Received: by mail-wm1-f49.google.com with SMTP id t14so14556099wmi.5 for ; Mon, 06 Jan 2020 01:33:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LpgQUj0OMjYJ+KO28b/FVZFuJDEF0D9hD3aM03MEbj8=; b=MpnlCjeQ3Q0tJV+ZcFCwr0QrRhoQ/YB4JgeiplJPqWZWapQguOP+F/3684id37I7Q/ KM06hcxIzsND6kTHN8WcfLQZ5w1DsCQ553/KS8cW01Bkqp6gLBjASGLk+4Yr0OHuuz2E dkC922EY6MR/FUJC30fO0Z6JHYMiscG/6Fwa7c3rA9AA/sPVy2TH9ptzyS7mETqgwv4w t9edy7S9MCQfpK5rDdH4QPvSoOYSPH/u61DT46LIguGzOJa1ce51KT3vS++vDLaxjGVJ JJFxLNPQErRyn5WI6Rd7FlnCIFs8NWAtJ6RrA4KnI6xxyysltbHxgbcCfq1rmptL1ZdM MCIA== X-Gm-Message-State: APjAAAVE3J/29GmozKJGBFSdNJ2pg3aYW41lfCgd0EBnwVHN5DVQcfrU 5GoyblD9jTarubqNi0ZpEqvGIF87 X-Google-Smtp-Source: APXvYqxh7N5/9Rg68fUb/KqNVQK49vkblLI9SeB3mTW+7X2BxY5MnCOUF9cODKsCZoxfZ6t9ApJWqQ== X-Received: by 2002:a05:600c:2503:: with SMTP id d3mr32412099wma.84.1578303221746; Mon, 06 Jan 2020 01:33:41 -0800 (PST) Received: from thl530.multi.box (pD95751C4.dip0.t-ipconnect.de. [217.87.81.196]) by smtp.gmail.com with ESMTPSA id a5sm22395980wmb.37.2020.01.06.01.33.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 01:33:41 -0800 (PST) From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PATCH v2] ui: Print available display backends with '-display help' Date: Mon, 6 Jan 2020 10:33:13 +0100 Message-Id: <20200106093313.17081-1-huth@tuxfamily.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.128.49 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We already print availabled devices with "-device help", or available backends with "-netdev help" or "-chardev help". Let's provide a way for the users to query the available display backends, too. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v2: Now it should work with modules, too include/ui/console.h | 1 + ui/console.c | 15 +++++++++++++++ vl.c | 5 +++++ 3 files changed, 21 insertions(+) diff --git a/include/ui/console.h b/include/ui/console.h index f981696848..b7e1a8e6c0 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -440,6 +440,7 @@ void qemu_display_register(QemuDisplay *ui); bool qemu_display_find_default(DisplayOptions *opts); void qemu_display_early_init(DisplayOptions *opts); void qemu_display_init(DisplayState *ds, DisplayOptions *opts); +void qemu_display_help(void); /* vnc.c */ void vnc_display_init(const char *id, Error **errp); diff --git a/ui/console.c b/ui/console.c index 82d1ddac9c..9556b5d8dd 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2330,6 +2330,21 @@ void qemu_display_init(DisplayState *ds, DisplayOptions *opts) dpys[opts->type]->init(ds, opts); } +void qemu_display_help(void) +{ + int idx; + + printf("Available display backend types:\n"); + for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) { + if (!dpys[idx]) { + ui_module_load_one(DisplayType_str(idx)); + } + if (dpys[idx]) { + printf("%s\n", DisplayType_str(dpys[idx]->type)); + } + } +} + void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, Error **errp) { int val; diff --git a/vl.c b/vl.c index 86474a55c9..ee15055ba2 100644 --- a/vl.c +++ b/vl.c @@ -1869,6 +1869,11 @@ static void parse_display(const char *p) { const char *opts; + if (is_help_option(p)) { + qemu_display_help(); + exit(0); + } + if (strstart(p, "sdl", &opts)) { /* * sdl DisplayType needs hand-crafted parser instead of