From nobody Mon Nov 25 04:58:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717593330; cv=none; d=zohomail.com; s=zohoarc; b=L/7nxJNFckgzTpDMS2FNFeOFYnu/pAj6bRgEiOuFkMaRtVey2euwzOK9GshWgFRiieyHmGT2AuRqZ2N7Bz5QNNKnScfne8VR2/s9LtlmubZXqKfOGNRqye8bzPEnEADX2EH7lbSZXGflYc2xZKnLipIoEd5g46rZPSvh3ICibtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717593330; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TVLB8maweI2YBdW9cqwpRepDTGxsDFjVZsXbEwlXhJ4=; b=NT5u4vXp3Zk+k7DzzUtbkxfp1R+z7UPLfmzx7YxHfNS/95m2SHqN6joma1C9lBTCjRIk0+zsOkS2hOen5hPKJsosXPfwsFLshWgzde+qTFxdLrKxfaj0zDRtNkv1mGyqnXXg4vanM5N/4aKP1BoPp7AhyEobqMVGpsXVsWo2URQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1717593330742341.22745578361605; Wed, 5 Jun 2024 06:15:30 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.735756.1141867 (Exim 4.92) (envelope-from ) id 1sEqTj-0003Tl-7P; Wed, 05 Jun 2024 13:14:59 +0000 Received: by outflank-mailman (output) from mailman id 735756.1141867; Wed, 05 Jun 2024 13:14:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sEqTj-0003TW-4C; Wed, 05 Jun 2024 13:14:59 +0000 Received: by outflank-mailman (input) for mailman id 735756; Wed, 05 Jun 2024 13:14:58 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sEqTh-0003E5-Vj for xen-devel@lists.xenproject.org; Wed, 05 Jun 2024 13:14:57 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9a5f9c15-233d-11ef-90a2-e314d9c70b13; Wed, 05 Jun 2024 15:14:57 +0200 (CEST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-460-tXfqlkJlNb2AyTUOjfHNLw-1; Wed, 05 Jun 2024 09:14:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 756BE1C05122; Wed, 5 Jun 2024 13:14:50 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F38F937D1; Wed, 5 Jun 2024 13:14:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 713EA1800DDB; Wed, 5 Jun 2024 15:14:44 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9a5f9c15-233d-11ef-90a2-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717593296; 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=TVLB8maweI2YBdW9cqwpRepDTGxsDFjVZsXbEwlXhJ4=; b=Ca3GCqN4wYHGdjddioYoIwOtsQQwBpOF9kLw/z6RiQUamn9nSIWjyp/tIubW7DUzffUXsU liNUrSqAa1uhC0hxYV2b5UFb57PQH1+KvddvUtrPXJjHwM+Ru5DeedI4Omtb1qEbKckScQ MiMlz52Jf2ShsSCeLnDjBSgoCeGr3a0= X-MC-Unique: tXfqlkJlNb2AyTUOjfHNLw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Stefano Stabellini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paul Durrant , xen-devel@lists.xenproject.org, Gerd Hoffmann , Anthony PERARD , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v3 3/3] ui+display: rename is_buffer_shared() -> surface_is_allocated() Date: Wed, 5 Jun 2024 15:14:43 +0200 Message-ID: <20240605131444.797896-4-kraxel@redhat.com> In-Reply-To: <20240605131444.797896-1-kraxel@redhat.com> References: <20240605131444.797896-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717593330962100001 Boolean return value is reversed, to align with QEMU_ALLOCATED_FLAG, so all callers must be adapted. Also rename share_surface variable in vga_draw_graphic() to reduce confusion. No functional change. Suggested-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Gerd Hoffmann Reviewed-by: Paul Durrant --- include/ui/surface.h | 4 ++-- hw/display/qxl-render.c | 2 +- hw/display/vga.c | 20 ++++++++++---------- hw/display/xenfb.c | 5 +++-- ui/console.c | 3 ++- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/include/ui/surface.h b/include/ui/surface.h index 273bb4769a02..345b19169d2e 100644 --- a/include/ui/surface.h +++ b/include/ui/surface.h @@ -45,9 +45,9 @@ void qemu_displaysurface_win32_set_handle(DisplaySurface = *surface, DisplaySurface *qemu_create_displaysurface(int width, int height); void qemu_free_displaysurface(DisplaySurface *surface); =20 -static inline int is_buffer_shared(DisplaySurface *surface) +static inline int surface_is_allocated(DisplaySurface *surface) { - return !(surface->flags & QEMU_ALLOCATED_FLAG); + return surface->flags & QEMU_ALLOCATED_FLAG; } =20 static inline int surface_is_placeholder(DisplaySurface *surface) diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index ec99ec887a6e..8daae72c8d04 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -31,7 +31,7 @@ static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect) uint8_t *src; int len, i; =20 - if (is_buffer_shared(surface)) { + if (!surface_is_allocated(surface)) { return; } trace_qxl_render_blit(qxl->guest_primary.qxl_stride, diff --git a/hw/display/vga.c b/hw/display/vga.c index 474b6b14c327..0ed933596584 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1487,7 +1487,7 @@ static void vga_draw_graphic(VGACommonState *s, int f= ull_update) uint8_t *d; uint32_t v, addr1, addr; vga_draw_line_func *vga_draw_line =3D NULL; - bool share_surface, force_shadow =3D false; + bool allocate_surface, force_shadow =3D false; pixman_format_code_t format; #if HOST_BIG_ENDIAN bool byteswap =3D !s->big_endian_fb; @@ -1609,10 +1609,10 @@ static void vga_draw_graphic(VGACommonState *s, int= full_update) */ format =3D qemu_default_pixman_format(depth, !byteswap); if (format) { - share_surface =3D dpy_gfx_check_format(s->con, format) - && !s->force_shadow && !force_shadow; + allocate_surface =3D !dpy_gfx_check_format(s->con, format) + || s->force_shadow || force_shadow; } else { - share_surface =3D false; + allocate_surface =3D true; } =20 if (s->params.line_offset !=3D s->last_line_offset || @@ -1620,7 +1620,7 @@ static void vga_draw_graphic(VGACommonState *s, int f= ull_update) height !=3D s->last_height || s->last_depth !=3D depth || s->last_byteswap !=3D byteswap || - share_surface !=3D is_buffer_shared(surface)) { + allocate_surface !=3D surface_is_allocated(surface)) { /* display parameters changed -> need new display surface */ s->last_scr_width =3D disp_width; s->last_scr_height =3D height; @@ -1635,14 +1635,14 @@ static void vga_draw_graphic(VGACommonState *s, int= full_update) full_update =3D 1; } if (surface_data(surface) !=3D s->vram_ptr + (s->params.start_addr * 4) - && is_buffer_shared(surface)) { + && !surface_is_allocated(surface)) { /* base address changed (page flip) -> shared display surfaces * must be updated with the new base address */ full_update =3D 1; } =20 if (full_update) { - if (share_surface) { + if (!allocate_surface) { surface =3D qemu_create_displaysurface_from(disp_width, height, format, s->params.line_offset, s->vram_ptr + (s->params.start_addr * 4)); @@ -1655,7 +1655,7 @@ static void vga_draw_graphic(VGACommonState *s, int f= ull_update) =20 vga_draw_line =3D vga_draw_line_table[v]; =20 - if (!is_buffer_shared(surface) && s->cursor_invalidate) { + if (surface_is_allocated(surface) && s->cursor_invalidate) { s->cursor_invalidate(s); } =20 @@ -1707,7 +1707,7 @@ static void vga_draw_graphic(VGACommonState *s, int f= ull_update) if (update) { if (y_start < 0) y_start =3D y; - if (!(is_buffer_shared(surface))) { + if (surface_is_allocated(surface)) { uint8_t *p; p =3D vga_draw_line(s, d, addr, width, hpel); if (p) { @@ -1762,7 +1762,7 @@ static void vga_draw_blank(VGACommonState *s, int ful= l_update) if (s->last_scr_width <=3D 0 || s->last_scr_height <=3D 0) return; =20 - if (is_buffer_shared(surface)) { + if (!surface_is_allocated(surface)) { /* unshare buffer, otherwise the blanking corrupts vga vram */ surface =3D qemu_create_displaysurface(s->last_scr_width, s->last_= scr_height); dpy_gfx_replace_surface(s->con, surface); diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 27536bfce0cb..06f84ed39d64 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -637,7 +637,7 @@ static void xenfb_guest_copy(struct XenFB *xenfb, int x= , int y, int w, int h) int linesize =3D surface_stride(surface); uint8_t *data =3D surface_data(surface); =20 - if (!is_buffer_shared(surface)) { + if (surface_is_allocated(surface)) { switch (xenfb->depth) { case 8: if (bpp =3D=3D 16) { @@ -755,7 +755,8 @@ static void xenfb_update(void *opaque) xen_pv_printf(&xenfb->c.xendev, 1, "update: resizing: %dx%d @ %d bpp%s\n", xenfb->width, xenfb->height, xenfb->depth, - is_buffer_shared(surface) ? " (shared)" : ""); + surface_is_allocated(surface) + ? " (allocated)" : " (borrowed)"); xenfb->up_fullscreen =3D 1; } =20 diff --git a/ui/console.c b/ui/console.c index c2173fc0b1e5..1a7eb7fe8e8c 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1510,7 +1510,8 @@ void qemu_console_resize(QemuConsole *s, int width, i= nt height) assert(QEMU_IS_GRAPHIC_CONSOLE(s)); =20 if ((s->scanout.kind !=3D SCANOUT_SURFACE || - (surface && !is_buffer_shared(surface) && !surface_is_placeholder= (surface))) && + (surface && surface_is_allocated(surface) && + !surface_is_placeholder(surface))) && qemu_console_get_width(s, -1) =3D=3D width && qemu_console_get_height(s, -1) =3D=3D height) { return; --=20 2.45.1