From patchwork Tue Aug 3 13:24:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 12416355 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED2DEC432BE for ; Tue, 3 Aug 2021 13:27:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7BBC760724 for ; Tue, 3 Aug 2021 13:27:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7BBC760724 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:56988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAuSB-0002N5-In for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 09:27:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQr-0000Df-Ct for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:09 -0400 Received: from mail-mw2nam10hn2246.outbound.protection.outlook.com ([52.100.157.246]:23648 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQp-0001X3-O5 for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gp4ATomTb6nGDqm2ZlFAroWoOcIAvxdLcvskzFBjWoiRMI3jzK7b393/vUY7XzoYqy3zXi9cJK/5Es5LfzT4q96CO58Iy5QrtEQidobfFuK9HzNVuI9PICeg/WHngs//lYgCfrbJHR9w/ATJmMKaLoyGnadPv0CSoSrHCP3uoUnLAPWaEGiaRyAk9Y0uQ7CNysBwiY2aZc4AoS7tulLnY5t2O0fx7yQ5Tl4ybsVQUWW0jhLro0/8QPRrweUE7dkLOmWZvHElJ+V4wg1KqX3Y34sbAUcMn4lhR+eGc2ht01alWwLFQwu/HpfxpOJgyBVo7S+9QEO36I6QxN6ZK7awIw== 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-SenderADCheck; bh=et5Km8zdgm2AUr04gfYaQ7eetKwbJS4a1xbFvV7Mdgo=; b=JqEdP2FMtLPa+Yl83d98lh/a+A3F3ORaJTc08jpXwGVDkQe0y8gkER+H+vy7rCrKvPYUttMo4E0qP3gHC7k8KgQ+UDI1bcObWU8kruNKmZb/dG+COR6APND05lWUTlWQCP23sITVw9sxpOVRkMfiVMbhorhaEM0Llod94k1fqhpxaDkgBLu1pvgxa/4XV1bNUS3jVap6ARWrNpCOd4d5TZr0PulMdySAxMhlg1JGKrXOC2/IEZluWHAL/Jcsom2V+QfufCwrm01E6ld7FUvpyiE6VMzQXu43QDHzTpuxrR4tbbA81d7rLrEPytQpz6NCrV63qkhP2zGeLI1o34PQSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=et5Km8zdgm2AUr04gfYaQ7eetKwbJS4a1xbFvV7Mdgo=; b=sovYJFGJMU0r5HuBCzPjVW2hjj1Tqy5wI8vFqWKlZchZzWyhVQu0CRVOQ5eXQoJNldatM74/NsbxK6Kv7pQEmrQsmAeVu4vR4I+BSyM8hh9hIqkoZQ8dVFbOsBk7GVxMRu2FW7OmsZva41A4n5gua83QvcRskjS4yLeu0PCpzuQ= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4136.namprd12.prod.outlook.com (2603:10b6:610:a4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Tue, 3 Aug 2021 13:26:03 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0%7]) with mapi id 15.20.4373.026; Tue, 3 Aug 2021 13:26:03 +0000 From: Michael Roth To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Basil Salman , Basil Salman Subject: [PULL for-6.1 1/6] qga-win: Increase VSS freeze timeout to 60 secs instead of 10 Date: Tue, 3 Aug 2021 08:24:47 -0500 Message-Id: <20210803132450.1093602-2-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210803132450.1093602-1-michael.roth@amd.com> References: <20210803132450.1093602-1-michael.roth@amd.com> X-ClientProxiedBy: SN7P222CA0030.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:124::25) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (165.204.77.11) by SN7P222CA0030.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:124::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.20 via Frontend Transport; Tue, 3 Aug 2021 13:26:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f22cca02-857f-4eaf-e540-08d956823dfd X-MS-TrafficTypeDiagnostic: CH2PR12MB4136: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B/EHXCCL2G4E07ANx2h8fulcveNdiaD4Wd1TyVvdmlW6+NsgLHeC+X28W1ieg1uTg0FVm3lCzZ93inG3WDWZ2V/StemBCfq5k66CjP0X+TY+1ouHy63Aku9IyQwH7C7RFsOiRME/GKMLN6SBSzqSrx3yMjSmtmGx8fmaYq/ZAl8azltBq5ZrZwwk7e7p1zzzG0n+9KykapHrFfiWQhtTsP6uIe3k6xUB7xaS5LULzY+M/ZOROKDjRmpXfMwAv+CauLKlhY4shk7EZHK4MrANGpVObHTCmKEygyrxGDhhlUoIlZedmwae3Dvrb1aPOQ4q09T2r3pR8n+u0tVx1MibPmyXNFkwJ2zh3jjvRzlvbB/2Rh84M31qe3TTz8CgYqexbPd+v04y3v0smyQheVFC/vkiS8FCPUtKE4+sojcrK/kA74EcHqj7NSNfRY5T84DCUU2r9YZJSrN6ssDM4aJtVR0J+TwQ1xKYXsNTyHzAw0NW1eRxNE5Z+el5gPHcJcavj/NVAduhymSTfQd5OJsmdJLf4lhc1Mp8kttxcrl6BDITwwWNgQG0EVKij9M/x9weTW3PBi+0JkcPKF0ZevIiQuD12wiGejlUWDmP6NsbK1QGJZmKMi8hrvkXR3Q8Yag689eu8SkHiEetkb84cFEsj+IxbcOMpq8b1/emnJvsAXpIefeibQWVHA0O5unXEo0hPxO/J1jyZ6Gh2iP01P5UVC1uUGDqaE3CHLuC+KH/n12NEiMO4b1PdhNqW5rzFgz7GiRA+UsusekelCTK+zvHs8elj6yNqCXyyr9edXldsTug4hl9y24RDIBOYmSq7fN0DHyjAIVd5te70PxnlYG3722DxjW+XF+A01YPTiue4beBv/38pGXOUMHmw6zcCsgpA6sEz+Jv7393KBOTg6s3WlcB3rtap5GOzLw6jBoJ1fsnRDpOm7byeYwdGcMV8E6kfuNX9WSEKVbie9Nhhf0onKPhc862jQxuAvkUx9lfx36h4FL0OVF75wb2M+Z2BaqpsKnk7HI282pezrc97OXfp6IBTyhslRecaTnkrgDuq5JNWPY2NN8ccF9HgaSzJJorLxhEysWX1SkcgCEZP2dFWkQKrSNKtx2crMAzjFBB2QtWhwQjD9bbIO567ZaJgtD+pbQ75hWaKUGZrXipjOM2ODGnMsuOUsXWF50Kr8iesdU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:5; SRV:; IPV:NLI; SFV:SPM; H:CH2PR12MB4133.namprd12.prod.outlook.com; PTR:; CAT:OSPM; SFS:(4636009)(136003)(346002)(39860400002)(366004)(376002)(396003)(316002)(2906002)(38100700002)(44832011)(83380400001)(8936002)(1076003)(36756003)(6486002)(6496006)(52116002)(54906003)(38350700002)(2616005)(956004)(478600001)(5660300002)(66476007)(186003)(66946007)(8676002)(66556008)(26005)(4326008)(6666004)(86362001)(6916009)(966005)(23200700001); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UlJXNpSkCKGzqAXEtfCTBiza1PQ6QxhrUB3kyK0X3Hgn9oP6Dd3RteQKg0hl7j9cj/ZVBaRp+cZEMtQsiS8WAc0AVGzsddBorTT5zE586fgGOT7fMlNidgLFL/UQ8CrQt6BzC6jXcJy0VKUjL2kTk7KzrgsctJKAm/FEgnaMaQsz5XJ0n6Uj8uNlYS6upV78t7cT89YdBLvboggH17JhKTobLtpv9SvaNGgrpkfLZZVqXqwDNh7/O1mGGmxnIKKSfNYwondedVVh3FyFp69KpvNXk+l7Gf+i0+0fcJtEGoKg1VZxMdNPIFpIx5GpJyA0xrIBaAHnThqhuSmPcfb/5JhpXOlwqTlRWulHJnVITdLiocaDQoJ8JFYAh1mmju+CrFWUJuV/QM9EtcBTqUGSWU/51tiZtonnyVCLHkIG/7x3inqn6P2OUhVTdbbjfaY1kB+jPr6p6RmBRSrbvHUWIUNRkW9NpMFZLfrPJWqYrGZOlktay4EoBrvBgVAgMIhTjNi2Apj25k/GrGEpOXxdClJrzv+LEnQVrpMJdYy36j9exFHSH/g27SPNyGb2KAHYsH34a6hgKYsqfv+BQzT6KwyfDdXjSbZOFTuBT9uiIsAQvjT/ahrhLtCvZZlhyt46YJ5wd2kSOCjJCJK/xYWrZxrlNm3DKOyVPEv8H8paGkVZDtMv1nlN2TcxDZ5qj0HgSn90aiae4mwZRRLg2X913+aLYEf1VROT6MQ12oJr/n8nzr41sP+ISLbrZ89IltRv6O+KttlwxSYEx6M7gsDOizx0tuIEVojEBQGG3RJJ0Md4dgySNF7YVjmzBEvDJ9Oo5fz5DL3jq5Mle53PKZtddJgDLzv0iutCiGRvlhQlaPxQfTXFtkEpeur4lQ0BR8UE3WzK+w6mpCZtYsE0/TaXhXR6ClduiiwRxW03a5X2Oi0RxgCwmZn4tMHiydkVMzbqVTWrumloNRiZul8gHpc1JXdFqZ4q27BTITG1w27AnEAuWmwipz5aXXOJEQsfLRhdfBZYkf6241oAgQr0GFQ/UvgBvXbUkgQDekGlxUdf4KBon+gPyrQjC8NVzqrNt4XNiff+oeggWseFEaehmZiveWopVsf0Y9y6gX5NO7wWg0aYYLxsHBLSWrqhweMxQ51pIa3gxDpyB8PGVck92m3Wk3UFH/RWHtd8Q8oLK9ywWlVXljgmjhDDCK3MQhNFcZ6ei6q25iX3xds4rBkN2thLBFG7ZOVrE84r9IrOy2Ig2mG6jk8xmsn3d+MOU+9GT/dwe4vgzI99LNemTM9aKS1MzOllKdyWoIZOn5iEJOlLC/E9pIeaD3dSN6xLJBBjgges X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: f22cca02-857f-4eaf-e540-08d956823dfd X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2021 13:26:03.6925 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cDaoe/O5N5coYvChmmj8yWvMF6cKGQtV1CR7yZsqhycLasyBBKBXd0kRDEa6CZV0sam1J9aIpoL98eDSProSLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4136 Received-SPF: softfail client-ip=52.100.157.246; envelope-from=Michael.Roth@amd.com; helo=NAM10-MW2-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Basil Salman Currently Requester freeze times out after 10 seconds, while the default timeout for Writer Freeze is 60 seconds. according to VSS Documentation [1]. [1]: https://docs.microsoft.com/en-us/windows/win32/vss/overview-of-processing-a-backup-under-vss Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1909073 Signed-off-by: Basil Salman Signed-off-by: Basil Salman Signed-off-by: Michael Roth --- qga/vss-win32/requester.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/vss-win32/requester.cpp b/qga/vss-win32/requester.cpp index 5378c55d23..940a2c8f55 100644 --- a/qga/vss-win32/requester.cpp +++ b/qga/vss-win32/requester.cpp @@ -18,7 +18,7 @@ #include /* Max wait time for frozen event (VSS can only hold writes for 10 seconds) */ -#define VSS_TIMEOUT_FREEZE_MSEC 10000 +#define VSS_TIMEOUT_FREEZE_MSEC 60000 /* Call QueryStatus every 10 ms while waiting for frozen event */ #define VSS_TIMEOUT_EVENT_MSEC 10 From patchwork Tue Aug 3 13:24:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 12416353 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D254CC4338F for ; Tue, 3 Aug 2021 13:27:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 74D9560724 for ; Tue, 3 Aug 2021 13:27:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 74D9560724 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:56892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAuSA-0002J9-LZ for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 09:27:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQt-0000Dy-77 for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:11 -0400 Received: from mail-mw2nam10hn2246.outbound.protection.outlook.com ([52.100.157.246]:23648 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQr-0001X3-OS for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:11 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZoTTk4gG2WCcOXU7vEkVkTvwdgRu7SjCjxMwEpfOV4LyEemw7JRURmy2s3CjhsSUfu+nuGEg+MAxsYOdRKHfzrASDFWGjqB4IHu/xL/kRxsv1dsRHZj5/CcMw4Pf2YJoqY/pP0MIdqb/KdfVjP8Gfld4AuzuKqkFGAPLtWt7YtgZ9I/XO8EK3g8+icKlYvfY+u9ULjOmdiWjIM5j7C1+eZGjg4xmC13wKppFx2nkdU9UMlmXfqfoGZZ49ec/Dvpcn87iGtHrnabwNuD8g91iktK2WENDV+HbCHEjdIO5y/iO19LgX1k3o3Sjkc1VioSH10JnKwVqZOauCHgK2GPlzw== 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-SenderADCheck; bh=HGExaim2fvon7BCXYftJl80kwJHEmshRPfdqOqH1osI=; b=kY35yICFuvi9+suSeTBHLjoKGVgojP/FCtHC81WZZpFD1rN+E5YwZWb7p1he3ffQAPC48mv8IGtX9+5qgJ1huj7BKbap+c1W+UNXve5hOul48bw2vz6o7bkxI6FE3hkJrlWnx1nm4gWdtE6HLuP4OR5U+6UiacDNGK7+wfRGxfV5kYTyposFGv0PnCdR4MfNxWkq3Q168ojkMgpJ1q4jwpe5Sp2MxwuTCpyGCxiFiWL/SPtA3uINGkdGgAkfRWyFgwSxr0su6hfXrbp1Ducx5vWIZuaVVPQIXpDhMm0SVnCpMuxg4UjaAwgXMamT7pd9yArSfBXQFnR9ibGCtKKtOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HGExaim2fvon7BCXYftJl80kwJHEmshRPfdqOqH1osI=; b=iZHHaKN2K9qtkorSh28Ejzs1/8EsxYMHv8skJexK8JhXoD+klhip3wk6OVSIhLjcdVWrFHB+zgJcPKlFGxEQUqMP3ntEBC08rxfumUqT2uOM62ggDk2x9RERMpPrS5mY4X4/nsOHS7woZL0sMu0kjD2nm3pcvECWY6vrVHweCuU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4136.namprd12.prod.outlook.com (2603:10b6:610:a4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Tue, 3 Aug 2021 13:26:06 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0%7]) with mapi id 15.20.4373.026; Tue, 3 Aug 2021 13:26:06 +0000 From: Michael Roth To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Basil Salman , Basil Salman Subject: [PULL for-6.1 2/6] qga-win: Fix build_guest_fsinfo() close of nonexistent Date: Tue, 3 Aug 2021 08:24:48 -0500 Message-Id: <20210803132450.1093602-3-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210803132450.1093602-1-michael.roth@amd.com> References: <20210803132450.1093602-1-michael.roth@amd.com> X-ClientProxiedBy: SN7P222CA0004.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:124::18) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (165.204.77.11) by SN7P222CA0004.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:124::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Tue, 3 Aug 2021 13:26:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65cc698c-6efb-49d8-dc96-08d956823f72 X-MS-TrafficTypeDiagnostic: CH2PR12MB4136: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 29ricQB4f+Oon4AkucO+6YO4nRVsKQgR4hrfBoaXXl6F5qtAgP36ok/hsgJX5u3H1oiPgmI2IHOjkmfP7CdIUjGOzbxGi2bqOvUyyBYmZEbosBN8AcHPJJk9GJWf6CspoQC67KmD6IPzCSmyYZqd3V7jCoRZu2n/skAF9CJ0NyB0dH8PF8gCVgelwMeNFYHfhUnQvcNuKUjbZiJ0+JtxQazdqTeu/xvMQ4jRJ5cx5XFfCqwDhmycxZG6iW0ppXv4dTb9dTn99LCYvq/LrYwmKLS42kYA2y/ucvSOIkrTgbLv8W5RUC+yeSPJwQHjBKvCU6Kwq6rFMxHqo4FfACNPHBC2QtoE7n+qspdIQ5yjuAGBpUWM/mUBfLZxIZmAPtvCMVXoydjdZBi8Tnu00e1ZaIGZyik93rbbEZDxBjeJnyAyyBQGAHuWaPdDWLiti8fYmH+f0X4wgLnI6tty+XVogQlTvAFI7f/hWD7L2rIyMW4A0uAqIZLYM1F3zzseND5qGjmQldfov4NEIpbZmDf6ynUF+M5hCyYjy3wMST7HdP5LyLgmcgOdHU/O2NQTrEW6wnNVWmX0+1pSqA3yTK5m/hBjO+7BKv03wl4IEdEFNTuoqLIoa/JRJ8vEPqSvaL1NB7FBMU0vMfLQdUoy9GRvxjvtJ3xKwY243RIUQD4STUhVzQLJ3AlNNAogW2yX6e8KFfLYyPMbhwqIyCSC1kZL2DxwfSF+maxhV//7YEj7LqO4P46EWyePEzQIeve3D8MI9hIchgG9zm4kQZaqB7UVImX8bxb/0W6PhgcOXfWL4KBGzb+G/4DuE5Xls9NF5MLDggULIc6EgAIEARcl6NqHGYYA12vI2vI1X2gVi+O3cZCIgkI/TSGdDoCM89l9U2GC3kAfIX+CCoDt2lQMVuHL/UNsGkxrDwr3UGR6K1nUtQjtZ13ipzkAzAyvMN81fYuj0+G7IqKVDJg0762h2v319BLBTf3P6apDfAH9JximK4bhI++ioa1FLsQahdHXTbN8NZvds9Jp4hjXvNNOaW7GePYPDG3f5mFqfbDriQBCTcc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:5; SRV:; IPV:NLI; SFV:SPM; H:CH2PR12MB4133.namprd12.prod.outlook.com; PTR:; CAT:OSPM; SFS:(4636009)(136003)(346002)(39860400002)(366004)(376002)(396003)(316002)(2906002)(38100700002)(44832011)(83380400001)(8936002)(1076003)(36756003)(6486002)(6496006)(52116002)(54906003)(38350700002)(2616005)(956004)(478600001)(5660300002)(66476007)(186003)(66946007)(8676002)(66556008)(26005)(4326008)(6666004)(86362001)(6916009)(23200700001); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ErhxBZVy8G9sCfAC7gv+mfpLn3MgCN051PLB0yQl0qgcAb+SisjwWz9o9DzLo0ibC29SJrLL/67mtfxyYTGDmIYCqwIGZh4/lfmwAZZrSNKedaiKlZoW5flJlDU8rJglObb6dMROWi8kwywkSTqobku8kYCtQgBt7M4tU79ERYENv9JT9/ChK/eg9RMESxeXSqDN2iaClE+/YPtQtGJV5YesnkbnKWz02h5cXKGd2BCmQCJcSX9RMJd45/SqTBu+0//K8NpzrCLhl967aHD97/kTkCeXQI2miURaeQe45NBiOImbjzMjtX65hIw4Fkp3D0+seaDLvngM/g2z+LQPg9CXaVZQ08DPKH1TTt8Xxx3cwZY4rooqJGBMIucu4p2blJwbat8mFSZL2eIAtfz3/2V2MOIx2RIldpheOV3dgoLt+cFJEpBsRBiflqo4aCWGJutUUGvmKUtFTEVERY/nZGudxyG/tTO9Bgda/Wcu2GrLcEtNSOiR4DsCXlJ4DsLlH8wXH2solBQYXIPegWSMYMot80IU5httoDPxS8+R0rOHLftuC7OZJ5vUO1Y+3p0UC0xizVbQXnx4Nhyo6cqYp4Y3zEyNvHXqPr3VvMVBzS5Iiq8ETX9EkUZaO3JhtiqNmFe7jssFrVZ5kEWf0yFS6S5z58OCZXRotKsqw0LqFfmVVkdNdxoxNE0j2Sul7yOYGzQ1qJ6dYXH21JCTOFNIUxHjT8VvVf32JFlkSXJMWtsTvMo9Enp7kqQ/rEEj6P4RvJhIMgzYPAfe8+AdX64j9b/VjmYtoMbH1vPF34t6K2LYbIOhTr2v1PAH3xEOD3cL+/gtnxFhPfoVi4S50DneNAto87EHGQrb7wAK7nrG2+4lOBqzIXIW0T04GOllJGnQGhkKIvtWF3/TqrTu3QKwbwt/4TP8dAW/fQdenSapgIpkMAZLxyAmaFclMAgMRjN1jJOx1spkAeMYjDBVY/z9og+sdoE7G7GEsfxaGjsyp87XkVRbO6FlwkAM1XyuFhf4lpRXiJ1YcTF/uE8yzvFffEEPyKInLLWBg9lHUiaXzSHHkMW5+rPq97HH+3AgncVw/GW+R4j+wGYqVhbUi4Lu9TCgCF/xTEpEceYjwYLkI6PXaJ1R5CvofGdNAndxi3MnUzgVf/Y66Vs2N3XIiRXJ0jroocvRDNZ4Sex/qiQ4bfS9yRdixxNBbJWLAVmQXKlyA6d2lmCXe7gtpYpmXg7pzcB+yZ3/VcwugpRPxeP7von/dzOEawJc2PLEfVH+qw7MayrSmrkiQM3DBQfo1Z966jctrt7j6XL4QSJq9xqrmr/XyUNx2yqUebErtJeHXOa0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65cc698c-6efb-49d8-dc96-08d956823f72 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2021 13:26:06.0930 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LFUr/Iol8JldMYImvRsVSQnnoByLk5I3LOAPq+FGfeVeXE78mqtLSw8v+Juf7RIHfdAlqCUYNqmVuUaRn7jqTQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4136 Received-SPF: softfail client-ip=52.100.157.246; envelope-from=Michael.Roth@amd.com; helo=NAM10-MW2-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Basil Salman On the current error path of build_guest_fsinfo(), a non existent handle is passed to CloseHandle(). This patch adds initialization of hLocalDiskHandle to INVALID_HANDLE_VALUE, and checks for handle validity before the handle is closed. Signed-off-by: Basil Salman Signed-off-by: Basil Salman Signed-off-by: Michael Roth --- qga/commands-win32.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index a099acb34d..763186efd4 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1091,7 +1091,7 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp) size_t len; uint64_t i64FreeBytesToCaller, i64TotalBytes, i64FreeBytes; GuestFilesystemInfo *fs = NULL; - HANDLE hLocalDiskHandle = NULL; + HANDLE hLocalDiskHandle = INVALID_HANDLE_VALUE; GetVolumePathNamesForVolumeName(guid, (LPCH)&mnt, 0, &info_size); if (GetLastError() != ERROR_MORE_DATA) { @@ -1149,7 +1149,9 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp) fs->type = g_strdup(fs_name); fs->disk = build_guest_disk_info(guid, errp); free: - CloseHandle(hLocalDiskHandle); + if (hLocalDiskHandle != INVALID_HANDLE_VALUE) { + CloseHandle(hLocalDiskHandle); + } g_free(mnt_point); return fs; } From patchwork Tue Aug 3 13:24:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 12416381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A1DFC4338F for ; Tue, 3 Aug 2021 13:33:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AD14360F41 for ; Tue, 3 Aug 2021 13:32:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AD14360F41 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:42396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAuXS-0003DV-N0 for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 09:32:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQw-0000LZ-Fg for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:14 -0400 Received: from mail-dm6nam10hn2220.outbound.protection.outlook.com ([52.100.156.220]:55392 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQu-0001f2-LA for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O0IOH3AYGlboe/O4DI/MJ1s5yXQSc7LB2r/jpfEIaSGLIcmCjPMRyOb0jrdMC7ywXpwKhj3+/Mq95apx6dQBbLHTB7IMtb6lPs0mOdsTHcjQzWHIuxp4hmLvlmwf4IBgqDpZwEesqG2oGrOE2nXcQ8fHKJaMEgHOsfGXg7Odoia9nTsklMTunhzfW0WWYQi6MAcW69ODnxNTkuEO6gEetWt2AofXyB+KHHgrgLIS+8NXP3u6j8ZEnKyFwcAP6LD4k8gTNkcfY9Pkx0L/RTaVipPINh43abzBiP+YW/IAZxHXgls5VzaRznO11jgo0lZqd+832z/Ce8an/GDxVxZ/uw== 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-SenderADCheck; bh=dEyRwSXM7cVIRuYNGwYcnj8C+/Wd1wRZz3seQ4KNW5Y=; b=CKiwYYl9ESj9+ADWF/EcpO2wBuIyO4up4KcO0OfvktvWN4c24OzkxlgYyvV/G5mX+xVme3a6AUlg29cl/m2NQZ4tJLbJ76DV/aWqK1mhn+3wFooOtNXirwOosPuEuNKvBX7il8q5R15LpMH6kxBBq1hECUEXzk03zaNl87eA9PKo7H4vRSs/2pXIh/E8hLFewKoCn6XNWz5GXoLuXMTKocEJdv4mLiZG5pvFVHBN9bH9uVBs/pusHcIBxDalukZVaK/WF2CRJUjx3lqMRumw8MpttHLE4IxOxT/Bz7WAa03IfSKZko8v1xz0ZEdY2O/BdV/f311JM3WIVGUHuKtBTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dEyRwSXM7cVIRuYNGwYcnj8C+/Wd1wRZz3seQ4KNW5Y=; b=JN5w1n83VP9F7S+9xgFcK4VoQkxQhdGg3y5RlCLOpaIsTo4agfSFbntNmVMmptqXrhr4tSJxXkQoqkLWu2mK7PGUIwgqxHLcQeIEfimo8/POE+0Yfdn8Bp1C0c3HVFGod07TQeCNs4DALrYMiHGNrWBhYXxJ0T8KJ1WRNmYK+iE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB3909.namprd12.prod.outlook.com (2603:10b6:610:21::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Tue, 3 Aug 2021 13:26:08 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0%7]) with mapi id 15.20.4373.026; Tue, 3 Aug 2021 13:26:08 +0000 From: Michael Roth To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Basil Salman , Basil Salman Subject: [PULL for-6.1 3/6] qga-win: Fix handle leak in ga_get_win_product_name() Date: Tue, 3 Aug 2021 08:24:49 -0500 Message-Id: <20210803132450.1093602-4-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210803132450.1093602-1-michael.roth@amd.com> References: <20210803132450.1093602-1-michael.roth@amd.com> X-ClientProxiedBy: SN7P220CA0003.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::8) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (165.204.77.11) by SN7P220CA0003.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Tue, 3 Aug 2021 13:26:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4967e4ee-2964-47ba-4f4a-08d956824097 X-MS-TrafficTypeDiagnostic: CH2PR12MB3909: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7DCCK16MVSGAREbJ94x1a0apKSWrxzOAz/tT3I7cF6jhltyKx0+39qg4887JSoj29GWbMRs+OSCdiQompTrpyXZrqK0czpKmLsXGuDcTiRhkxKWHmCOteiwizdcqADPQmvwd0dfWbZBYgrS1yuz0OZq/RJ5IEa8m1W/HLxdzHrzB2XNuKLzp0JfMErTN+j8kMfJ084vw0alELgUp5HYVV306b9/v0OHNfe0uwAf+5qovYkdpH3+8tThfFu2DjqaHT1nimsZEQNvdJTejiJNGX+VDYHaiJ89JTcH8RI3xDi4nj40UQjpIf6crcvLe2zfFnf6Sd0NHnVDvifMgoCk/Z6MdL8CXZhLe8MbYDa2+iZBbB6bCnUUqVXl5WfBLpDGUqhdBwsPLxruUMSxTL4UPQqkSQLqExZcyhK/AIoxdoaRPJRpCW7Zvd/ic7jOt8/nAZ6dkRn0QCt4+RURuK9MXpqcChywe5OL7ZMFCj1psW31rCeKcEFo4c3cSMk4GmK9W2oe6IKe3rH1i7FUUGPQTl6/D9lpL3GCRI9umX8lfPsM1a4HyPRYMMD935tdSXtdZl1n5FoiOpI4sjDjwsjJoDv0ukN9rvUR+6HraUQcSIP5pEPvSj1ZYacS2rwFLTWRepK7G4p9crIJWuROCY6o8LY41V8IT98boCq089TDRLgY2ut+YscaUVegMYMW0Yik1SmIfP0Wv17kRdMdOhVklabyiwMF/0DJ523zoWFGIMjVxQcqQD0PaP7e6OVZCQBTSvqsY8mxEKtghoykg4I9oX+tSZ/ufv3ED3X9byshPa1oLWUv2JfMHTic1IxJBcue0vuCtzF4I40+r5M6zT58G8wJ70igHYvMW/Svj96ktreJtFmTbYBCidRzPstNOIUNmw34SckR3ILoT/uXO1erAkkrq22lGqV3oiqsY8ywJe3bE3SCrLOVGMP8Zdgmig7x0J4x6Tu90ebRvJMddt9lUAvkxKKgyY/10qmEuP1IfVZfoUcU1FWuNDanhTOh7gG3xhHKCqn3wKB69ikxhc5uRgLg/huAyvA2azoYyBSviFSegJyy9P7DnDFtOevCsK1GGuZ77N78jfuXts/FrmZwswvueL8jmnGqgtoygjPkI+iu8lhP5BzNIvZeF3O5zTvDd X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:5; SRV:; IPV:NLI; SFV:SPM; H:CH2PR12MB4133.namprd12.prod.outlook.com; PTR:; CAT:OSPM; SFS:(4636009)(396003)(366004)(346002)(39860400002)(376002)(136003)(6916009)(86362001)(36756003)(5660300002)(6666004)(966005)(8936002)(54906003)(316002)(478600001)(4326008)(6496006)(52116002)(2906002)(1076003)(8676002)(83380400001)(26005)(66476007)(66556008)(2616005)(956004)(38350700002)(6486002)(38100700002)(186003)(44832011)(66946007)(23200700001); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rcFy/RQmfTHr+yrB4rKkZk/zj8EA5pSIvujsoiM+XqHRN0ZV0DRD27e5pew1LxxzYntCK8LoJCFhvD8/Aa6hpFGbH8Sp0UipPgvwi3/fYshqUWuUgrIr4yxs/Zo0/eVGg/a9ma2nizxUFXK8JF1yL0UELldLwV4ZteJ00WryRYwdW1QxXWGd1TAUk5FuaM2lt9YOrjX+KflQF/Untgc2hCvmznSaDuo5vTha9Ka54VG/SHbQSKEg5cVxFghh1B+5RoXkVIkhBlhzrxIX0/mBmUn3rQD9MYGSmNkmRKekIH9Gd4P9iFeweup7IR9zuTCGl7Lj900qLniPcUfQTA0vq5Oumb0hqeT68P/WnjGGfB0pl47X7A3bH9jqQV9r1ZZFDlOFQLCfoY2b9Ynfu623zBMIwq9JyUSoKLV4J1/Aw5oZIJNN8fmmS9TmBKlbKFMxzwGs5zUuE+QOWSQy4+ftPKYGTaXbbkUPhe4ga3BPRONOQr70IdXaaIXwz0l10W6uvcJCyj5FdAvTi6YnrXT+rjX8tOezxjO6/s8Beb3eADqtMzmJacr+QRTZ8fULNoFbd3nXwRiHBBfuFFoGRmFFGTcsYo7mZNtrNAWO4bO5sPb2HGY7FVO684H0W1EII7re5oecB4P+tzIds/6nyBOstm2le6WqquG22THvLaDd+aH+LnkphwKPOluRr1Sx32jY6AslLzn5vQ3heX/MWxVsW8YQvtvgpXEVzOSTR7Pbz01z3kJkrN+U0bhWCJoNVpigsOvk36ZF+im6ou09YZKHIQkMjc65k50oFnnLXg9KD4mLLut42merq613T3M+1jWSZgT/3q6s4aHNco24UNnPLhGDb8PaPHs77M1F43wpvVyyRz27QIBA2XADmKTiqIydMrQ41rA2o+u/QJJhnLQu9S7gw9R0kQz0UJHfqQzwF6I7LM9JC9xXZTu2DmvcZlZskJbb7XH6k9VSptpyhyxIYmlqvyKyDcDA50qAMYLFblZjZ1jh0xLBrYaoRnPj1c/nHeGL636qefF97iQE9OwLjFyupNQ3roh2x6+X3HIYAEHTSXEg0SFgHqCDDMstkvORmZEQ8pCbpHBFxrP6gCMS2VnBn4D2aQiobuSZhebF2ckWPPKWMDKqSOTNBu+a3CsM2gFb4LUlo763ddcdlVdg+yDOvSDBlPKogjd0//Y9Fcn8UTEo6evQgFi0yd45zFYUBj/GdQc104ODuCnBeSoA4gC3XDcEJoGICOOOHIM3r3kETvCk8IxxxeJ+nF6d0Mg4GpMrw91qfiSlCLI572NM0dT9ph7n6d/Borw/CdJcAhS3ezIk7tEPpnjchRtWrMFQ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4967e4ee-2964-47ba-4f4a-08d956824097 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2021 13:26:08.0196 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dRD/udwoNDK/8XPZhlMCShT1WqwaeVDhqM6fTd66O/wxmrh+BUy+lQveIO97b6Aa/wDmXO7cZBz5x4dduVOstg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3909 Received-SPF: softfail client-ip=52.100.156.220; envelope-from=Michael.Roth@amd.com; helo=NAM10-DM6-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Basil Salman In ga_get_win_product_name() a handle to Registry key was open but not closed. In this patch the handle is closed as part of the free routine. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1929144 Signed-off-by: Basil Salman Signed-off-by: Basil Salman Signed-off-by: Michael Roth --- qga/commands-win32.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 763186efd4..098211e724 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2231,7 +2231,7 @@ static char *ga_get_win_name(OSVERSIONINFOEXW const *os_version, bool id) static char *ga_get_win_product_name(Error **errp) { - HKEY key = NULL; + HKEY key = INVALID_HANDLE_VALUE; DWORD size = 128; char *result = g_malloc0(size); LONG err = ERROR_SUCCESS; @@ -2241,7 +2241,8 @@ static char *ga_get_win_product_name(Error **errp) &key); if (err != ERROR_SUCCESS) { error_setg_win32(errp, err, "failed to open registry key"); - goto fail; + g_free(result); + return NULL; } err = RegQueryValueExA(key, "ProductName", NULL, NULL, @@ -2262,9 +2263,13 @@ static char *ga_get_win_product_name(Error **errp) goto fail; } + RegCloseKey(key); return result; fail: + if (key != INVALID_HANDLE_VALUE) { + RegCloseKey(key); + } g_free(result); return NULL; } From patchwork Tue Aug 3 13:24:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 12416379 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9F20C4338F for ; Tue, 3 Aug 2021 13:31:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 60FFF60F0F for ; Tue, 3 Aug 2021 13:31:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 60FFF60F0F Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:37348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAuVc-00087l-J0 for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 09:31:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQw-0000LA-Ay for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:14 -0400 Received: from mail-dm6nam10on2066.outbound.protection.outlook.com ([40.107.93.66]:8545 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQu-0001f5-Po for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q5oLQuW467yShFyx2jvdDPEfaoduoyL62lI12D2z5uhF9YU7et2LrNg4DB40agTu0e2LqvW2ZwsSb41tXPJ7QP1+7HNJNyHRxzaRez8LMmRDneT58oWPW9ov6DPOwii/g7w/1BxIm0pZ4JRW1tUr6qD0cqAc4M8T/PYIRTxLidMpfK202Zjl0QOejf663HRKSsk4taZMu/BE++7J0bnhVN/rF6fCWvyPhZlS/5ff1nEybd0sUcCvdp6CCnGdRwNHj318Jdp/0bHqopa95eCHQRoqLGZT86xUbat//e4rkUsXeuJr+GHFcSVGKyQoZtidHpniwreyvPeHgLymV9WuEA== 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-SenderADCheck; bh=RxrHVnImuD7TTn1QHo9DEQ8EhEly7Q//WDul4VH3zBQ=; b=Cw4+S5ppswU7wKETiyANlb4VhAOUGOKwBYRo5lqmuKUjJ8cCO+Dh6kPJM70Y7ZbsKyWFlMEXOigGNjYlCR6B7rrRcv2xynyIp2MYZdvuRzy+PoqyH0hVZlQgDUlMTjdp2I5pdgVf3QnQJnXNHdW2eBKYxISl0DwiCr7b94f/avWCZ7rW6gE57OjemSFTzl1kMu3ZAAWMMa6c1L2tMBKJd0CVhU1TieezfsuJPbLD3/rJsV/c8E7Lwfc0emW4jiAPgUqiYEfTbFxU6IM3o5bM2k3VOHkwXRr4w0FeF9wJ9rcpiikaPLUBl9H0egLY8QtLjX+A0SgguwSKc2GgtJCIEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RxrHVnImuD7TTn1QHo9DEQ8EhEly7Q//WDul4VH3zBQ=; b=FT5mTskbKl3+9cSl7OGnW2fnbz43gTxG4RnmFwybr0L91tbCN7/YPNFkgVeQQTX5JUqzcP+P9MTf1HK+2pjf+swn5Je08KplCvIGZxAH82CZtEhQrVaAHQvL8nvJzn3TufJwf61CHCYNhL9lz4Y7ounvwKk9HmUfMqHvIgL3kwA= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB3909.namprd12.prod.outlook.com (2603:10b6:610:21::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Tue, 3 Aug 2021 13:26:10 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0%7]) with mapi id 15.20.4373.026; Tue, 3 Aug 2021 13:26:10 +0000 From: Michael Roth To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Kostiantyn Kostiuk , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Subject: [PULL for-6.1 4/6] qga-win: Free GMatchInfo properly Date: Tue, 3 Aug 2021 08:24:50 -0500 Message-Id: <20210803132450.1093602-5-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210803132450.1093602-1-michael.roth@amd.com> References: <20210803132450.1093602-1-michael.roth@amd.com> X-ClientProxiedBy: SN7P220CA0004.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::9) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (165.204.77.11) by SN7P220CA0004.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.20 via Frontend Transport; Tue, 3 Aug 2021 13:26:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 32d00136-d5a6-41ae-3d14-08d9568241ba X-MS-TrafficTypeDiagnostic: CH2PR12MB3909: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:913; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bqrqRfifr7WE66pXaEX6RLhpgVpuWms9ANoTWw8wfaxh+HDStQhu8INQc5B1U2CMRbKBRkUL0xwyOTePIEOIkFblzWWHQmQm62QPh2uc5fwrtnxG0GjSJwCDMzmhavUfNw4cuXURhLvaQEozmUweCQDmHj0YgtLZCeoR78CHXUYOw+aRaItkE9MNc31Vr3RUKBvtfe1wjsRyJb5XXymRLRQ8eLuOt76AqmeHatl/SuDiOD3ZI5HF11C4BN13TP45nNHyTsNSpgUComkjNBg1EAiqEtLCdYnJJQLK1dtWW2voBKYjfNunDnT/YO4JzbO0wboV0SxUibowRvc2R5uNfQGj0vILxsjX8D0ieVN6D41Tbe2HllDdbVDQBn4TmMhK16gT2wKG0bU2VN2cw4JqpfK3RYw2EKPsQ+2EouIb9t53yrat3T/2Bqrvn5mth/cL6TMHsFjAZ/roZoa82rX/UgUkct27L2521MIctWxWvzPALRctniFEPHGe/k3hw+MUIblqrc3vyTMh5w9oN6tjNrsrMUvC45UznQC+X/ZaITOaqDk/Y3WQnZ92nVS/dbiTWQ1YUNoYuvmCeIkiWYtZKNW248Vykk0Rl+Gnp8c6hpe0dADwtj5V6xq03YIdeyjnOG5lGIbyVAYvL6S7KXwZUgkgD5SYh/B3HEtZKjy/2ozI3crGAzH70JlNNAStTCc6IDq98m+iKHLvhWC0Yz5K8A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH2PR12MB4133.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(346002)(39860400002)(376002)(136003)(6916009)(86362001)(36756003)(5660300002)(6666004)(8936002)(54906003)(316002)(478600001)(4326008)(6496006)(52116002)(2906002)(1076003)(8676002)(83380400001)(26005)(66476007)(66556008)(2616005)(956004)(38350700002)(6486002)(38100700002)(186003)(44832011)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?79RvrQhmhy+QEv2s/cFwAes5MhvV?= =?utf-8?q?BbQkVyc8V38RrZNL6KGOnGMzvg4dxIW/pO8eTES+FkBjlSjX2BKJ7NDnw2N2yjkFw?= =?utf-8?q?uAjPQ06NxjJmLoya2ul5ZZOa1Rcf7yuH/2GlCGRzKWpUHqTRBl8uMhYY5QhOWDWKg?= =?utf-8?q?/cgiBWjhTrjBUwiixiCVfaBxqTzHOFSzxh6S+Gn/FaXGlSKPP5E9IghK/W4LYzofS?= =?utf-8?q?sr7VUVOweNvLRtuMnzDQiW5+kqBB98iZTZpYkvM3yPsYvl6Q3FiWR0ISEsbJYGqps?= =?utf-8?q?oMkLwgnfD96vF+AtwyLL01QH96T6wfKgjIvSdbs8Xbleo2k5Ha1BhWp419RlO0Ci/?= =?utf-8?q?7xH2yuujupkxFVXt19rDu6bJSB8CuUkuzzOkBQyHpszzJ89hvaWjQWyert+1NRTUc?= =?utf-8?q?z2ZSQ4ksyQnEaGqFOoEZKW/JSUSyl7QBUuEGDp2Zb3MG+tSdbXEL2DrIEsJSK5WTJ?= =?utf-8?q?ZazsRNTeuOqJvp2QEyrvFUT9gauolX6zpfXetd4FA6Gtps1uXcrOD5StQERjB4UTX?= =?utf-8?q?QzvaOX0dnvTVvHugjiL1jyF3b+ttbJnC5iit3luM/EH2PbtG2Mi9KipjBIkQdC13u?= =?utf-8?q?0EArB7NbZ9FTsl9VtHV5IYRyL9UkFmLtFNntpIauGIC3mcWKYwjJ8aio2g1zAxX+x?= =?utf-8?q?y3HH2XM72uWTqzpfyo24w40zCmtjjA6gTs2hnSnlvn0vnGJZ8gCGYdO5ZRO9O++9N?= =?utf-8?q?Mn1LMNzxBfAGzU3luMlY1z4uhnhSIvjecWSyXxI3Ng3meK8zl4C0Tw4kS3S+9v+m2?= =?utf-8?q?ddKabSN/YR22WTQ8cbaVvBWTxnNe7h4m6XDv3J3pBG82+cmIBG3T2NP1X0qHPiUg8?= =?utf-8?q?b3E5fehRahOd7UhL7XxonOmVA7e38dA8Ej8ayXadLPSEO4jDB/rMbzAsADhIH1IAx?= =?utf-8?q?7ck0cNa/ZVEMJxXLZjE/YNQrWERqWPJvwB8D9Px4xoxx+HaMyNWoxWFr40atbcBx0?= =?utf-8?q?FdY2WLY69c8i59egSASMa7Kgo48vKDXgiUC5mj0dUpQbxL0c+h7yev6GqSm18A0eL?= =?utf-8?q?cf31Rs6WkRZmZLJdW48swDDMfd+2ELTzBsG64AbgcjPv+hmev8U6fu8GCaaHPAJyx?= =?utf-8?q?WVwq6NUvykBDGr3Ap9a3nzMzSeYZNBz3PVKtL+tVqqp99EKjr8Iv/83cyCAyIhn8k?= =?utf-8?q?pfShllsnUOGGLkyqsTUcxUwrkFvPnpksUq8l+jlhTARb4y6hHNKR4KfnYSOgYMzf0?= =?utf-8?q?IcfAnadCxy39o2NlPVlphRzYwIKK1QH6cD7Kqyh93rkxZ6GHXC7fH/9JrPJyrdkpk?= =?utf-8?q?LwisL3uwQAjolhCp?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32d00136-d5a6-41ae-3d14-08d9568241ba X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2021 13:26:09.9371 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WHfIO/J/5ZMvKscEcJMXA3kFAr1GUJyVKxngIiO89FkFchUf9CaPHq6EdP6fhLYsz2c613yVRNJRovgnXr97tw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3909 Received-SPF: softfail client-ip=40.107.93.66; envelope-from=Michael.Roth@amd.com; helo=NAM10-DM6-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Kostiantyn Kostiuk The g_regex_match function creates match_info even if it returns FALSE. So we should always call g_match_info_free. A better solution is using g_autoptr for match_info variable. Signed-off-by: Kostiantyn Kostiuk Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Michael Roth --- qga/commands-win32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 098211e724..7bac0c5d42 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2459,7 +2459,7 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp) continue; } for (j = 0; hw_ids[j] != NULL; j++) { - GMatchInfo *match_info; + g_autoptr(GMatchInfo) match_info; GuestDeviceIdPCI *id; if (!g_regex_match(device_pci_re, hw_ids[j], 0, &match_info)) { continue; @@ -2476,7 +2476,6 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp) id->vendor_id = g_ascii_strtoull(vendor_id, NULL, 16); id->device_id = g_ascii_strtoull(device_id, NULL, 16); - g_match_info_free(match_info); break; } if (skip) { From patchwork Tue Aug 3 13:24:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 12416359 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9287C4338F for ; Tue, 3 Aug 2021 13:29:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 765AF60724 for ; Tue, 3 Aug 2021 13:29:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 765AF60724 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:35108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAuUL-0006ab-MS for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 09:29:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQy-0000S2-3q for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:16 -0400 Received: from mail-mw2nam10hn2244.outbound.protection.outlook.com ([52.100.157.244]:5600 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQw-0001fE-HL for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YRhxcbMz5IS45kcV7mPyV8pXFqwe2PFiPurnaz+DUUEBXNGcOss4kxvzS65QZUxg1+rUMtXXqYjXVssIIUTrIbj4FGItMiqxwkjWqJaGkUO3eUCiy4pXpTFLDV58wNpmXb8uGgXxvuceAuhPTVy4Aeqf3GG8Ewv8DFr4xw54fUMxxCoPvRxpEvvqfNeGeRx8OYxCatWtZKnVlddrtOq/QKWgAcdxTaEL0erGNqBlksFF6++yHjLPyC7ELwAoDhm/TzkUOWeRBVRSj4id1aOQHlst04kWnUSw65j5E1jGLA8kDdXeezrVbGYNijPMiiK0JZ6flUT28bsMmRo+MBfnTA== 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-SenderADCheck; bh=MXQQec2PBb1yfwZ+lAq6gUzfmpSXExObRhxBxJUaLWw=; b=oHMcFky9cQAHrmNDCCMLdOEZ1K93Ih09hd9C9u6MxyB5M/JyLzvdQnCLHCh2Jq7z48GXFvci4fnxtvfqujgFEh1+80W7u3VbWPLW3lXFP7DWUlAlYWai0JVzRpcnIccSBZgVuhvz31dz1vtTQB77BoKz9GJD7TAvdO9LQSp/XcJuZgxA8Z7AMFAlOT898S1EmCHwjf/yl6w4hpRDcaOnHOaX05LTqNdZi6X2qUCbYnyibq68cJjuGvJNuDkyo+w2SYDVr1fhdjMTE+fxLYvb6Pr/stVtMxh2nZPQOCJiM8DfOfZ9BxQh2Wy6fAd0BVi+wbi9abQYRX1lOU/CCJBFUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MXQQec2PBb1yfwZ+lAq6gUzfmpSXExObRhxBxJUaLWw=; b=hVMAud3FlnxYrbtfQdEAf510GEakoP3XYlpyBfoGcHdiY/+ohJMQNxTsyG4Jc8d0l3q5yR7LqdE/1w3Kl66629Qy1kOl3x26blny1OKLi9JL+XauT/7YMGUDtySh7KYhgDkmUT1qdBNZ03AcMU3aCA9O19XLpKZgNoIawCUvTOY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4136.namprd12.prod.outlook.com (2603:10b6:610:a4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Tue, 3 Aug 2021 13:26:12 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0%7]) with mapi id 15.20.4373.026; Tue, 3 Aug 2021 13:26:12 +0000 From: Michael Roth To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Gerd Hoffmann Subject: [PULL for-6.1 5/6] qemu-ga/msi: fix w32 libgcc name Date: Tue, 3 Aug 2021 08:24:51 -0500 Message-Id: <20210803132450.1093602-6-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210803132450.1093602-1-michael.roth@amd.com> References: <20210803132450.1093602-1-michael.roth@amd.com> X-ClientProxiedBy: SN7P220CA0002.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::7) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (165.204.77.11) by SN7P220CA0002.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Tue, 3 Aug 2021 13:26:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6182651b-6e4e-40cf-7620-08d9568242f0 X-MS-TrafficTypeDiagnostic: CH2PR12MB4136: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:88; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uZYF0IJye0eLIZuOTBM9VDzjE0EaICFfGxYJpomrF/OQFP41bLJbjg/WwdxgP6qCd05o1/PrutgbXMyjoecS+ket3ebuBoSV4uFe/ASCMSS5iFeOOKoYf7os5BDJODdmWYV6kFV2+/PL6jxWri9p0bwkIKOtd7AwYcgB6VPBPdPSEGUSjf41+rj2dBDUqVCCMpP0TeD9HE5pku5SyDbCQ+m0RXRLCuvvRm08nOVFOJHuTS2PftMTzIFsIJnly12i00lHq01DCqIk+n+3VQoIze54o8cD/gOSCHuUZWjJX3xnBkcQQloRE5tG8f2m59hvWNDHWpCUt21xK3BsKRw0ZwJfLu39MWQA2OYtJ3wAv/U8j7ncVE9EXT6UF0+zX7upNxTDZrAzQJx2u897aBo1+xptLEW5YgVLLn/UCgqt5wljGpppoxE6Dn48klBMTUTSbAtc6Fmrcw16BvAPb2a49mmDhH7V7jFfsMccEr9YWFJfjyKb1dLEjxfT6OasSkgzlsndjEEwfGTdTX6r4MMUe9XRKANs1QIT16NE+BcvJ2UIYtHzTfNif2Po7tE1Qz4X5PjDzvnLFdHJiGOeMeLS4jdo1TUMdFN3MRdMRtZR0SzHd9nP9LlD0MnksU2jrJ7nc2vki1HuTV5k4Oq3dVr7PtxRPRd60XkrfhjFc3gZpbKTLMeCft10aonIFgx/vltxUvx6LTYQrDzofDSs+7kOo3UwpKQ3Kkv9EvNVFpsKztSIMj9zqNo5YtDlewM0ymF08WPMI8hsMJqMjHiKjXecE56kCX41Wl0Xn1thRkRRwQJogmd7ELdZc7EQFttJn+DGANlkFIKsMGhNATnz0OBwdR/l+AMsInE793MIUzbR9a46wuo1+46zEoD7grmA6pNlYzI79jTY235eYNfBN1HTAx1THZ9tg0IGprCQ+lhpqWhgDWyS5sragrzdRaHc6sroTbJuVtUdepZ4tzIYyhnq/944lC/o0O7SSHR1NgtbBidKMb2jm0ig4YlQPxnIRypiEDoboxMv4OWSBoKSYlqnzhpVQlBnw0Ns5Oo4E1iqxT4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:5; SRV:; IPV:NLI; SFV:SPM; H:CH2PR12MB4133.namprd12.prod.outlook.com; PTR:; CAT:OSPM; SFS:(4636009)(136003)(346002)(39860400002)(366004)(376002)(396003)(316002)(2906002)(38100700002)(44832011)(83380400001)(8936002)(1076003)(36756003)(6486002)(6496006)(52116002)(4744005)(38350700002)(2616005)(956004)(478600001)(5660300002)(66476007)(186003)(66946007)(8676002)(66556008)(26005)(4326008)(6666004)(86362001)(6916009)(23200700001); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3AR+avy+6Cfz10kYae49V16fEDxrQX3ddOYSUz1jupC11++fBDSH8NvNmr7bd8S5RgbGVB2P3CnpLwe+P/35oGckvtRKXnB1GZJ8kuf5gIOl9bVFNZPNQaQFHAwsfUIo6xzKvRULf/RARa7jMGBWZ7SeifNhKIAxboYHFbMg+WmfvcM1dn7KOCk0S2IsjS7y0vsA0RlzrX3dpuERvPJ3ntXohR4vH2W1LKb/7Sw7a0+e6rcQTKaHmhBJPpe4+9KmthdV4huEIQAZYeTSfRNhTPSGe1ZpEK24QV+qXLdCjbxFoHBaMVotiUk/QqtJGIdHasvuyvyY47HlQpaJ7wrata2vkE8GixdTez/R/yzCv3tqE1L4FtzAXQdSsCkuGcxM88baKthM7L8ToAp0VIpsoqezuLd7NSh0pxtJKf/V0+/jWbn/u0f476R6wEhcWqdO6aHHjx3/XTxA8grp5NoDuaEh80A8O6gOCMqyzEficxxj9AhXLRAsm8LRYSD5sTw2XD3uTSlcTWZDP4aFcR5H8D1wJB8Mzh0L6nFUdGS5KNKwjcpghALLH2MRnPGT8keQX7S55UxJrJKS1H6+CE7F1t6vm/sPjfDb3mfwA4YCny/GEfRVcGQOy+OHH8emoV6jK34qs8TWtwYJhzVkeCc03MbIOhjFtWIgKHimgJSrHnLbGXVa02/7PQBMNLDeE57i4mI9bQvDL/nU3I6sCjVFys6pdXojXMKuPItvjjcbQl8jXLmw3hiM8fiY0INYJORRYOKZ0Nyf3SF9P/Tma/o35ngG5ispq5KRgbHCo2jbYv+yNsMY6ZEoazJycNU7uS6l8DdRj8ULtDfDboowImYJHn0Ov4hSiLZqN0cTG5JenAqFmX51OJZG8On+CDjM54kk0eZdGE8x37vEWyTcQ/bHS5thUeSh+1EA+shcVHGhkLrdu5wig4HgBGt+1mOIcUCoY5/JsTJDX7gDkry1TrnzCEFj0rbK2MOhn+OlX//WPrxFgOPUmgs4SJsPINtw7hQoaWx9sO9AAuCuZMgMWARdMVhWUDqCSsMdKIdJZXay6JVFAu0NmqG998/Zzztqeq1f19ZVtnZDya95NtmOz0pdgvmIKskA5bm4dz4F/WvxIJZ5Yl8ZlzYjo84xYV+5dlUeXBPLdk9mn14+kdUE1MwT8HMOoVVRJWRtNajPza88D4WfhFcHrLBO3yjYYRfxSmfWiTejVjzsN8MZwrENRcSMAcj+Xu/CIQQea4JgWEIU9372aZAV55LUWO8W7tBuRq3nKx7fzwPD4cZO+ba2BlENRPjUq6z7FKxkq3b0MTirU+cuYhgoRJpeBvvuQu/qLgPN X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6182651b-6e4e-40cf-7620-08d9568242f0 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2021 13:26:11.9632 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pmcgqaHiqPc4/GtT7HWIIEgQV1gZz7eOg7e8nkynroFwA2EIUmZUC9c8BWo1mg6d6FwAH1euzo/nYg0EyY3dvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4136 Received-SPF: softfail client-ip=52.100.157.244; envelope-from=Michael.Roth@amd.com; helo=NAM10-MW2-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann This is what I find on my Fedora 34 mingw install. Signed-off-by: Gerd Hoffmann Signed-off-by: Michael Roth --- qga/installer/qemu-ga.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index 9cb4c3d733..ce7b25b5e1 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -31,7 +31,7 @@ - + From patchwork Tue Aug 3 13:24:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 12416357 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C150BC4338F for ; Tue, 3 Aug 2021 13:29:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2698560EEA for ; Tue, 3 Aug 2021 13:29:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2698560EEA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:34764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAuTy-0006Mk-8z for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 09:29:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuR0-0000Ze-Cp for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:18 -0400 Received: from mail-dm6nam11on2057.outbound.protection.outlook.com ([40.107.223.57]:17105 helo=NAM11-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQy-0001hC-PW for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KqDe7hlC+b5/sVg6ai34w5UXwlmPKAkPNhgZZfVZ0/2ODINuwUL7BaX9vC9VkI028r7uiPHc5x6IZQI5AN6fQ/CGwIxMwtVoTvZVPlullw2iXTxuesoz/cM+bSyAt19lYaQC07E2rT4iGtDXpql7P53LBrx4aJb8kXcziT38opWqRSIUa/By+cqkiYyps8XDjyAxsdPufBhHAMoWozPoK33DC5pWpxN/JulI781f8Ux9ftWF0ixplTukVB2RUKqidLx9ggZnGBVz7ofFBWyURigzyRw0WK+E4q49SPfJlVMFDfN4yeHDWhnaUO4BWkfQ4a6lY+U3Eqf+0PXjrLaKMA== 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-SenderADCheck; bh=UTCARjOvbloP4QP00vMd7GwlXb9u1YH8LoPSomMtPLM=; b=F10exrf9VTtL29KdOXNGl7UXYvbeth4P7A4pFPgXskgo1NQ6+LDOuH2qOX95EDqkLb3uMC2OOl4BwbYRUu98f8yBQS6OkPKv04Egk1SXUJRmgZl5bGAHUAUSUguflEInkeNQLsmz6MAHMKgpHh0Q7vHqUfbSgn+WZgZOsgxSVqMFr1+uOK00fy/z7aPTp48Q8xrxV08BgURQyfugSmMwKkD16mvVpXi6OPoglnNoZazop6T9y+sHmV8+u5EFweoBnz5Zl/ZmBit7515vAX9fmdxGd5YmNRF1h3lAkOgBqx46ikInAptywUFOszKKoFgIG3k9rdNLsd1J3lXaV1Z1gQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UTCARjOvbloP4QP00vMd7GwlXb9u1YH8LoPSomMtPLM=; b=k66PpimE2mDXJBVGO3qFbm9wJ6Zpp+uOcLiZ8fOTltdthUSA/nmtlzXDIqzvlFOh3wXSyHO/6GbYZ3qPYZQ71mjOMjUpNB+gtMOykknvBuz2irfgP72b1Ixify21+N0nyGSmIH0q8cyBu6H/h77a27XW+B2tC/qwkjA6VCrttvU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4184.namprd12.prod.outlook.com (2603:10b6:610:a7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.25; Tue, 3 Aug 2021 13:26:14 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0%7]) with mapi id 15.20.4373.026; Tue, 3 Aug 2021 13:26:14 +0000 From: Michael Roth To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Gerd Hoffmann , Kostiantyn Kostiuk , =?utf-8?q?Marc-Andr=C3=A9_Lurea?= =?utf-8?q?u?= , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Subject: [PULL for-6.1 6/6] qga-win/msi: fix missing libstdc++-6 DLL in MSI installer Date: Tue, 3 Aug 2021 08:24:52 -0500 Message-Id: <20210803132450.1093602-7-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210803132450.1093602-1-michael.roth@amd.com> References: <20210803132450.1093602-1-michael.roth@amd.com> X-ClientProxiedBy: SN7P220CA0020.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::25) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (165.204.77.11) by SN7P220CA0020.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.19 via Frontend Transport; Tue, 3 Aug 2021 13:26:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4782bd8c-012d-457c-9bfe-08d95682442c X-MS-TrafficTypeDiagnostic: CH2PR12MB4184: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +xiWOAc5TLdgZYk63BACKdoH1+BQkpIh6XnPcrlR3ypehdGy4Io99b5wSvGmRiruOtP1yFkpn5HkA3MhebJg4K3PVESzp+66zOWSRv3HImvrNGFUgsd2vqMJH0ANyonXAJOWvg9yZDCi1Txy20xzURMke6fNzKjG+UXPXfI+LATI9y2L2n0F9Xbdw7TKA5SG7+XR30OKTuHvFSKcPPE/7niezKqFaTvnXT1pNulunoXDox6oL8Ow2+2tHTN2F3LCQ4804fH+qmKlCL80wCEdu/FidRsZArV2EJINgSNv6LwQySk6Cbi3FEn583CgUdgHqM19btxVZn/HgRRmYVG60lGmxeeROQt+nLHzu5Rio+Owx+yTAeHJnw0fQTI8pSzQKgl74kC5jN4P7d2NnAScoZ5QrBHWZTu5H40zd5SuFjirJzEcOACwx41jAYMxOhVvZf+QLYTpXvXYOOVsUh5MbqLdu1jLIC38fgjoSm3zET5F7GlMD3buttCoO4zXGX3HghKwXtzasIykuH/JZtljmD195OQegMVbkSMabpATYjhvXZru0asEIUccEoGRcg29oVyh8X31Johtv+t9dwMpZGj0nF2PU8ewoo/oey1zFx3i5A29JQG+RQ59FYjFzUUAcib5gykawpqaG4MHDE6edxGel3LhZGKRMq3qjBFq7NzlR3dlzuZXXBeKpjRfh5EuDYY31N/osMoCENON8ydlTg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH2PR12MB4133.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(66946007)(4326008)(6916009)(21480400003)(38350700002)(1076003)(2906002)(86362001)(508600001)(36756003)(38100700002)(66556008)(66476007)(26005)(44832011)(5660300002)(6496006)(8936002)(6666004)(52116002)(54906003)(8676002)(83380400001)(2616005)(6486002)(186003)(316002)(956004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?jfogMNCed5EiZB6x4/91dssMmYs7?= =?utf-8?q?GZgeXmH7TvetJO3Lendgru7wEBU+72RvC9dHjRATxWJt/ZQcGUK1T+fUuP9XEi0Co?= =?utf-8?q?N7Elf4XoFMfVSVhbpeQuQNzrEV56vYs3xga84ztsQyzxzF6l+7thg8rSSZU7Zpm06?= =?utf-8?q?nnirXucT93OrOIpwTovspEXnR36eBSQ5znUACXJIkJWljWpitNtHPx3qkPrzmN0YP?= =?utf-8?q?8B5JQs6d5VLJYXSnokHOFTlPgjx3MO2bGd5tM0P1O30BAdSdFo4QeQBBsiiq+Wvvy?= =?utf-8?q?pAbGTTH/jbHXAeWz/SMQHE+OEjIJ3eVtsQlOCmjQOvvqXafWqOil2qrzWpns+0rsS?= =?utf-8?q?KNs5pF6E+RvQPAWuWOiEK6+0yyQjXUoUrW1S+eHIFSSKdBwt/YhvWpPJFevgF5hE2?= =?utf-8?q?ZxfzThM1DhDyBlKX4sPOPvgUIIn9IRIwb8JYiCLCAyT0gGDZ6DlKbDWTHoERj1Byk?= =?utf-8?q?0IiQ7GxbXOOICjVDpG48dNQQlEayv9gri7oYw8qQZpnHhjbNYrm/aqUiMwygOLnqX?= =?utf-8?q?iLSeoRv6FyzIYfbYY7hk9SUkNvtTuJFvvWt0caZY0n4IlrkLa9hghIgZcGcZBYISY?= =?utf-8?q?PXtc1vagV3Lq21iI3v1X1qlggRkzcVT/K9LYXDMjqwr3z/RxfDCFvICeDRjotrlww?= =?utf-8?q?3raD8outex6VGkZQwrzORrmCpcXVKXcQ+PVLUgdFJlvEcJ6JD8l23w5UEtst3RUem?= =?utf-8?q?JxIdLHj19foQLtVhP+aLYxQaxkHXzWNQfE8rvj+VHJvrA80ODqeI6DeZ6U/V0xmES?= =?utf-8?q?oo+icf5Le4FfFVpS0Eq0neaJssqZIihpNnLG2ZD9MVgtJHmtMuR8yBez9U62FS1HP?= =?utf-8?q?053gSm/hJi5Er5Yk6p9q1n+z0MpPw17kclw+zcvzcfZpEj1FaNwx9uSiQ7J4VsLtL?= =?utf-8?q?WRT1K5dLp8tem6nGHWl26iL96rvQZ7vPVXrK7dSMT0B/tDy1uLe/z4kQ35Ve6SJdb?= =?utf-8?q?Fvl/13sgZY8sd3b77J2aj7xBcu4GKuijqBhrZuoUa6tyuACSBz2Q9eVRubcnxP5dk?= =?utf-8?q?LeUAhz7TS8iDu3PolMJng6/98rlDJx28WZ7MAkH3HH+/lnnMytK1jasn0yIxP11QT?= =?utf-8?q?6jXiSQkezl2tx0imN/E1EOvDsDFrQS11Sx6xBRtcSQaVi/toXnC47ZFw+U9QKISgu?= =?utf-8?q?5E6CdSPkmnGHo6FnUpMQa2/SguUiRqlx0QqCenBwAe24afsh5UKFB9uCkEXxzfB9J?= =?utf-8?q?s8QM9MisOrK+xIpmgGoUnsSi4NWPSZryyrs1JGVQeejxnqtdgnWg4z9iHL+9xfG50?= =?utf-8?q?E2XP/xkQECH8D72b?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4782bd8c-012d-457c-9bfe-08d95682442c X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2021 13:26:14.0312 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yHv1rxmPODHs/kEFmOaN1TeofauFLpBPFvVQI+ECj0uKLPPtC1usTJ0SkPmvMkkiml2AzvX5VaR+xib6Rm/KWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4184 Received-SPF: softfail client-ip=40.107.223.57; envelope-from=Michael.Roth@amd.com; helo=NAM11-DM6-obe.outbound.protection.outlook.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" libstdc++ is required for the qga-vss.dll that provides fsfreeze functionality. Currently it is not provided by the MSI installer, resulting in fsfreeze being disabled in guest environments where it has not been installed by other means. In the future this would be better handled via gcc-cpp ComponentGroup provided by msitools, but that would be better handled with a general rework of DLL dependency handling in the installer build. Keep it simple for now to fix this regression. Tested with Fedora 34 mingw build environment. Cc: Gerd Hoffmann Cc: Kostiantyn Kostiuk Cc: Marc-André Lureau Cc: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau Signed-off-by: Michael Roth --- qga/installer/qemu-ga.wxs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index ce7b25b5e1..0950e8c6be 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -84,6 +84,9 @@ + + + @@ -164,6 +167,7 @@ +