From nobody Thu Nov 28 09:43:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693828456107945.6443416386517; Mon, 4 Sep 2023 04:54:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd89B-00029P-0S; Mon, 04 Sep 2023 07:53:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qd899-000296-Ib for qemu-devel@nongnu.org; Mon, 04 Sep 2023 07:53:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qd897-0008MS-A8 for qemu-devel@nongnu.org; Mon, 04 Sep 2023 07:53:35 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-616-rzOc2DiJMEGESEmVEPDjnA-1; Mon, 04 Sep 2023 07:53:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DF219805F6F for ; Mon, 4 Sep 2023 11:53:30 +0000 (UTC) Received: from localhost (unknown [10.39.208.42]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCD251121314; Mon, 4 Sep 2023 11:53:29 +0000 (UTC) X-MC-Unique: rzOc2DiJMEGESEmVEPDjnA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Subject: [PULL 09/52] ui/console: get the DisplayState from new_console() Date: Mon, 4 Sep 2023 15:52:06 +0400 Message-ID: <20230904115251.4161397-10-marcandre.lureau@redhat.com> In-Reply-To: <20230904115251.4161397-1-marcandre.lureau@redhat.com> References: <20230904115251.4161397-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1693828457003100001 From: Marc-Andr=C3=A9 Lureau There is no obvious reason to defer text console initialization. We can simply take the global display state in new_console(). This simplify somewhat the code to allow moving the VC to a separate unit. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20230830093843.3531473-10-marcandre.lureau@redhat.com> --- ui/console.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/ui/console.c b/ui/console.c index fc1836782d..24cfd31ad6 100644 --- a/ui/console.c +++ b/ui/console.c @@ -143,7 +143,7 @@ static QTAILQ_HEAD(, QemuConsole) consoles =3D static bool cursor_visible_phase; static QEMUTimer *cursor_timer; =20 -static void text_console_do_init(Chardev *chr, DisplayState *ds); +static void text_console_do_init(Chardev *chr); static void dpy_refresh(DisplayState *s); static DisplayState *get_alloc_displaystate(void); static void text_console_update_cursor_timer(void); @@ -1249,9 +1249,9 @@ static void text_console_update(void *opaque, console= _ch_t *chardata) } } =20 -static QemuConsole *new_console(DisplayState *ds, console_type_t console_t= ype, - uint32_t head) +static QemuConsole *new_console(console_type_t console_type, uint32_t head) { + DisplayState *ds =3D get_alloc_displaystate(); Object *obj; QemuConsole *s; int i; @@ -2049,13 +2049,7 @@ DisplayState *init_displaystate(void) gchar *name; QemuConsole *con; =20 - get_alloc_displaystate(); QTAILQ_FOREACH(con, &consoles, next) { - if (con->console_type !=3D GRAPHIC_CONSOLE && - con->ds =3D=3D NULL) { - text_console_do_init(con->chr, display_state); - } - /* Hook up into the qom tree here (not in new_console()), once * all QemuConsoles are created and the order / numbering * doesn't change any more */ @@ -2085,10 +2079,8 @@ QemuConsole *graphic_console_init(DeviceState *dev, = uint32_t head, int width =3D 640; int height =3D 480; QemuConsole *s; - DisplayState *ds; DisplaySurface *surface; =20 - ds =3D get_alloc_displaystate(); s =3D qemu_console_lookup_unused(); if (s) { trace_console_gfx_reuse(s->index); @@ -2096,7 +2088,7 @@ QemuConsole *graphic_console_init(DeviceState *dev, u= int32_t head, height =3D qemu_console_get_height(s, 0); } else { trace_console_gfx_new(); - s =3D new_console(ds, GRAPHIC_CONSOLE, head); + s =3D new_console(GRAPHIC_CONSOLE, head); s->ui_timer =3D timer_new_ms(QEMU_CLOCK_REALTIME, dpy_set_ui_info_timer, s); } @@ -2405,7 +2397,7 @@ static const GraphicHwOps text_console_ops =3D { .text_update =3D text_console_update, }; =20 -static void text_console_do_init(Chardev *chr, DisplayState *ds) +static void text_console_do_init(Chardev *chr) { VCChardev *drv =3D VC_CHARDEV(chr); QemuConsole *s =3D drv->console; @@ -2413,7 +2405,6 @@ static void text_console_do_init(Chardev *chr, Displa= yState *ds) int g_height =3D 24 * FONT_HEIGHT; =20 fifo8_create(&s->out_fifo, 16); - s->ds =3D ds; =20 s->y_displayed =3D 0; s->y_base =3D 0; @@ -2482,9 +2473,9 @@ static void vc_chr_open(Chardev *chr, =20 trace_console_txt_new(width, height); if (width =3D=3D 0 || height =3D=3D 0) { - s =3D new_console(NULL, TEXT_CONSOLE, 0); + s =3D new_console(TEXT_CONSOLE, 0); } else { - s =3D new_console(NULL, TEXT_CONSOLE_FIXED_SIZE, 0); + s =3D new_console(TEXT_CONSOLE_FIXED_SIZE, 0); s->scanout.kind =3D SCANOUT_SURFACE; s->surface =3D qemu_create_displaysurface(width, height); } @@ -2497,9 +2488,7 @@ static void vc_chr_open(Chardev *chr, s->chr =3D chr; drv->console =3D s; =20 - if (display_state) { - text_console_do_init(chr, display_state); - } + text_console_do_init(chr); =20 /* console/chardev init sometimes completes elsewhere in a 2nd * stage, so defer OPENED events until they are fully initialized --=20 2.41.0