From nobody Thu Nov 28 10:49:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693828770; cv=none; d=zohomail.com; s=zohoarc; b=bOn4dLTh1H/UxscYUXUevr5keZDnmtbe3MdbHt4JJ7dkR9lhORtZ5sIfYkOVPjEyRYIt8T6BLue+0yEFSzS+1Cojluc6Oq0uBkWQBssBElE3mAJ5FTGehuuKsvexmA37QFmZJkQILk23ltm9eyLX2Pg/tIU5nZ+ucmR6nB3JSEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693828770; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l4PK8BQ+1DCqciH7hpenAmD1DXvcbABEEaYzHETY/AU=; b=epBprnO/ZnzATKhM+FEQN7PqMkStn1H7afteBoF87efC9Th1EpDR5YcNdQjO0OGttmuYQSBZdzEv3PvKERef8DoPp3VP1dSAS+xTMm9FwQD/C/mPumEDvLzy5y0DGigOKQBVvbc443igMcfVgEVmCWjNeL0a7KDbRdLd6UPLNME= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693828770614820.9673629483981; Mon, 4 Sep 2023 04:59:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd8B7-0007Za-Eg; Mon, 04 Sep 2023 07:55: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 1qd8Ax-00079C-6j for qemu-devel@nongnu.org; Mon, 04 Sep 2023 07:55:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qd8Av-0000d4-2I for qemu-devel@nongnu.org; Mon, 04 Sep 2023 07:55:26 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-47-3KobwjplOwWoE4OZRLnIWw-1; Mon, 04 Sep 2023 07:55:21 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D0C53380671E for ; Mon, 4 Sep 2023 11:55:20 +0000 (UTC) Received: from localhost (unknown [10.39.208.42]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA1E12026D4B; Mon, 4 Sep 2023 11:55:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693828524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l4PK8BQ+1DCqciH7hpenAmD1DXvcbABEEaYzHETY/AU=; b=G7iNMWqxh9JIE70yhRqq/Pjgj6hgIrdRROeGOmUThnaPI/GHHQTR34m78SnYEBY1cavoga ILGaCNT0N/D26sQlccaSvOW1glbKBEasSdyHQkWuifTh9rZxQkPYMsv8Iopir1aV/GcTqY M3vfV81gYDOfNp883yjHzAF02wCjVBA= X-MC-Unique: 3KobwjplOwWoE4OZRLnIWw-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 37/52] ui/console: rename vga_ functions with qemu_console_ Date: Mon, 4 Sep 2023 15:52:34 +0400 Message-ID: <20230904115251.4161397-38-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.4 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.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693828771280100001 From: Marc-Andr=C3=A9 Lureau They are not specific to VGA. Let's use the object type name as prefix instead, to avoid confusion. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230830093843.3531473-38-marcandre.lureau@redhat.com> --- ui/console.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/ui/console.c b/ui/console.c index 88e37eaff3..a157a5b31c 100644 --- a/ui/console.c +++ b/ui/console.c @@ -331,9 +331,8 @@ void graphic_hw_text_update(QemuConsole *con, console_c= h_t *chardata) } } =20 -static void vga_fill_rect(QemuConsole *con, - int posx, int posy, int width, int height, - pixman_color_t color) +static void qemu_console_fill_rect(QemuConsole *con, int posx, int posy, + int width, int height, pixman_color_t c= olor) { DisplaySurface *surface =3D qemu_console_surface(con); pixman_rectangle16_t rect =3D { @@ -345,8 +344,8 @@ static void vga_fill_rect(QemuConsole *con, } =20 /* copy from (xs, ys) to (xd, yd) a rectangle of size (w, h) */ -static void vga_bitblt(QemuConsole *con, - int xs, int ys, int xd, int yd, int w, int h) +static void qemu_console_bitblt(QemuConsole *con, + int xs, int ys, int xd, int yd, int w, int= h) { DisplaySurface *surface =3D qemu_console_surface(con); =20 @@ -526,8 +525,8 @@ static void console_refresh(QemuTextConsole *s) s->text_y[1] =3D s->height - 1; s->cursor_invalidate =3D 1; =20 - vga_fill_rect(QEMU_CONSOLE(s), 0, 0, surface_width(surface), surface_h= eight(surface), - color_table_rgb[0][QEMU_COLOR_BLACK]); + qemu_console_fill_rect(QEMU_CONSOLE(s), 0, 0, surface_width(surface), = surface_height(surface), + color_table_rgb[0][QEMU_COLOR_BLACK]); y1 =3D s->y_displayed; for (y =3D 0; y < s->height; y++) { c =3D s->cells + y1 * s->width; @@ -605,12 +604,12 @@ static void vc_put_lf(VCChardev *vc) s->text_x[1] =3D s->width - 1; s->text_y[1] =3D s->height - 1; =20 - vga_bitblt(QEMU_CONSOLE(s), 0, FONT_HEIGHT, 0, 0, - s->width * FONT_WIDTH, - (s->height - 1) * FONT_HEIGHT); - vga_fill_rect(QEMU_CONSOLE(s), 0, (s->height - 1) * FONT_HEIGH= T, - s->width * FONT_WIDTH, FONT_HEIGHT, - color_table_rgb[0][TEXT_ATTRIBUTES_DEFAULT.bgcol= ]); + qemu_console_bitblt(QEMU_CONSOLE(s), 0, FONT_HEIGHT, 0, 0, + s->width * FONT_WIDTH, + (s->height - 1) * FONT_HEIGHT); + qemu_console_fill_rect(QEMU_CONSOLE(s), 0, (s->height - 1) * F= ONT_HEIGHT, + s->width * FONT_WIDTH, FONT_HEIGHT, + color_table_rgb[0][TEXT_ATTRIBUTES_DEFA= ULT.bgcol]); s->update_x0 =3D 0; s->update_y0 =3D 0; s->update_x1 =3D s->width * FONT_WIDTH; --=20 2.41.0