qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	qemu-arm@nongnu.org, "BALATON Zoltan" <balaton@eik.bme.hu>,
	"Dr. David Alan Gilbert" <dave@treblig.org>,
	qemu-ppc@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Eric Blake" <eblake@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PATCH v4 06/19] ui/vc: console-vc requires PIXMAN
Date: Wed, 18 Oct 2023 17:38:07 +0400	[thread overview]
Message-ID: <20231018133820.1556962-7-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20231018133820.1556962-1-marcandre.lureau@redhat.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Add stubs for the fallback paths.

get_vc() now returns NULL by default if !PIXMAN.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 ui/console-vc-stubs.c | 33 +++++++++++++++++++++++++++++++++
 ui/console.c          |  3 +++
 ui/meson.build        |  2 +-
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 ui/console-vc-stubs.c

diff --git a/ui/console-vc-stubs.c b/ui/console-vc-stubs.c
new file mode 100644
index 0000000000..2afc52329f
--- /dev/null
+++ b/ui/console-vc-stubs.c
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * QEMU VC stubs
+ */
+#include "qemu/osdep.h"
+
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+#include "qemu/option.h"
+#include "chardev/char.h"
+#include "ui/console-priv.h"
+
+void qemu_text_console_select(QemuTextConsole *c)
+{
+}
+
+const char *
+qemu_text_console_get_label(QemuTextConsole *c)
+{
+    return NULL;
+}
+
+void qemu_text_console_update_cursor(void)
+{
+}
+
+void qemu_text_console_handle_keysym(QemuTextConsole *s, int keysym)
+{
+}
+
+void qemu_console_early_init(void)
+{
+}
diff --git a/ui/console.c b/ui/console.c
index a758ed62ad..a72c495b5a 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1685,8 +1685,11 @@ const char *qemu_display_get_vc(DisplayOptions *opts)
     if (dpys[opts->type]->vc) {
         return dpys[opts->type]->vc;
     } else {
+#ifdef CONFIG_PIXMAN
         return "vc:80Cx24C";
+#endif
     }
+    return NULL;
 }
 
 void qemu_display_help(void)
diff --git a/ui/meson.build b/ui/meson.build
index 0a1e8272a3..3085e10a72 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -6,7 +6,6 @@ system_ss.add(png)
 system_ss.add(files(
   'clipboard.c',
   'console.c',
-  'console-vc.c',
   'cursor.c',
   'input-keymap.c',
   'input-legacy.c',
@@ -19,6 +18,7 @@ system_ss.add(files(
   'ui-qmp-cmds.c',
   'util.c',
 ))
+system_ss.add(when: pixman, if_true: files('console-vc.c'), if_false: files('console-vc-stubs.c'))
 if dbus_display
   system_ss.add(files('dbus-module.c'))
 endif
-- 
2.41.0



  parent reply	other threads:[~2023-10-18 13:39 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-18 13:38 [PATCH v4 00/19] Make Pixman an optional dependency marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 01/19] build-sys: add a "pixman" feature marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 02/19] ui: compile out some qemu-pixman functions when !PIXMAN marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 03/19] ui: add pixman-compat.h marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 04/19] vl: move display early init before default devices marcandre.lureau
2023-10-18 14:18   ` Marc-André Lureau
2023-10-18 13:38 ` [PATCH v4 05/19] ui/console: allow to override the default VC marcandre.lureau
2023-10-18 13:38 ` marcandre.lureau [this message]
2023-10-18 13:38 ` [PATCH v4 07/19] qmp/hmp: disable screendump if PIXMAN is missing marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 08/19] virtio-gpu: replace PIXMAN for region/rect test marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 09/19] ui/console: when PIXMAN is unavailable, don't draw placeholder msg marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 10/19] vhost-user-gpu: skip VHOST_USER_GPU_UPDATE when !PIXMAN marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 11/19] ui/gl: opengl doesn't require PIXMAN marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 12/19] ui/vnc: VNC requires PIXMAN marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 13/19] ui/spice: SPICE/QXL " marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 14/19] ui/gtk: -display gtk " marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 15/19] ui/dbus: do not require PIXMAN marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 16/19] arm/kconfig: XLNX_ZYNQMP_ARM depends on PIXMAN marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 17/19] hw/sm501: allow compiling without PIXMAN marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 18/19] hw/display: make ATI_VGA depend on PIXMAN marcandre.lureau
2023-10-18 13:38 ` [PATCH v4 19/19] build-sys: make pixman actually optional marcandre.lureau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231018133820.1556962-7-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=armbru@redhat.com \
    --cc=balaton@eik.bme.hu \
    --cc=berrange@redhat.com \
    --cc=dave@treblig.org \
    --cc=eblake@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).