From nobody Mon Feb 9 11:36:21 2026 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; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=fail(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1648561617; cv=pass; d=zohomail.com; s=zohoarc; b=OMXJxXmU3PmV5evLfAXsJlQRQDobljMkU7cYVurRgXcQyeqevhzPGpDj/h8lKYbWVSF9XgJuIUmK8Gmy+X0ALXyg5ocEhw92rcVbrb7XVyYaSBSy/tr9rK6SPVwHywihGKNgtsX8VsPO3nyhu6PRkkMZnI/2pURmeYEobNkVENw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648561617; 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=aWpq8ynHbMCTC5tG3JF67oR8pzzbwd8Jq4ZPLYpS9lI=; b=ktaczGF5AzR6bT3TI+lXSDXmGX+ESS3e+IpxXPkWZ8YgPgbhvHd3rzxn6Aq18O6s3FVMH8SqLcNjqwico2slcY0awq8tBvy9WcCGXi0r8jBhpzE5liFYuAOwwU3QQbg5reMVbPeSE67LFWYYleCf5x1FPILEXUplqZ6wjyQzNiY= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=fail 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 1648561617274737.0937100288498; Tue, 29 Mar 2022 06:46:57 -0700 (PDT) Received: from localhost ([::1]:49216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZCBU-0007Xz-2r for importer@patchew.org; Tue, 29 Mar 2022 09:46:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZC82-0003cu-Qt for qemu-devel@nongnu.org; Tue, 29 Mar 2022 09:43:22 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]:64930) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZC7z-0006eY-Uo for qemu-devel@nongnu.org; Tue, 29 Mar 2022 09:43:22 -0400 Received: from pps.filterd (m0127841.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22TC0LiL028548; Tue, 29 Mar 2022 06:42:54 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 3f20c9e5nw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 29 Mar 2022 06:42:53 -0700 Received: from SN6PR02MB4048.namprd02.prod.outlook.com (2603:10b6:805:2c::26) by BY5PR02MB6193.namprd02.prod.outlook.com (2603:10b6:a03:1fd::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.16; Tue, 29 Mar 2022 13:42:52 +0000 Received: from SN6PR02MB4048.namprd02.prod.outlook.com ([fe80::f5cf:57d:ddf6:945]) by SN6PR02MB4048.namprd02.prod.outlook.com ([fe80::f5cf:57d:ddf6:945%3]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 13:42:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : content-transfer-encoding : mime-version; s=proofpoint20171006; bh=aWpq8ynHbMCTC5tG3JF67oR8pzzbwd8Jq4ZPLYpS9lI=; b=w49Do/Agqwhig7mGJ4Q6oYRgaYbLVV0G8hD0M+oQ8N6YYu0wrhl/5Dm1h2U86vhrl25L 6SU9oT4yJnAV69KsnHDhye++QXGYpuTDS6OhgEdpnpeUSVt50jKO/J0RsgQ3JmpxYXa6 R7jVz9Q/0SjI07CML5nKOO1SteHTReLFxyRKuUUQqEvj3HhOabLVqZeT1F6a7xxBnK9j VAbqT484s0pkz9Hf2lu5ft4g9BoiFYMWuoJowY8DYeK14/1c9DpOdgXI9VonN8ICfkYP rpkveozUYrHXvFnCe8MDbcdU4U0GUKG61orzyvD3NHg6xyE1bJFu+Vc4xRidvvj3rID+ EQ== ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MPTiK101LeDrq2HkAFkFHumkzz1gpv34QEZJMFbVeRbUHwGsDAipgAFtNE2aFntBcG3KcSLWha96PbEz8QSQOJwPeoTlWOkV2xGon5xq3FK/nkmNKOUxa+WNF5KXwdjcmXxOUJxPchbkjM2ThmhDjDY9+BqM7LnowFuG3IEtMbDSp3ij7yAoABLuyO+iF4DQNhgQVkPaklX3KhwCFuSe8LCb3pHrL4CmOKXNn+BXGQtE8YJ2v5ULcVOx7Sj9e4qFhQzV+KBXFgRKRIFCjsSVFLChEDBNd3E8l2frifBqy5x239D39wt3Dvhb2rB1w8bZOpGTHMeRVux047AXWNxJYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aWpq8ynHbMCTC5tG3JF67oR8pzzbwd8Jq4ZPLYpS9lI=; b=P7p0+JzRw+/dQKCK7/ru4liGWWg6ds7B8BY9UHL1jjTk2dHxRi0dOOYAQASSx3eyw20bNJWMEh9IbpuCjQSunVrWt58US9A7kDvP0kCA+qKIuLAOg1Vo0bDWlzmun9JovPdF93n2SqySh6gygjxEo5rvMjgbr5bgnqT5/rvEnglfS8E5k1eyXcnIY35Ix2kwM7lpA7zGGbb6jqsT/Tyvi577AqS5Q7UWulbJZ6xyoF8IjeEuB+r4qK4vpS6ld0h3aIjKwSqr/nscj2EXE/JeZixcblb96hyXFtnKWZg5wgy1IwE6x1+NWVWmpqCYTEjk5LVufOunloKWrHfXWsYuMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none From: Kshitij Suri To: qemu-devel@nongnu.org Subject: [PATCH v3 1/2] Replacing CONFIG_VNC_PNG with CONFIG_PNG Date: Tue, 29 Mar 2022 13:42:34 +0000 Message-Id: <20220329134235.44298-2-kshitij.suri@nutanix.com> X-Mailer: git-send-email 2.22.3 In-Reply-To: <20220329134235.44298-1-kshitij.suri@nutanix.com> References: <20220329134235.44298-1-kshitij.suri@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0208.namprd05.prod.outlook.com (2603:10b6:a03:330::33) To SN6PR02MB4048.namprd02.prod.outlook.com (2603:10b6:805:2c::26) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5198c118-91b0-4c70-40c5-08da118a0539 X-MS-TrafficTypeDiagnostic: BY5PR02MB6193:EE_ X-Microsoft-Antispam-PRVS: x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oxNbaUOThCt4AcmouJW6mdqenzIr9GjO5WKnwnQSgCrdZzlxXZK4a8UxiKrOnXTXNihzdcBE3VSNBZs8mG0NXH/adxxguim2lzmm/Vb9Q0pj9aZnK6Ng9U7m1clORkq+OZz02krXm9xDMK0gdFopO641v659JJoQvUKzA9eB70sxXjPgKLfmwCHngFwaB2VixcLuAxBK96uQoRi3xGZjy3lS0rGMbJXGdmvpmaDwJegkUgnY0QxQahJQ4z+xB+3aSj3hXOYlR4nTIFUT+L4OGMcIhMwHsRLliINet/XJ7LUQ2OAttYKWptHpxHJGIG3NUJnhaqpVQFJ4fHyR3T0UuDf9LhF49phmXBo68c/WB4h38ap1sEKny2eUaohiM/jRJIS40Orom4Vqs335wKWFqqMrPXd1wZFKC5twpQ8zBC8KzlyN75f8pdxoDACMxfNsm3vhE6hDQubX7+0DDHIl/4kGjByyyMNi+PQtxP/8GjsZLXQXOBD2CnURlaglTJJ1jSxsDjhpvwixkn230iWbFprwt+g6027uv94uVpRS5NqYeiY8YlZiNMWZA2BNLjc0kYomvZAhsOwUyhos0/GH+Vxn3sHcEYsu+cal+4pPQn6NYEEcxTTSpLyZDBD/pNl6SAna6LobCa3NVx/vP7Ax0klF5m1fCxmO80zqTio82Jeb/EohSApXI38Th8FBkx2pBBXJi25UU/DqxzoZYreK2A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR02MB4048.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(6512007)(6506007)(508600001)(6666004)(52116002)(8936002)(66476007)(316002)(4326008)(44832011)(66946007)(5660300002)(36756003)(86362001)(6486002)(6916009)(8676002)(66556008)(83380400001)(38100700002)(38350700002)(2906002)(186003)(26005)(107886003)(2616005)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?L01lM0tlVHcvOVpLaVpORmVEMWhtNDBNZHE1Ylg2YVdzcGk4c0ZWaCtsZ0ZV?= =?utf-8?B?QmVBUDIxWFFvaDNoaGZHdGJkR1JLZFg0Q1QrVVBKam5YQ2w5SG5zdnZpZDZL?= =?utf-8?B?UDBueG5ZUGdvUXlEVWlHSWRubGdiMkd4YWFlN2xsaVd1cndBMi9lMVF3ZkFG?= =?utf-8?B?cWh2bFZITFdXK1l3T0dmWmhZRWdrWnNKVWJxcWNFOWF4Njdxb3lsNHZ4NFUr?= =?utf-8?B?L1R3aXgyOG9vMUV1MGJ2NWJId0J1Mld2N0dhM1Z3MHVYQVAwZTFFYzNDYkpx?= =?utf-8?B?YXdBRXNaencyN295Q0phbU5FRlVPTnMxaXdGSlpEeEVRQitTcjAyY1MrQlZQ?= =?utf-8?B?SmNLV3N4QUlISndvUTJFZUNxMEFFeWNHOE1pU1M0SUltUE5OeUk0ZFlDUy9X?= =?utf-8?B?NEcrRUFwc2tSb2VSNkJ1ZmtnTk1LamxXekNZYWwxbWxCNW0xcllpWnBaZ20y?= =?utf-8?B?SHF6SHRiMHk2dUd0UTNMekN0eGl0TGlpL25XdUJZNjVYUGFOZ0xxb3Y2cWdU?= =?utf-8?B?UzJjNzFVUkM3REhCUHdUVS93T2pXajM5MDkvckt2WXFpK0swaVBZMEM2V2w4?= =?utf-8?B?dVRsaVcva3hGanFiVklMYTErbHp2dmY5R1lMbmk5SDFYeXd3c05ucTRrSjlX?= =?utf-8?B?UEhPMlpvUDdnZEFObDVTQzAydkZHV0kvNEtkK3lyRGJwSk13aklnRU5wMDA2?= =?utf-8?B?dVRRTDRrQlk5QVRrai9MRkJ0NzJMbFFGeUgwMkpUclFZUmd0NHdTZFNkMW5J?= =?utf-8?B?QjFhUXNwdi8rUjNGdit5QnFxVjJHdjdHVFdDTXp0anRraFhTTnJudEU0MnZP?= =?utf-8?B?N3k3SzV0cWtYOG5JcExnNUpkc0hKM0ZQeXRFalAxdjcvMS95TmJPbElOQWc1?= =?utf-8?B?LzRGcjNsR0ErTVdkK1pyM25zaUZVTGovZzFicTR3dE1kTFMya21xT0VSVnJx?= =?utf-8?B?RjVDUGdkVkpSTWxKMWVqRmJaeWppOUVsNnQxUnk1YUlsWk1KcS9BMFozT3gv?= =?utf-8?B?cjJ3TFZPYkpVeEl6bmxkTzhFaDM3VUM2a2RMNHZZQ3ZXTEtjaDBDak0zN09z?= =?utf-8?B?Z2Z6L0E4Q0p5aEsxWCtlQjNmYXlFWG9Fd2grZ0kzM1MrYzdEU2Z1anVSY2Rh?= =?utf-8?B?bHdyNlhBcmdjb2lBQ2I5YVRhTFlKSlQ5cGlib0JZZFFtZlNweUI0TmNFdGFM?= =?utf-8?B?ZXJUYXlQMktiWTE4QUpvbVVLZTRqRDJERWFCM1l0RHErUDV4Tk40dEVmRWt1?= =?utf-8?B?aHRmQll4NWtNQWt5Nk5mMUZ2ZVNYamFLTFVFZ3IwcFIzT09lM25yM3I1RlpM?= =?utf-8?B?YnBzZjFHamp2RE41bVN3S3F1SzhaOURqeDNveG5vcEdPRzFWWW03N0N5SEVv?= =?utf-8?B?WFU3d1pCQXg0bTZ0ZE96YmxFUFFmK1BCelJjR3JWMC9EZEV0VXFNYmZnSjQv?= =?utf-8?B?YytWNWt3MFc0bDVITlVxei9tbVE3LzFCOCt1M0JSMVJHUU1scXNNN1VENnZa?= =?utf-8?B?WUt5Nmo3dGVhYUZwM1gwQ1VwWms3Y2FzWVVGaGM3L3o4Yy9SdmNRWTQ5YXNX?= =?utf-8?B?Skdla0c5bGZHUlVINm1JZnpudkhtakZlOGxKL2lFRHNyM0hqMmJGTHRhbDB6?= =?utf-8?B?NHlqRWJPZS8rMWFndzAvanJaUWE1YjZObXlZM1hwYmhKc2hTNWZnUTREeGlE?= =?utf-8?B?NjhLUkpRVXVkOVA5cVp3OGUyVXlnSVZpUjlaQ0xYVzVCNk9BelBhRWw0QjFK?= =?utf-8?B?cllkaUNHY1ZEb28rWjRVQmVKZ0lzOEZJWjFDY3VlTmxJeDJ0OEJZMW03MS8y?= =?utf-8?B?VmpMVHh4TTc3VU1FUC9XRTMwUzJrZ1MzaHRYSStTbERJcnBnN1hUTVNhTXdY?= =?utf-8?B?K3U3V2NoNTk5WXN0cWRVMVRsWkFQYnE3Nm52M2JXL3R4NHZ6QitWVFN6MW1a?= =?utf-8?B?eis3djRuL2tpc0luZTA5NlNkekdKYXBiOUQwU0dic1QyK0VrZHRkUFZvaVhi?= =?utf-8?B?NXY2eStwZUpReXA5b285bkNPTlgvZ0xuc2NNOXNHUXJoTjBUZDMrSTZyc0Rq?= =?utf-8?B?d2dmeFlDRDBtcyt0bWNkWlc0cWVscElTTWJFSWJDQmhEWitPWlZwT0l1ckNX?= =?utf-8?B?dlNGbFFPZUgxeXBxSkl3SzFHY0p4R3dLUU5EYVE4bm9LNThMUDQxNlVJMFgy?= =?utf-8?B?REhGelovaWVqcmdYdTZuR2FGVzgxdTFVRExKM1JWQ2ZJUGUvQjFkSjhqK2pT?= =?utf-8?B?MFgyWWZnREtCR1UzY3hXN3FPd2lXcDRDMWc2QnNBWGNoOXdMaVU2R0oxcUdw?= =?utf-8?B?N1Z5UVRhekhoYS8veDUvQUkxM1VTNVZva2Y2cUlHYkNNZ0l5T1RYWS9hMjZZ?= =?utf-8?Q?cJIQ5mc6fGQ3ldlA=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5198c118-91b0-4c70-40c5-08da118a0539 X-MS-Exchange-CrossTenant-AuthSource: SN6PR02MB4048.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 13:42:51.8393 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j7Pk8l7yJiFpzFgLSlqzFL4jssgdMk0vnpt6dwHomDcdSs+pmkrHQYuG5fdd8ktWlkh1wK1kESwOFC9M7H4HRx3m4vFPm6BkEd69ziEdx+U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR02MB6193 X-Proofpoint-GUID: mCduTPfgjY4_rwRFWch80q8sazZNGBsN X-Proofpoint-ORIG-GUID: mCduTPfgjY4_rwRFWch80q8sazZNGBsN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-29_05,2022-03-29_01,2022-02-23_01 X-Proofpoint-Spam-Reason: safe 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=148.163.155.12; envelope-from=kshitij.suri@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: soham.ghosh@nutanix.com, peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, prerna.saxena@nutanix.com, dgilbert@redhat.com, armbru@redhat.com, Kshitij Suri , philippe.mathieu.daude@gmail.com, kraxel@redhat.com, prachatos.mitra@nutanix.com, eblake@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648561618262100001 Libpng is only detected if VNC is enabled currently. This patch adds a generalised png option in the meson build which is aimed to replace use of CONFIG_VNC_PNG with CONFIG_PNG. Signed-off-by: Kshitij Suri Reviewed-by: Daniel P. Berrang=C3=A9 --- meson.build | 9 ++++----- meson_options.txt | 4 ++-- ui/vnc-enc-tight.c | 18 +++++++++--------- ui/vnc.c | 4 ++-- ui/vnc.h | 2 +- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/meson.build b/meson.build index 282e7c4650..ccb6840a49 100644 --- a/meson.build +++ b/meson.build @@ -1115,14 +1115,13 @@ if gtkx11.found() x11 =3D dependency('x11', method: 'pkg-config', required: gtkx11.found(), kwargs: static_kwargs) endif +png =3D dependency('libpng', required: get_option('png'), + method: 'pkg-config', kwargs: static_kwargs) vnc =3D not_found -png =3D not_found jpeg =3D not_found sasl =3D not_found if get_option('vnc').allowed() and have_system vnc =3D declare_dependency() # dummy dependency - png =3D dependency('libpng', required: get_option('vnc_png'), - method: 'pkg-config', kwargs: static_kwargs) jpeg =3D dependency('libjpeg', required: get_option('vnc_jpeg'), method: 'pkg-config', kwargs: static_kwargs) sasl =3D cc.find_library('sasl2', has_headers: ['sasl/sasl.h'], @@ -1554,9 +1553,9 @@ config_host_data.set('CONFIG_TPM', have_tpm) config_host_data.set('CONFIG_USB_LIBUSB', libusb.found()) config_host_data.set('CONFIG_VDE', vde.found()) config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_s= erver) +config_host_data.set('CONFIG_PNG', png.found()) config_host_data.set('CONFIG_VNC', vnc.found()) config_host_data.set('CONFIG_VNC_JPEG', jpeg.found()) -config_host_data.set('CONFIG_VNC_PNG', png.found()) config_host_data.set('CONFIG_VNC_SASL', sasl.found()) config_host_data.set('CONFIG_VIRTFS', have_virtfs) config_host_data.set('CONFIG_VTE', vte.found()) @@ -3638,11 +3637,11 @@ summary_info +=3D {'curses support': curses} summary_info +=3D {'virgl support': virgl} summary_info +=3D {'curl support': curl} summary_info +=3D {'Multipath support': mpathpersist} +summary_info +=3D {'PNG support': png} summary_info +=3D {'VNC support': vnc} if vnc.found() summary_info +=3D {'VNC SASL support': sasl} summary_info +=3D {'VNC JPEG support': jpeg} - summary_info +=3D {'VNC PNG support': png} endif if targetos not in ['darwin', 'haiku', 'windows'] summary_info +=3D {'OSS support': oss} diff --git a/meson_options.txt b/meson_options.txt index 52b11cead4..d85734f8e6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -177,12 +177,12 @@ option('vde', type : 'feature', value : 'auto', description: 'vde network backend support') option('virglrenderer', type : 'feature', value : 'auto', description: 'virgl rendering support') +option('png', type : 'feature', value : 'auto', + description: 'PNG support with libpng') option('vnc', type : 'feature', value : 'auto', description: 'VNC server') option('vnc_jpeg', type : 'feature', value : 'auto', description: 'JPEG lossy compression for VNC server') -option('vnc_png', type : 'feature', value : 'auto', - description: 'PNG compression for VNC server') option('vnc_sasl', type : 'feature', value : 'auto', description: 'SASL authentication for VNC server') option('vte', type : 'feature', value : 'auto', diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index 7b86a4713d..e879cca7f5 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -32,7 +32,7 @@ INT32 definitions between jmorecfg.h (included by jpeglib.h) and Win32 basetsd.h (included by windows.h). */ =20 -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG /* The following define is needed by pngconf.h. Otherwise it won't compile, because setjmp.h was already included by qemu-common.h. */ #define PNG_SKIP_SETJMP_CHECK @@ -95,7 +95,7 @@ static const struct { }; #endif =20 -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG static const struct { int png_zlib_level, png_filters; } tight_png_conf[] =3D { @@ -919,7 +919,7 @@ static int send_full_color_rect(VncState *vs, int x, in= t y, int w, int h) int stream =3D 0; ssize_t bytes; =20 -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG if (tight_can_send_png_rect(vs, w, h)) { return send_png_rect(vs, x, y, w, h, NULL); } @@ -966,7 +966,7 @@ static int send_mono_rect(VncState *vs, int x, int y, int stream =3D 1; int level =3D tight_conf[vs->tight->compression].mono_zlib_level; =20 -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG if (tight_can_send_png_rect(vs, w, h)) { int ret; int bpp =3D vs->client_pf.bytes_per_pixel * 8; @@ -1020,7 +1020,7 @@ static int send_mono_rect(VncState *vs, int x, int y, struct palette_cb_priv { VncState *vs; uint8_t *header; -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG png_colorp png_palette; #endif }; @@ -1082,7 +1082,7 @@ static int send_palette_rect(VncState *vs, int x, int= y, int colors; ssize_t bytes; =20 -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG if (tight_can_send_png_rect(vs, w, h)) { return send_png_rect(vs, x, y, w, h, palette); } @@ -1233,7 +1233,7 @@ static int send_jpeg_rect(VncState *vs, int x, int y,= int w, int h, int quality) /* * PNG compression stuff. */ -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG static void write_png_palette(int idx, uint32_t pix, void *opaque) { struct palette_cb_priv *priv =3D opaque; @@ -1379,7 +1379,7 @@ static int send_png_rect(VncState *vs, int x, int y, = int w, int h, buffer_reset(&vs->tight->png); return 1; } -#endif /* CONFIG_VNC_PNG */ +#endif /* CONFIG_PNG */ =20 static void vnc_tight_start(VncState *vs) { @@ -1706,7 +1706,7 @@ void vnc_tight_clear(VncState *vs) #ifdef CONFIG_VNC_JPEG buffer_free(&vs->tight->jpeg); #endif -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG buffer_free(&vs->tight->png); #endif } diff --git a/ui/vnc.c b/ui/vnc.c index 310a873c21..8376291b47 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2165,7 +2165,7 @@ static void set_encodings(VncState *vs, int32_t *enco= dings, size_t n_encodings) vs->features |=3D VNC_FEATURE_TIGHT_MASK; vs->vnc_encoding =3D enc; break; -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG case VNC_ENCODING_TIGHT_PNG: vs->features |=3D VNC_FEATURE_TIGHT_PNG_MASK; vs->vnc_encoding =3D enc; @@ -3256,7 +3256,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSoc= ket *sioc, #ifdef CONFIG_VNC_JPEG buffer_init(&vs->tight->jpeg, "vnc-tight-jpeg/%p", sioc); #endif -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG buffer_init(&vs->tight->png, "vnc-tight-png/%p", sioc); #endif buffer_init(&vs->zlib.zlib, "vnc-zlib/%p", sioc); diff --git a/ui/vnc.h b/ui/vnc.h index a7149831f9..a60fb13115 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -201,7 +201,7 @@ typedef struct VncTight { #ifdef CONFIG_VNC_JPEG Buffer jpeg; #endif -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG Buffer png; #endif int levels[4]; --=20 2.22.3 From nobody Mon Feb 9 11:36:21 2026 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; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=fail(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1648561486; cv=pass; d=zohomail.com; s=zohoarc; b=UV9ALoraQAII47WvtJDAoVW7/b5h74jipjmWsRQdajlSJ5A0onpWPvjrIK4qJVJO3EXizcpBSKRq1AAIaHwsYwpwjGz+VzEB8RON7RXgff5nFNLsMKHxs5mHb3GzeJKXEczHK6kEZw7MGAIYaIvdXoBGR8cw46Ra38AYtEEVIrI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648561486; 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=9+nymWdD1OZE7bTOh7Ta8REDHqHKpFEDpkDtjzatZAg=; b=dxW4Lajtgi26AR2YbMaPNiXFcTnMU9dIxjJOXBQfD6T2bcocNSUTNhPCbTHzlqz/1KeKBXdfklC8+jr6fV6vmsxmds9jVTHQPb8jQ+VxeMHuu4OAAolMvg0yNivJ6KMkt+9Vra8WS0+Ya+RbJ20qLM9HSZpc31elKQKYweI/e+w= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=fail 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 1648561486200127.98368791763687; Tue, 29 Mar 2022 06:44:46 -0700 (PDT) Received: from localhost ([::1]:46016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZC9M-00058t-LK for importer@patchew.org; Tue, 29 Mar 2022 09:44:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZC86-0003gL-Vn for qemu-devel@nongnu.org; Tue, 29 Mar 2022 09:43:27 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]:41038) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZC84-0006fD-5S for qemu-devel@nongnu.org; Tue, 29 Mar 2022 09:43:26 -0400 Received: from pps.filterd (m0127839.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22TA0q66014432; Tue, 29 Mar 2022 06:42:57 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 3f21wf60ax-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 29 Mar 2022 06:42:56 -0700 Received: from SN6PR02MB4048.namprd02.prod.outlook.com (2603:10b6:805:2c::26) by BY5PR02MB6193.namprd02.prod.outlook.com (2603:10b6:a03:1fd::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.16; Tue, 29 Mar 2022 13:42:54 +0000 Received: from SN6PR02MB4048.namprd02.prod.outlook.com ([fe80::f5cf:57d:ddf6:945]) by SN6PR02MB4048.namprd02.prod.outlook.com ([fe80::f5cf:57d:ddf6:945%3]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 13:42:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : content-transfer-encoding : mime-version; s=proofpoint20171006; bh=9+nymWdD1OZE7bTOh7Ta8REDHqHKpFEDpkDtjzatZAg=; b=oXJeULqwlyxHF5laFB4sJnjfx7qDxZG6vxMhed397d+zDM95VbeIJRf3KAZZT6AsRNdY MtkQNaA8XIi6q2PZvPrJAPwYCmv3mqqxUOn/vWNUu/EbwBriAIeqaKSriDsst1YI6UGm BWM9X8VwhVhbg9cf4swYXldAOvMkhdZ9RtzGd15Nvy3QWkEbndXjjmy2uMoC8+1ADg6P sMZBlPHP6MljI2h3plho4jnXD0eXBN0R8LWrE/0kpl/eGTolbXMRzTS5hAO//M4RfydM fq7KdQsnOqeupPTP1EqY5LoLN9WaJthHughp7yajPhoDTanvazImtauRAeZqPrNKnpuw NA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cDwTOqlC0H0JvqjkmFEyUi8anJjnVhuOC03lHRoRUDmY8pJULfRGns0G63b6NZ9MHEp6hm8r2Vhc2ZyhevSm2z3SjAii6cLRk+7RzR5nY3E2O7yZfc/8p89B3tTb2JA1rPgXts4hejOyAIgQ21Vb4Uz7jgGHTXPTLso1dBtqPDRYwzRVZO3uttpQpxOdBAYP4ZFze5k5znbWp+PxSSrljPy1iEiwsaxApq0T/Ff5dAlejpUfAUEFNBCo5CKdU9DwcdeVhlpsa/CXCSLw3SZPituRmGH/Lr2X3PyTb+vSVvQDOnD2o55685RqCp5h090qFuQ6y35mbnvuFHQ9BGjzkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9+nymWdD1OZE7bTOh7Ta8REDHqHKpFEDpkDtjzatZAg=; b=jQzyWAUCeo6NTYcCOSnrtsZP+2wtG+dww0IbnM9/vm/JBogNp5l4FgOpD8biAp0wfTyw7Eh5YyLUpqBQlnD5UJw5FNEgjvMyYqB/B6/2UfZP+qps7keGtJaLfPeO0os2L9xPKeVrPkjkSSy1VSGeNp54im3MF4evuCYVzydUwhY0i8mX48NFkXiTlIzqc/QvhRsyX07EMDMpxMG9kBKlQYBQSoAEwrMQTAHQFyr00eaXgXtXQY2FrVnPHXKjfq5IU2nt4cS3iaFk4q1wokV1yRt3nFqYoaLgdnuta0nzOO07LMiDMXUG/nWKgEoJiGN95letzTF0It3U0Ut9EWcw0Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none From: Kshitij Suri To: qemu-devel@nongnu.org Subject: [PATCH v3 2/2] Added parameter to take screenshot with screendump as PNG Date: Tue, 29 Mar 2022 13:42:35 +0000 Message-Id: <20220329134235.44298-3-kshitij.suri@nutanix.com> X-Mailer: git-send-email 2.22.3 In-Reply-To: <20220329134235.44298-1-kshitij.suri@nutanix.com> References: <20220329134235.44298-1-kshitij.suri@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0208.namprd05.prod.outlook.com (2603:10b6:a03:330::33) To SN6PR02MB4048.namprd02.prod.outlook.com (2603:10b6:805:2c::26) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b61f8b69-f903-49e8-7202-08da118a06f9 X-MS-TrafficTypeDiagnostic: BY5PR02MB6193:EE_ X-Microsoft-Antispam-PRVS: x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6pD3CQSXtNjavK9z8/w0VkcvHg9Hap2qoZH8em6CBux1UYiE51nF4hdUwV2u0+dyUVN9FysJPOXrGRxi3Hspnbq0+PsO2UT7tLipiypgesRIJrh621und+kVrbMAFCHQP+vLRwy3wfIIsHqzWJj35NfP2JWamnuXIIDPTKC1xPMdGE0ZkIF83nQAzwTg+nEhh21IHgSqjDAaSJNVQz5vIS33tdCTIcG+bIkYv/dgaJ4q5LGUz6Xu7M7XeODwwpi+TlGbSIPMiclCpXQISWWvvxmqCl/kT/uZnXPAowyuEvJ/MXLISxMmEF8DkJsDC28RtOLXEHaE7GpiOMbZjwRjxV1V7TwPJdnhDzmqc18Y1sDLtKlAihEMkOyPFDBH0OtLI53mY01gJ4MyhMF9kip/iYVHxEV+oW6LpKZV1kkNIs/A2FV9JlNTQPP/YszJrVgaxfmX0g+xw+nPzdWIFiPNg3JG9BPkt7VRdBh6wJ0aSSnU9QjUJ/DNhGYDdT3Gz4/qZ98z4dQ3d+Vu7ntj0AKhkaJscYU+51etfq47kjdapKNYPyYny+bYPfj8Ed+GWwjX5NyeDv1XlDxzQRH4VlCDoRES35rJoxCKys1zsFwWTciqcsYmCdTKIgQHCJDAA6th0lwhk80ePJujaJuGldrpxmXG26z8hg6tq3Ih4f8iBOY3+fY+fEvUJkBCxrm++SZIOPk4v/T+KAjRd4iYNq+QAI25wnR1Hav+V4fT4crg4tXUU52ksPuTsxRfw8rlk4yTBkicVmJbJka614H2kma9bkUH8VasLe5krLPfjxwbG/w= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR02MB4048.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(6512007)(6506007)(508600001)(6666004)(52116002)(8936002)(66476007)(316002)(4326008)(44832011)(66946007)(5660300002)(36756003)(86362001)(966005)(6486002)(6916009)(8676002)(66556008)(83380400001)(38100700002)(38350700002)(2906002)(186003)(26005)(107886003)(66574015)(2616005)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cFU5cER4OGVuZ2NjTzl3OWQvUkx6c1dxeUxNdW02MElaMzUwM3o3Q1hpQXRr?= =?utf-8?B?UDdJdUhLUU9qTFNYbU9xcDVWYW0yaFk4bW9qU1N2L0cxdTdhWnJoeVNQYS9p?= =?utf-8?B?RS9vLzY3bE0rY3BoSnRJTGdxZ0tNRExsSE5VSytEc0FvNllXSkIzZjcyNG9I?= =?utf-8?B?MExWSTk2R3lERVE5WXNidG8vQVM4cCthZ203RThLZFNqQzVFMEZHOENhMjNU?= =?utf-8?B?TWxVcFl3RjRKSEFXdXJBUnBiUUlBSzk3RnFVQ3FaR0Nka2xNODZlaE1vclBa?= =?utf-8?B?cFJudWpnZGwyclkxc2hsODZzMk44SDcxbE90RXIzUFQ3ZVZCa2g5V01MKzY2?= =?utf-8?B?dzZmV2ptaXZZb1pWZzlUcWZ0WnhPSmhJaTZqYm42WjNBYTNIWUduSGhxT2Ey?= =?utf-8?B?RUJCUm9sZzZMeElSZmtlSFJVTER3c0tyNUI0NE1HbnE3TE84QTh2RlREVWNH?= =?utf-8?B?ckVnaXBxWmNSTVk0bk9MRSthcU1IaDNMOXRnendnQzYvRFp3UnVlNGNJL1lE?= =?utf-8?B?ZVVqbm9XVFZSbWw1WUVxUkFzQ3c2TUJQekQyUkZ2Y0RyblYxL1lDbWx0MWdw?= =?utf-8?B?L0V6Wm1sbklIUWJZaHBkb2gyOVIrMkFSYUxBcmwya0NOWmxzb1IydjFZcGx4?= =?utf-8?B?VXhCUi92WDFoNWFScjFZWUEveDNwT05MRGhob0FFMGxMcnl4eTh4RVV1TDdo?= =?utf-8?B?S2ZLTzRVeGxsOE45WmdMNjQ4elFsYXQ1cG1oNkJFdHUwVXo2NHVNK0twMlJR?= =?utf-8?B?VERQKzByNkJVL3ZMSStWUkZxSHc0eHdDVGdwMVdzQWxRckdLZkl1SlhmZHcz?= =?utf-8?B?MjJWMzVOVXhJSFhWb296L3hlRUlJVU1iZTRQRllzbXNVUFRIbFFhSHJyeHZG?= =?utf-8?B?MXJQM0VKMEZEQnB5ZGY1eDRpV0RtZXRoTm1MUlNaNmNCYTdzRlBrd1djZW1l?= =?utf-8?B?RDhIUG0wdkpSQUJaaEVRQXJzczI5SlFOU1VFRm0xVTZWbStBWFBaN3NBaDRM?= =?utf-8?B?UHNvN1pxcE8vUnlPQlZJaHdTSit6bWpLUEJBek1MdVc2NnloYWhJTTlNTmlD?= =?utf-8?B?c0FaSWxPWWhVV3BSei9qNGY5V0c2MjRTMnZmd0J5VDN0SmFlNENoTG5SSkJW?= =?utf-8?B?QlZqZXdJRFRpK3BONlF1aTNtL09wUFlMZmtCZ2gra3VYczVpNHJ4cWt4cWo2?= =?utf-8?B?SjBKSnVjanMwaUF3d2JBdTZycmxxc2RXVklBeXlvdlNOcytYNTlCNmV2aUhU?= =?utf-8?B?Z1BxQVdWRDhHMG9sWFlTeWZFRUp3cjJ3QUgwM2RFdVNvSTRhc0hDZUh5SzFx?= =?utf-8?B?YmtJOStheDVhSmFJUlAwb1czMENRZWVVa1FML0d4Q1dWaUtvQitoQ1U3RDQ1?= =?utf-8?B?eHdiVzFjckMzOXo4UVRoc1NtaUFXTXJGdDNoQmlrdWJUM1JGMjZyTERTQ1di?= =?utf-8?B?a0pZdXJlc2llVERDWTU2Z1dYQTVrcnpDTE1wYUQ4MHFzRFRNNXh2dGIvV3Rk?= =?utf-8?B?VjMwL3krYkltQkUrVEdqcFhhaU1HWUhwb3h1NkpTbG5IYURML3hFVlNTdmwx?= =?utf-8?B?TFNMcHNGaERKYXkvTTFDd2xZRUMvNWY4SnpPZ2NtL1JsZFg2aEJEV1duM08x?= =?utf-8?B?SXZzZTFJT0U2bkRhZUhjcDZoMEZjSWRYaTgvcWtZQjE3M294TXdZQjBDQ0ZP?= =?utf-8?B?OStrRlNlaUE5SDBTUTNRT1pWS2FNMU1jazRzY0hhQlBQcjhRQ2xkc2NPdEUv?= =?utf-8?B?Z09OdmdTUmZpaDRhVDExdkZoK0tHWVVoejB3UzBKcVhCM2paYkhDMjE4Skkx?= =?utf-8?B?bjlCUm9XNkVHL3c3SkYrZWsyVDhUdVp1YU5tSVExMVpQYlVwWTVXUkFjRU8v?= =?utf-8?B?TlFlR2dIL29RQVZGamZvWUFVdWxxWVovVG1Ub1hWMXRUVnArelVaM0xCeGJp?= =?utf-8?B?S29GOENFVFRBcjVudEcvbG5namRwWStsUmRpWmxEODNWd3pzNFMxYStJczZP?= =?utf-8?B?NElqTGRRUGVRQndVb3dWbDZGdjF2VGI2WnVYd2ZSL3VXTlJjUFVueFd1dTBl?= =?utf-8?B?UTRJbVprTnl6eUk0ZW9CenRNd25WM0RUL3lPTW9NQmV3N1VRQXNRTEpqaHY0?= =?utf-8?B?ai95MFFGWlFTREtxbDFIa1JuMDQvd0VpdWsyK3JzMStkRjdBRElhdWxYbXJB?= =?utf-8?B?RUxzWUw4VG9nMTJ5NjVSN2xDeHRNK2VRUExTajdvZDdDZ25mamlVQzdFS2xC?= =?utf-8?B?aHhSbzNIbmFBUmE5aW1qVlNuNVlhQUpOUUdRSkVXb1Z3TXZMZWRSZVcydE9Y?= =?utf-8?B?WHliK1piRGdZZlM2UVJXVDFvdFVqM0FiMHNXMjVSS080OFQ4UXU4VkJCa2R1?= =?utf-8?Q?OQ0ksUxm2cGD8MZA=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: b61f8b69-f903-49e8-7202-08da118a06f9 X-MS-Exchange-CrossTenant-AuthSource: SN6PR02MB4048.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 13:42:54.7610 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZL1cKQ5GL3B60dwtyMwNBoxBUso5+jXWtk8z06vvTqCLW0MRjPrS4tkqEZbbrQ5HJhz2xxaCqJIqEK26A36/fcRKfoAYNwV4ZohzbhziVBg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR02MB6193 X-Proofpoint-GUID: WwUPWaoIA8HgBY5hcAfg0sHEo1XVSKgO X-Proofpoint-ORIG-GUID: WwUPWaoIA8HgBY5hcAfg0sHEo1XVSKgO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-29_05,2022-03-29_01,2022-02-23_01 X-Proofpoint-Spam-Reason: safe 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=148.163.151.68; envelope-from=kshitij.suri@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: soham.ghosh@nutanix.com, peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, prerna.saxena@nutanix.com, dgilbert@redhat.com, armbru@redhat.com, Kshitij Suri , philippe.mathieu.daude@gmail.com, kraxel@redhat.com, prachatos.mitra@nutanix.com, eblake@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648561487102100003 Currently screendump only supports PPM format, which is un-compressed and n= ot standard. Added a "format" parameter to qemu monitor screendump capabilites to support PNG image capture using libpng. The param was added in QAPI sche= ma of screendump present in ui.json along with png_save() function which conve= rts pixman_image to PNG. HMP command equivalent was also modified to support the feature. Example usage: { "execute": "screendump", "arguments": { "filename": "/tmp/image", "format":"png" } } Resolves: https://gitlab.com/qemu-project/qemu/-/issues/718 Signed-off-by: Kshitij Suri Reviewed-by: Daniel P. Berrang=C3=A9 --- diff to v2: - HMP fixes for png - Used enum for image format - Fixed descriptions and updated qemu support versions hmp-commands.hx | 11 ++--- monitor/hmp-cmds.c | 12 +++++- qapi/ui.json | 24 +++++++++-- ui/console.c | 101 +++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 136 insertions(+), 12 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 8476277aa9..19b7cab595 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -244,11 +244,12 @@ ERST =20 { .name =3D "screendump", - .args_type =3D "filename:F,device:s?,head:i?", - .params =3D "filename [device [head]]", - .help =3D "save screen from head 'head' of display device 'd= evice' " - "into PPM image 'filename'", - .cmd =3D hmp_screendump, + .args_type =3D "filename:F,format:s?,device:s?,head:i?", + .params =3D "filename [format] [device [head]]", + .help =3D "save screen from head 'head' of display device 'd= evice'" + "in specified format 'format' as image 'filename'." + "Currently only 'png' and 'ppm' formats are supporte= d.", + .cmd =3D hmp_screendump, .coroutine =3D true, }, =20 diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 634968498b..2442bfa989 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1720,9 +1720,19 @@ hmp_screendump(Monitor *mon, const QDict *qdict) const char *filename =3D qdict_get_str(qdict, "filename"); const char *id =3D qdict_get_try_str(qdict, "device"); int64_t head =3D qdict_get_try_int(qdict, "head", 0); + const char *input_format =3D qdict_get_try_str(qdict, "format"); Error *err =3D NULL; + ImageFormat format; =20 - qmp_screendump(filename, id !=3D NULL, id, id !=3D NULL, head, &err); + format =3D qapi_enum_parse(&ImageFormat_lookup, input_format, + IMAGE_FORMAT_PPM, &err); + if (err) { + goto end; + } + + qmp_screendump(filename, id !=3D NULL, id, id !=3D NULL, head, + input_format !=3D NULL, format, &err); +end: hmp_handle_error(mon, err); } =20 diff --git a/qapi/ui.json b/qapi/ui.json index 664da9e462..24371fce05 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -157,12 +157,27 @@ ## { 'command': 'expire_password', 'boxed': true, 'data': 'ExpirePasswordOpti= ons' } =20 +## +# @ImageFormat: +# +# Supported image format types. +# +# @png: PNG format +# +# @ppm: PPM format +# +# Since: 7.1 +# +## +{ 'enum': 'ImageFormat', + 'data': ['ppm', 'png'] } + ## # @screendump: # -# Write a PPM of the VGA screen to a file. +# Capture the contents of a screen and write it to a file. # -# @filename: the path of a new PPM file to store the image +# @filename: the path of a new file to store the image # # @device: ID of the display device that should be dumped. If this paramet= er # is missing, the primary display will be used. (Since 2.12) @@ -171,6 +186,8 @@ # parameter is missing, head #0 will be used. Also note that the he= ad # can only be specified in conjunction with the device ID. (Since 2= .12) # +# @format: image format for screendump is specified. (default: ppm) (Since= 7.1) +# # Returns: Nothing on success # # Since: 0.14 @@ -183,7 +200,8 @@ # ## { 'command': 'screendump', - 'data': {'filename': 'str', '*device': 'str', '*head': 'int'}, + 'data': {'filename': 'str', '*device': 'str', '*head': 'int', + '*format': 'ImageFormat'}, 'coroutine': true } =20 ## diff --git a/ui/console.c b/ui/console.c index da434ce1b2..f42f64d556 100644 --- a/ui/console.c +++ b/ui/console.c @@ -37,6 +37,9 @@ #include "exec/memory.h" #include "io/channel-file.h" #include "qom/object.h" +#ifdef CONFIG_PNG +#include +#endif =20 #define DEFAULT_BACKSCROLL 512 #define CONSOLE_CURSOR_PERIOD 500 @@ -291,6 +294,89 @@ void graphic_hw_invalidate(QemuConsole *con) } } =20 +#ifdef CONFIG_PNG +/** + * png_save: Take a screenshot as PNG + * + * Saves screendump as a PNG file + * + * Returns true for success or false for error. + * + * @fd: File descriptor for PNG file. + * @image: Image data in pixman format. + * @errp: Pointer to an error. + */ +static bool png_save(int fd, pixman_image_t *image, Error **errp) +{ + int width =3D pixman_image_get_width(image); + int height =3D pixman_image_get_height(image); + g_autofree png_struct *png_ptr =3D NULL; + g_autofree png_info *info_ptr =3D NULL; + g_autoptr(pixman_image_t) linebuf =3D + qemu_pixman_linebuf_create(PIXMAN_a8r8g8b8, wi= dth); + uint8_t *buf =3D (uint8_t *)pixman_image_get_data(linebuf); + FILE *f =3D fdopen(fd, "wb"); + int y; + if (!f) { + error_setg_errno(errp, errno, + "Failed to create file from file descriptor"); + return false; + } + + png_ptr =3D png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, + NULL, NULL); + if (!png_ptr) { + error_setg(errp, "PNG creation failed. Unable to write struct"); + fclose(f); + return false; + } + + info_ptr =3D png_create_info_struct(png_ptr); + + if (!info_ptr) { + error_setg(errp, "PNG creation failed. Unable to write info"); + fclose(f); + png_destroy_write_struct(&png_ptr, &info_ptr); + return false; + } + + png_init_io(png_ptr, f); + + png_set_IHDR(png_ptr, info_ptr, width, height, 8, + PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + + png_write_info(png_ptr, info_ptr); + + for (y =3D 0; y < height; ++y) { + qemu_pixman_linebuf_fill(linebuf, image, width, 0, y); + png_write_row(png_ptr, buf); + } + qemu_pixman_image_unref(linebuf); + + png_write_end(png_ptr, NULL); + + png_destroy_write_struct(&png_ptr, &info_ptr); + + if (fclose(f) !=3D 0) { + error_setg_errno(errp, errno, + "PNG creation failed. Unable to close file"); + return false; + } + + return true; +} + +#else /* no png support */ + +static bool png_save(int fd, pixman_image_t *image, Error **errp) +{ + error_setg(errp, "Enable PNG support with libpng for screendump"); + return false; +} + +#endif /* CONFIG_PNG */ + static bool ppm_save(int fd, pixman_image_t *image, Error **errp) { int width =3D pixman_image_get_width(image); @@ -329,7 +415,8 @@ static void graphic_hw_update_bh(void *con) /* Safety: coroutine-only, concurrent-coroutine safe, main thread only */ void coroutine_fn qmp_screendump(const char *filename, bool has_device, const char *device, - bool has_head, int64_t head, Error **errp) + bool has_head, int64_t head, + bool has_format, ImageFormat format, Error **errp) { g_autoptr(pixman_image_t) image =3D NULL; QemuConsole *con; @@ -385,8 +472,16 @@ qmp_screendump(const char *filename, bool has_device, = const char *device, * yields and releases the BQL. It could produce corrupted dump, but * it should be otherwise safe. */ - if (!ppm_save(fd, image, errp)) { - qemu_unlink(filename); + if (has_format && format =3D=3D IMAGE_FORMAT_PNG) { + /* PNG format specified for screendump */ + if (!png_save(fd, image, errp)) { + qemu_unlink(filename); + } + } else { + /* PPM format specified/default for screendump */ + if (!ppm_save(fd, image, errp)) { + qemu_unlink(filename); + } } } =20 --=20 2.22.3