From nobody Fri May 17 09:01:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1611745546; cv=none; d=zohomail.com; s=zohoarc; b=OyqgOKBCpLHuchX+KPkvBMuMMR0AXqRT3/eV+M6wHrz+o2RsNxft+VH/wUS1unn2r3lYhjB4uNem0A1g8YGYMp1IhrkwVb1pGPf74wyeVzrz6yqok5xwqfKHTCUYVkb2wIUovNX9Xmk3iCmtBiWd/Oq1AKmR7wgjR3wjXxQU3VI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611745546; 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=pqChRlwoyCKZcMZdZTh9s5zJER3HdtpESp5WGeug//g=; b=N8JGMs9UHU66uAAD14fWXWXXQ7efZlqghgsGqrNf7NzjOdmDuc8DRcWtpfdpABGKdE2fe4UCCNHY5X5ZMDQMo07TkBS2SCFjDEoAl2skI4+Z2xaRqqLBUM3HGVcNPs/MTjARj+H8//LdfQdZ4lCqdTWvcIa1lDg54H292Tf0UKs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611745546401841.1063957565899; Wed, 27 Jan 2021 03:05:46 -0800 (PST) Received: from localhost ([::1]:55900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4idt-0007Wi-Cb for importer@patchew.org; Wed, 27 Jan 2021 06:05:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4iZp-0004x1-DQ for qemu-devel@nongnu.org; Wed, 27 Jan 2021 06:01:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23227) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l4iZe-000633-NX for qemu-devel@nongnu.org; Wed, 27 Jan 2021 06:01:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-187-b6l-9pW2NfKMZesSVZH4CQ-1; Wed, 27 Jan 2021 06:01:19 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1D97D107ACE6 for ; Wed, 27 Jan 2021 11:01:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-27.ams2.redhat.com [10.36.113.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F239E5D9D5; Wed, 27 Jan 2021 11:01:14 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 12996180039B; Wed, 27 Jan 2021 12:01:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611745281; 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=pqChRlwoyCKZcMZdZTh9s5zJER3HdtpESp5WGeug//g=; b=OL6uc9yv0KviMNlqQ13n2ImbjaI0MUE2bq3BvdZuCFS26Wc4VFcds9loA3lhbpgi3Dm/F8 xdiDDvsvt7Djtki1S8SPSBgp8BxNE24nGXgCSmvf0mXCNP7XxX7cRL4AdIcoVR3XIVoqy5 ADSce8ZLY4En45noXDKz01al482iZRY= X-MC-Unique: b6l-9pW2NfKMZesSVZH4CQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/3] Revert "vnc: move initialization to framebuffer_update_request" Date: Wed, 27 Jan 2021 12:01:10 +0100 Message-Id: <20210127110113.2111855-2-kraxel@redhat.com> In-Reply-To: <20210127110113.2111855-1-kraxel@redhat.com> References: <20210127110113.2111855-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laszlo Ersek , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This reverts commit 9e1632ad07ca49de99da4bb231e9e2f22f2d8df5. Older gtk-vnc versions can't deal with non-incremental update requests sending pseudo-encodings, so trying to send full server state (including desktop size, cursor etc. which is done using pseudo-encodings) doesn't fly. Return to old behavior to send those only for new connects and when changes happen. Signed-off-by: Gerd Hoffmann Tested-by: Laszlo Ersek Message-Id: <20210125104041.495274-2-kraxel@redhat.com> --- ui/vnc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 66f7c1b9361e..2622f82a5a9f 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -687,6 +687,10 @@ static void vnc_desktop_resize(VncState *vs) !vnc_has_feature(vs, VNC_FEATURE_RESIZE_EXT)))= { return; } + if (vs->client_width =3D=3D pixman_image_get_width(vs->vd->server) && + vs->client_height =3D=3D pixman_image_get_height(vs->vd->server)) { + return; + } =20 assert(pixman_image_get_width(vs->vd->server) < 65536 && pixman_image_get_width(vs->vd->server) >=3D 0); @@ -2042,10 +2046,6 @@ static void framebuffer_update_request(VncState *vs,= int incremental, } else { vs->update =3D VNC_STATE_UPDATE_FORCE; vnc_set_area_dirty(vs->dirty, vs->vd, x, y, w, h); - vnc_colordepth(vs); - vnc_desktop_resize(vs); - vnc_led_state_change(vs); - vnc_cursor_define(vs); } } =20 @@ -2189,7 +2189,10 @@ static void set_encodings(VncState *vs, int32_t *enc= odings, size_t n_encodings) break; } } + vnc_desktop_resize(vs); check_pointer_type_change(&vs->mouse_mode_notifier, NULL); + vnc_led_state_change(vs); + vnc_cursor_define(vs); } =20 static void set_pixel_conversion(VncState *vs) --=20 2.29.2 From nobody Fri May 17 09:01:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1611745383; cv=none; d=zohomail.com; s=zohoarc; b=Uk4ntuVSG18iQK9gHfrVCHO+S/pF/8ot7zTTmGfww1j33Mp2eamoJbdK2H3O3oExVfY8h0Wb26tdRc8PumT8dnKKVLVeBJ36Y2n0cFhVCKJztUrWe5RIgxKFBjUB17eiNFGhPzkIyQhriEneLIYghmdCjK8fRtL0HKnod6XjVzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611745383; 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=dKaa82Zwrw2POYqHdqajw2BFsTfH6hkhtwNTVuXlBIE=; b=G+Dk8UVtwbuGWU5yW6tRQrofkKKn5ZvF1FHBbzf5EtE4lUbxdxzlcEqtgAq7moYhFQ9sEIhHQB1pQdJBmMo11SgvA6wyVIqbAEDinGXd7F5+jxYkg37tDrjni/SPred3vtZUpfDdobvGYAxp7e8s/MD59chvVyE0byCgHlNrm04= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611745383655951.290089963823; Wed, 27 Jan 2021 03:03:03 -0800 (PST) Received: from localhost ([::1]:51654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4ibF-0005lx-IL for importer@patchew.org; Wed, 27 Jan 2021 06:03:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4iZg-0004vn-Jr for qemu-devel@nongnu.org; Wed, 27 Jan 2021 06:01:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l4iZe-000631-FQ for qemu-devel@nongnu.org; Wed, 27 Jan 2021 06:01:23 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-554-QZDWmEzYP6m4Wr-Ao7PVIA-1; Wed, 27 Jan 2021 06:01:19 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 348F0A0C04 for ; Wed, 27 Jan 2021 11:01:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-27.ams2.redhat.com [10.36.113.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 17B2D1F40F; Wed, 27 Jan 2021 11:01:14 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1D01B180039C; Wed, 27 Jan 2021 12:01:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611745281; 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=dKaa82Zwrw2POYqHdqajw2BFsTfH6hkhtwNTVuXlBIE=; b=dx/Ju4pxBIEy1FUqZ8he481qig9Om2CUluv4lvi2BNq7aUlCYhoUB8oy3+SJXSb/Qi94wz mTvjODasy02fJ6XLqFKSiFKYG8h9OI9PISSR2az2hArprdCAFmwjXZybBHzRFEeBRBxKh1 Fgt4FfOHIZi/KEyRBIZtX3UV5uh4wS8= X-MC-Unique: QZDWmEzYP6m4Wr-Ao7PVIA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/3] vnc: send extended desktop resize on update requests Date: Wed, 27 Jan 2021 12:01:11 +0100 Message-Id: <20210127110113.2111855-3-kraxel@redhat.com> In-Reply-To: <20210127110113.2111855-1-kraxel@redhat.com> References: <20210127110113.2111855-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laszlo Ersek , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Unlike other pseudo-encodings these don't break gtk-vnc because older versions don't suport the extended desktop resize extension in the first place. Signed-off-by: Gerd Hoffmann Tested-by: Laszlo Ersek Message-Id: <20210125104041.495274-3-kraxel@redhat.com> --- ui/vnc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index 2622f82a5a9f..16bb3be770b2 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2046,6 +2046,9 @@ static void framebuffer_update_request(VncState *vs, = int incremental, } else { vs->update =3D VNC_STATE_UPDATE_FORCE; vnc_set_area_dirty(vs->dirty, vs->vd, x, y, w, h); + if (vnc_has_feature(vs, VNC_FEATURE_RESIZE_EXT)) { + vnc_desktop_resize_ext(vs, 0); + } } } =20 --=20 2.29.2 From nobody Fri May 17 09:01:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1611745384; cv=none; d=zohomail.com; s=zohoarc; b=GPL/fQKcwz2nsZFgbQn2ejddJF+USnSNZxyg/Sd3ysOQN7OoNv4KTuFueqJO6QYz2FUhLclY1U8ik0SQFPRvHXeW7gMKEoRlmywWe9gGC+ZK/bVEKbKf/r56vMaUplH17mhUQxs9mbbCaa4JKnLahXQ2IEFReUnywhVK4YXSxHI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611745384; 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=dg3lPtAIr14K/zqGaS95xx8Dt+ABTx/f8jFA9Ee42ns=; b=I/eVTwfYRKPD2QUORFy6/c4s6PM8OvVx4lH0cnfvIOdJtV+fYHe5f8TVjnxjQVYYSV64YqHQylcPU+20xB6WzeXthZZp6tv9mboJXwmdChciJ/NxJ995de7+yqtc0+1jtQ7uHibiVQ5uut3Yy6Pt+tvkW2R5ggkWdqaohKD+oyo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16117453841071003.6876382130392; Wed, 27 Jan 2021 03:03:04 -0800 (PST) Received: from localhost ([::1]:51708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4ibG-0005nI-P2 for importer@patchew.org; Wed, 27 Jan 2021 06:03:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4iZi-0004w2-9A for qemu-devel@nongnu.org; Wed, 27 Jan 2021 06:01:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l4iZe-000636-Nl for qemu-devel@nongnu.org; Wed, 27 Jan 2021 06:01:26 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-173-ikopAFnTNACwFUZQkoGobQ-1; Wed, 27 Jan 2021 06:01:19 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 19D0A180E46C; Wed, 27 Jan 2021 11:01:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-27.ams2.redhat.com [10.36.113.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E30765D9C6; Wed, 27 Jan 2021 11:01:14 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 272EC180039D; Wed, 27 Jan 2021 12:01:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611745281; 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=dg3lPtAIr14K/zqGaS95xx8Dt+ABTx/f8jFA9Ee42ns=; b=fNEvmttg96QJ+tkIyFLhwS2SdvvIw1//q55PxcsjUCOFVprpI1nw567XkLYvW828S7oh8b /u/cvFzE6fNxgv4rwycD/gbChGRcvl2uQ8lkJIsItCBMB8NsIVEWMEqRrmYgdym/Pxi789 r/V7XURs7B4J6y000Iyx+F4QluY0Gbo= X-MC-Unique: ikopAFnTNACwFUZQkoGobQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/3] hw/display/vmware_vga: Remove dependency on VNC header Date: Wed, 27 Jan 2021 12:01:12 +0100 Message-Id: <20210127110113.2111855-4-kraxel@redhat.com> In-Reply-To: <20210127110113.2111855-1-kraxel@redhat.com> References: <20210127110113.2111855-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Peter Maydell In commit 2f487a3d40faff1 we fixed a problem observed with using the vmware-vga device and the VNC UI frontend in a belt-and-braces manner: * we made the VNC frontend handle non-multiple-of-16 surface widths * we rounded up the vmware-vga display width to a multiple of 16 However this introduced a spurious dependency of a device model on a UI frontend header. vmware-vga isn't special and should not care about what UI frontend it is using, and the VNC frontend needs to handle arbitrary surface widths because other display device models could use them. Moreover, even if the maximum width in vmware-vga is made a multiple of 16, the guest itself can always program a different width. Remove the dependency on the VNC header. Since we have been using the rounded-up width value since 2014, stick with it rather than introducing a behaviour change, but don't calculate it by rounding up to VNC_DIRTY_BITS_PER_PIXEL any more. Signed-off-by: Peter Maydell Message-Id: <20210112161608.16055-1-peter.maydell@linaro.org> Signed-off-by: Gerd Hoffmann --- hw/display/vmware_vga.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index bef0d7d69a79..e2969a6c81c8 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -29,7 +29,6 @@ #include "qemu/log.h" #include "hw/loader.h" #include "trace.h" -#include "ui/vnc.h" #include "hw/pci/pci.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" @@ -220,7 +219,7 @@ enum { =20 /* These values can probably be changed arbitrarily. */ #define SVGA_SCRATCH_SIZE 0x8000 -#define SVGA_MAX_WIDTH ROUND_UP(2360, VNC_DIRTY_PIXELS_PE= R_BIT) +#define SVGA_MAX_WIDTH 2368 #define SVGA_MAX_HEIGHT 1770 =20 #ifdef VERBOSE --=20 2.29.2