From nobody Mon Jun 17 15:27:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass(p=none dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1615951444; cv=pass; d=zohomail.com; s=zohoarc; b=ENkQFFUjvW3urLSy/0oPkOqkgQKhGv1Bn3oiVKd0m/s4S5Me30/CYZghEmzMe9RSc6LI93yLrY7zlQW1DP4CqRXfQBHa9q7lMsfddQ8J9q3y0+GOQmlJrxPqkT8IK1CPhw79QrEvACln8btY11L3EGsnL1LGb6ns+kIT+sAAJUY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615951444; 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=BLVHNmWfKpS5wSleofmGWUNZKm7XvJTuwf1TL5fCeJQ=; b=QW+M2uS5e/bf0emtDEx2mGDdzCuBIsqtGCzFmwRZOAA5A0xox0MHfbSPdifb5vNVFIUt/MUJv2IB0KDP2Blt76MiGSqVp5lYZ0enpiVNpSgfpWEzAfF9HsQA1Nvsg+Y7Fh0cMgbJp4FFV43Y6vg2EGypbIA9Idk6J0vU3xmFLtQ= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615951444504617.249389519837; Tue, 16 Mar 2021 20:24:04 -0700 (PDT) Received: from localhost ([::1]:38404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMMmx-0006cL-GW for importer@patchew.org; Tue, 16 Mar 2021 23:24:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMMlj-0005K5-Le for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:47 -0400 Received: from mail-eopbgr750053.outbound.protection.outlook.com ([40.107.75.53]:4470 helo=NAM02-BL2-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 1lMMlh-00011A-Dz for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:47 -0400 Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4954.namprd12.prod.outlook.com (2603:10b6:610:63::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Wed, 17 Mar 2021 03:22:37 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f%3]) with mapi id 15.20.3955.018; Wed, 17 Mar 2021 03:22:36 +0000 Received: from localhost (165.204.84.11) by BN9PR03CA0304.namprd03.prod.outlook.com (2603:10b6:408:112::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32 via Frontend Transport; Wed, 17 Mar 2021 03:22:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oEAXonHL1CjxVVgkNr2Q/ZzdEJj0Hd1MK/ZSMxOo0Nv1NIrNo1hFop5jtw4jvdf+nX814bhbLLMaYriYSq0PSzBPm3sZEYoWP4ilieq/Q6UTgyksXGrm15+jlqwe7scx55pc4QGcIglyAuvyQcxfcBIgyXhUXMNseRwoTHFLvQoLYC2mTVUJ4GyEGf8fZ/Ji4RBUOuyM0MxrJeSMvmbVdn70aeFwg7oDrL1do+kGwJ4pn7kDIGk0v0mdnsrTgylaXEBA4rPeVLMHyOP1mLkKXYMne85ywT5CHWNGniM5oe48H7fTLscFn0E9b7bm28MwTPC0jlQzdRPrTBUfvDyQCA== 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=BLVHNmWfKpS5wSleofmGWUNZKm7XvJTuwf1TL5fCeJQ=; b=PQMX4alW4OFh/6G96q/GnrJdt0cbkM1sS79CLU4KFp3qvJ9wgxx8zOQpG0ZAYClwum0QHfB8VCQKMWwiaNuOEMZ+nGFIRYApcATQppO//lFV2FdVJnviOWl4tpQbC4ngrYrUTYe2ZSk6O4R63qjvm2MK/BXXEDKeNUFZrTHlGiwytqV4hqBXcAAtMwpgrK+F1HgOdY2pesdkNguuyMzQVOAnFhlRfTd7uWR39FyZB06xKaosEDCcYQN/aHSz9NiywlpR1Sy+qtaI7CEO0gAiEu21kMmhMRJ8oiIwxGW16nXvl7WGiENgbeLaVvrqBM6vitXxE8vaXZYgRuASnWnB2A== 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=BLVHNmWfKpS5wSleofmGWUNZKm7XvJTuwf1TL5fCeJQ=; b=H0MIYfEd41WYdXHOb0/Od1nL6dGDht2qm+BZ3JvLeRPm8t6i16/czh/m/StZafZFj4HOHdO95EMNs24YG9Lbrov3zPkIBoWNozZeOwE1Yrp28o0Dkv6BUW0wjDYckdXxO6fwMpD4mSKJlpCZw+JnZP7Ce8jl16pOQ63C7IsiIWM= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-6.0 1/6] qga: Correct loop count in qmp_guest_get_vcpus() Date: Tue, 16 Mar 2021 22:22:12 -0500 Message-Id: <20210317032217.1460684-2-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317032217.1460684-1-michael.roth@amd.com> References: <20210317032217.1460684-1-michael.roth@amd.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [165.204.84.11] X-ClientProxiedBy: BN9PR03CA0304.namprd03.prod.outlook.com (2603:10b6:408:112::9) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 12d4e74f-0cbf-468d-309a-08d8e8f3e986 X-MS-TrafficTypeDiagnostic: CH2PR12MB4954: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:651; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eyCuQ07y2TDcYd7RCOmAyrVekbgDCPIH2NpOVByLL06OTVw7gp4PjKHIUe6U2Gwmi+YbJhXoExoM2s04DIxH+4H+dQ3JLwjUK+EvgO2TRMHCBE3KM/oMq73yuz3DT5K74Ij5cfuyFd/x/3l5Cv2c3HFyxRoB/Wk7YCmVGwBpaaTLxwaBITUFIGIXovKSlUiP8h59XAcm572pNlGruUuZuJIt2+d+19qOWIMnX7MzlsIVoNME1laDZkVGLUfWFuzYuBoLetzx83tf0aADA+K2gKHJLo4SXwQf5cdEFzDgvLV4DL2PA6PkH2mxM89BTBCQbPuNwDuI8/Fihz+vN1MuL/5uRTGwfzRECs82yY6ldj9drBpwZve+mOcRMWdxWdSJ7nY03p+KT4qiRzoXoIRrJQALqDUcGyRUJOGwddtLuCSjGM4BHZE+u7lN2h6T9PKzn43IJQxZZ2yqtsU18nsJAwU51iljwFAQkbTQngAw4L9QaJpUHxzQsskLbLfVxKIyARLVljkc1cGjSjwQI3sFqIBVNohUrn7zJtCjouWxAa4m1JBoICE4g5KdwslhKhgH 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)(376002)(136003)(39860400002)(346002)(366004)(186003)(8676002)(8936002)(4326008)(478600001)(316002)(26005)(66946007)(54906003)(83380400001)(1076003)(2616005)(66476007)(956004)(66556008)(86362001)(6916009)(36756003)(44832011)(6666004)(6486002)(52116002)(16526019)(6496006)(5660300002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?UFppTkF3NGZNS0NCUlFkUDk1ZWJ0ZlpLN0t1RXB3emFvTDF0K01qNWZkZmhs?= =?utf-8?B?K0ViMlN0VlhQR2kySHJ6QVhqRkZuOGhRVUtlTEJHNnltSXNZOFhYWkUwbkRZ?= =?utf-8?B?am5UZmJCaHhHTlQrTEhGQmE5d0NYSWMrbGlQQ3dWc3l0aUdsdGg2MGYrNlRS?= =?utf-8?B?NndqK1lKT0N3VjExa3J5REF5MEtyMUZNV1YrWlltNVRhamVKT2FUbGpqYlN3?= =?utf-8?B?RmZpL0hYM1NieDhYT3hKMVpNY2ZFNVo4Z3NIYlNQYm0yN1VEbWZpMmtSaFZu?= =?utf-8?B?b2dBTi8zQVQ1UzVncXFPMWx1RW05MTdua2t2aFpPSUh5ejJhOWQyU0FTckox?= =?utf-8?B?MEwzTm9kcGRVT2dDUFdBVUZoRUl2TTcwV1dkT0RtWXo4dlZwUDJCOFRiTW1I?= =?utf-8?B?b2JUTU1wcEsvcTRCa2pNTmZ4Vy91NkxvbXdyT3dFd0JGejhxZDdsVzFuTHM4?= =?utf-8?B?RVNmUjhoamJUb2pCcXNPOHlrUXM3dmpPNEdyREFwT016SDkvSTl3ZFpaVW5J?= =?utf-8?B?U2dUUDZubzYzZFBWOEJkR0xhSWVkQStuVVVmNUdYOFJjampWdlNOcHFLUXI5?= =?utf-8?B?MGhDZVBJdU1EaE8yeFlYL1ZNTFhDSWhMQ0w5U2tpTzhoczhWaytqSHNkOGJH?= =?utf-8?B?RXRPTGF6NWJuRjZESjJGMDJBYVNUNk9lZlo0dnQveVFUcCttMm5nRy84aFg3?= =?utf-8?B?YThRRHZITHIwT1B2aEduQy9Tb0hScDNudHd1ZHlGUGNlaWlLY2tJMkEvZEg4?= =?utf-8?B?MXkvR2t5SGZiREpIT2VBRHhFVUJsUzh5TElNdlhUZUFDWkF2aVl0cEQyNGcy?= =?utf-8?B?YU5zWll3TnUwZDlOSkJWWlhnYVdRNitXZmxXZlh2N2hFWEd3RkducnF3clY0?= =?utf-8?B?L3pUd0xPMitINHlTb2FKQ0UvVzVFZzhGV3BWMjNJdDFDMGwvc3JxdmN3OFlz?= =?utf-8?B?YVNPTzgwSmROQUhtL2JRcFhvZkxOeDVES21CNGtYTkJ4Szl3bXF0MDNFeVRQ?= =?utf-8?B?Y2FGV1hSbnhLWlU0alhJRTl2M2NuSVlDZ0xtNVBWcFlGaEU0Q0FTRUxNTlFK?= =?utf-8?B?ekk5ZHQrMXhqMUxWbFUyeXhoM2tzRDhCY3dlUll6M3hpMFlJSis3VWdCblM3?= =?utf-8?B?dFpzcTUzVmNzR1VrcGNwekVxMkswSnhmZC9nUmZMcjhUc1d2emw2TGFaVk8z?= =?utf-8?B?eCtSQ0IwUFcrTEVCOEI3RUU4SUdaeVlna3R0bGorc2RhZSthS3VTRzhWai9X?= =?utf-8?B?YjZHUW5tRmV3cWNqV0tZSE1Cb043RWduNWxJOXRlQjVxaVNXcnhqdkVUMXh0?= =?utf-8?B?R1EyTmNIQmxOdDNBQWpITEd2Wnc4UHJxSUlRbERPTnpPdkR6TE1KM3l2VDdH?= =?utf-8?B?bnRRNmRQTnVJWXBvb3YrMGF3TUJUR2o3Rjc3R3U4UnRwbWRqK29WVnh1cFo1?= =?utf-8?B?ZVMrN1RQSGtYbU95cjdNS2ZaNVBlWm1UUXFZaksxRlE4KythN0Jvdjg4R2hN?= =?utf-8?B?K3ZlS2hrSDREaHorUjd0ZGZCWlVhV0Z5NDNDdjNWbXB5dUNkRjAwaCtrR3pX?= =?utf-8?B?cTBHU1E2VlhzeW1BcUVGaHhzclUweERabkh2QUY2dDFJSVduMTF3NFVpM3FV?= =?utf-8?B?Nzc2ZFJCbVd5TGZqRkx2eWtkMzF5L25Dc0lEaVBmY2lUYUJlVndNbjVZek1v?= =?utf-8?B?QWZtRGNrUG12a1lQSTdkdGZ3WldNZXRpWE44ZzE2OTA0M05rSHlCODlOSUFl?= =?utf-8?Q?iQDIy1Bh8dTXsevjtzx/7KTPwVeeLY4QaAkBXe9?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12d4e74f-0cbf-468d-309a-08d8e8f3e986 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 03:22:36.8096 (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: O/PykS3gHDxI+ADeLJ+4ucV1zMw56+JLKSPBNqix4csvXBP2hgt4kHKmKZGz9vYc1MNdy0UMQklkhnSBO5cM/w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4954 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: softfail client-ip=40.107.75.53; envelope-from=Michael.Roth@amd.com; helo=NAM02-BL2-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: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Lin Ma Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @amd.com) From: Lin Ma The guest-get-vcpus returns incorrect vcpu info in case we hotunplug vcpus(= not the last one). e.g.: A VM has 4 VCPUs: cpu0 + 3 hotunpluggable online vcpus(cpu1, cpu2 and cpu3). Hotunplug cpu2, Now only cpu0, cpu1 and cpu3 are present & online. ./qmp-shell /tmp/qmp-monitor.sock (QEMU) query-hotpluggable-cpus {"return": [ {"props": {"core-id": 0, "thread-id": 0, "socket-id": 3}, "vcpus-count": 1, "qom-path": "/machine/peripheral/cpu3", "type": "host-x86_64-cpu"}, {"props": {"core-id": 0, "thread-id": 0, "socket-id": 2}, "vcpus-count": 1, "qom-path": "/machine/peripheral/cpu2", "type": "host-x86_64-cpu"}, {"props": {"core-id": 0, "thread-id": 0, "socket-id": 1}, "vcpus-count": 1, "qom-path": "/machine/peripheral/cpu1", "type": "host-x86_64-cpu"}, {"props": {"core-id": 0, "thread-id": 0, "socket-id": 0}, "vcpus-count": 1, "qom-path": "/machine/unattached/device[0]", "type": "host-x86_64-cpu"} ]} (QEMU) device_del id=3Dcpu2 {"return": {}} (QEMU) query-hotpluggable-cpus {"return": [ {"props": {"core-id": 0, "thread-id": 0, "socket-id": 3}, "vcpus-count": 1, "qom-path": "/machine/peripheral/cpu3", "type": "host-x86_64-cpu"}, {"props": {"core-id": 0, "thread-id": 0, "socket-id": 2}, "vcpus-count": 1, "type": "host-x86_64-cpu"}, {"props": {"core-id": 0, "thread-id": 0, "socket-id": 1}, "vcpus-count": 1, "qom-path": "/machine/peripheral/cpu1", "type": "host-x86_64-cpu"}, {"props": {"core-id": 0, "thread-id": 0, "socket-id": 0}, "vcpus-count": 1, "qom-path": "/machine/unattached/device[0]", "type": "host-x86_64-cpu"} ]} Before: ./qmp-shell -N /tmp/qmp-ga.sock Welcome to the QMP low-level shell! Connected (QEMU) guest-get-vcpus {"return": [ {"online": true, "can-offline": false, "logical-id": 0}, {"online": true, "can-offline": true, "logical-id": 1}]} After: ./qmp-shell -N /tmp/qmp-ga.sock Welcome to the QMP low-level shell! Connected (QEMU) guest-get-vcpus {"return": [ {"online": true, "can-offline": false, "logical-id": 0}, {"online": true, "can-offline": true, "logical-id": 1}, {"online": true, "can-offline": true, "logical-id": 3}]} Signed-off-by: Lin Ma Reviewed-by: Marc-Andr=C3=A9 Lureau *fix build breakage by using PRId64 for sscanf Signed-off-by: Michael Roth --- qga/commands-posix.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 3f18df1bb6..665735fd09 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -2370,24 +2370,6 @@ error: return NULL; } =20 -#define SYSCONF_EXACT(name, errp) sysconf_exact((name), #name, (errp)) - -static long sysconf_exact(int name, const char *name_str, Error **errp) -{ - long ret; - - errno =3D 0; - ret =3D sysconf(name); - if (ret =3D=3D -1) { - if (errno =3D=3D 0) { - error_setg(errp, "sysconf(%s): value indefinite", name_str); - } else { - error_setg_errno(errp, errno, "sysconf(%s)", name_str); - } - } - return ret; -} - /* Transfer online/offline status between @vcpu and the guest system. * * On input either @errp or *@errp must be NULL. @@ -2458,30 +2440,33 @@ static void transfer_vcpu(GuestLogicalProcessor *vc= pu, bool sys2vcpu, =20 GuestLogicalProcessorList *qmp_guest_get_vcpus(Error **errp) { - int64_t current; GuestLogicalProcessorList *head, **tail; - long sc_max; + const char *cpu_dir =3D "/sys/devices/system/cpu"; + const gchar *line; + g_autoptr(GDir) cpu_gdir =3D NULL; Error *local_err =3D NULL; =20 - current =3D 0; head =3D NULL; tail =3D &head; - sc_max =3D SYSCONF_EXACT(_SC_NPROCESSORS_CONF, &local_err); + cpu_gdir =3D g_dir_open(cpu_dir, 0, NULL); =20 - while (local_err =3D=3D NULL && current < sc_max) { - GuestLogicalProcessor *vcpu; - int64_t id =3D current++; - char *path =3D g_strdup_printf("/sys/devices/system/cpu/cpu%" PRId= 64 "/", - id); + if (cpu_gdir =3D=3D NULL) { + error_setg_errno(errp, errno, "failed to list entries: %s", cpu_di= r); + return NULL; + } =20 - if (g_file_test(path, G_FILE_TEST_EXISTS)) { + while (local_err =3D=3D NULL && (line =3D g_dir_read_name(cpu_gdir)) != =3D NULL) { + GuestLogicalProcessor *vcpu; + int64_t id; + if (sscanf(line, "cpu%" PRId64, &id)) { + g_autofree char *path =3D g_strdup_printf("/sys/devices/system= /cpu/" + "cpu%" PRId64 "/", id); vcpu =3D g_malloc0(sizeof *vcpu); vcpu->logical_id =3D id; vcpu->has_can_offline =3D true; /* lolspeak ftw */ transfer_vcpu(vcpu, true, path, &local_err); QAPI_LIST_APPEND(tail, vcpu); } - g_free(path); } =20 if (local_err =3D=3D NULL) { --=20 2.25.1 From nobody Mon Jun 17 15:27:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass(p=none dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1615951443; cv=pass; d=zohomail.com; s=zohoarc; b=JWVgUusAJ+LPiuKYlZJbjEQ7RTLUkU2tBqpfSAtUULvfIBNtaC3cSBWPW1ANWe9b1Aa/DbP4luWXOIO0GABCiQPsZbTQD8nk0o8qieXq5DWSbTU95fOSJVzes74l3tLCXvtWNv5+GQafwzlhqyIT7MJncYoIKBHIGSq0jWOnyMI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615951443; 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=92jsJvuv8ElMBGIt++Co99O6cmWilu72GoEOAarhtRM=; b=P5KOy8CTZ58G+HkFNNt1NNjU1YW3GC0MTyyTwmkAWttRU46XxBBwZGuXiLORvI5pnLzuQLJRjhLSF8IBU9eqks38RfXXHn/XtRCQglvMoFvnavhICibtkDNuQ7EU/pCQgyvjMWAMH7sm/8I0EZbMeiwfAfiBlOpoVNaiwjgDjps= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161595144360994.13035213222224; Tue, 16 Mar 2021 20:24:03 -0700 (PDT) Received: from localhost ([::1]:38268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMMmv-0006Yu-OX for importer@patchew.org; Tue, 16 Mar 2021 23:24:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMMlh-0005K3-CE for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:46 -0400 Received: from mail-eopbgr750053.outbound.protection.outlook.com ([40.107.75.53]:4470 helo=NAM02-BL2-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 1lMMle-00011A-0E for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:45 -0400 Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4954.namprd12.prod.outlook.com (2603:10b6:610:63::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Wed, 17 Mar 2021 03:22:39 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f%3]) with mapi id 15.20.3955.018; Wed, 17 Mar 2021 03:22:39 +0000 Received: from localhost (165.204.84.11) by BN9PR03CA0330.namprd03.prod.outlook.com (2603:10b6:408:112::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32 via Frontend Transport; Wed, 17 Mar 2021 03:22:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f93MATt+KNWfdxyPFq6C7E8PX5oD1gk1dfdt3sS9VtsxwG0jrkAJPhkQgSpCSkRYJ7p5EusEHPGo8ixCXr/Mio1S4JbvAsEVtEGQMWe2fDRxYurB14aELekx8iiscc4V96wzqWSups1L22q0OM0hBgOQM3e9Ao9IeBTeJXLBc7MgKpf3JbuFtDCY0mRTmmbSC2+Fg2L7/H7oc97DPxfhFlty+v3HKb6yvWwQcKHVbTVwaBp48HwmUNVxkUHo/ovHBZ92qjs/Uku7PDYxh/FudeoNdCynQqb/LbuqinM17wY2a2tklYqm89Kpvzj89Cf53t7OF/Re2TQ4APP03BPmQw== 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=92jsJvuv8ElMBGIt++Co99O6cmWilu72GoEOAarhtRM=; b=J6eL8WVhnfBwudr5aS1Cv64fhNuJpz3XPmi8eoW5s/D0+yI+MYQVhRtkISMnQN6kLMitERF3vnWBIoKXZaWw4YS5JTEegDv9Z8ewF4QQ0I/bDkbCqsz8kKXAjbq/g4M1wNOCK8c+b6r+FK1ICenexu++k60hT61gimko4O6leZAMSm/YM6bn47nRtFTXc1PJ88pEiiTF8N4ppdfj9tf4hqKQFG3xbEUUj84tO+CzRjPNy0wl6skOUA7MgI9lO/oF/AyOMwkysuKwOv+vkpIs8VMTWdLGGNKRl0oWkD0DQVHUn/7PIUmxMJFPnQYnho7R8nmwvMhca7uYj/JycK9wfw== 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=92jsJvuv8ElMBGIt++Co99O6cmWilu72GoEOAarhtRM=; b=bS2MdvZz6TwKLchCmxfAdcyPSDjFaIIHYgmSlZJbvS5CNHFKlHVrn3IAB1TrXt7GKYepsvOixMLTXqxm4aWD1+2a2nC5+esRPvuEz0sK190cGIfJrsVmIVo5gmeUyu9ZQmoomlx9B4fb9ra2hQeNrRjUS6mFzZ5zw8LYJNYA6j0= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-6.0 2/6] qga: Add spaces around operator Date: Tue, 16 Mar 2021 22:22:13 -0500 Message-Id: <20210317032217.1460684-3-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317032217.1460684-1-michael.roth@amd.com> References: <20210317032217.1460684-1-michael.roth@amd.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [165.204.84.11] X-ClientProxiedBy: BN9PR03CA0330.namprd03.prod.outlook.com (2603:10b6:408:112::35) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: fdab74c3-46ab-478a-3290-08d8e8f3eb22 X-MS-TrafficTypeDiagnostic: CH2PR12MB4954: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:51; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DPEM9e6uPuiHE9oi0jFBKHwObVwcx8LRqSZleqBu+GU6aEmkEuqjuMKOpdfq909G2glyMm+37bso0o+kP2i04uj5tC8rxS/fyLdk30x53kkYci5CgP5KVMPx2SGfhbDXaWFyZNELLrB6gM5YO6jHtnMsGGKBq2LXUUQlnYuohmOAvmPRDJx99rg349ldEvG/Zhn/gSx7MWjohr/XaiD/gSFqzzTsvqI7GyfLvIBc1JCzApKd7dxAVumM1l88qlO6ZcycbnUv6AF3UmS22e6Ll3X6FbD7f36aZ4HOEf7Tuynsdn8Mg4S9XY0c3xYRmr6RNepz2bMsXpregpJ325cIWzUhSS6AC5lrWg8VQb18+sL0WdkmKTBYGA0LA94bVf07AQNvaA5kNHpOFcRb2LgvucMfyB6Gh3ei+Hkn2dtXAFdWXkGa22NosJtBjl32uG+7E0v/CbImh7o6Q4CKCfSmKACl05ThDhAC7az/POZMZkKpkFrJTROoMZUZ8ewlp+xl/zIxed6bjGizrzGjE3W+nt28Pne5jEWikaKqQQgdAP6PgXcYsAdTBtg6oKc4brX5 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)(376002)(136003)(39860400002)(346002)(366004)(186003)(8676002)(8936002)(4326008)(478600001)(316002)(26005)(66946007)(54906003)(83380400001)(1076003)(2616005)(66476007)(956004)(66556008)(86362001)(6916009)(36756003)(44832011)(6666004)(6486002)(52116002)(16526019)(6496006)(5660300002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?aDNUL0VqVHRaU1ZXVXZZdFEwYUloWnM5L1hnL3FDMDJOVWhXMitTNlBxamFM?= =?utf-8?B?YWdMSUxoc29DRzNCQXJsdDU1S3ZKNVNFd1NNS0V0UXBiRnU0d0EwRktMTlR6?= =?utf-8?B?WEI0bTUvcTBYa1FoYlNSOWppWEVacS9IWVZqYkV3WjNNVGNHUzRyc2l1N25v?= =?utf-8?B?a1ZKSHZrZlIvSUhQUE9TTmdvTGxibVRqZGlDQTRmQ2JYNFFtRGRaMzRkZ05u?= =?utf-8?B?NmJiOG5Ea01yNitrUFVCN0VnQURjSUErbnoranRRUFdzR3hXNGRpVVJyNi93?= =?utf-8?B?TzgvSzdnRjJIWHU2Q2ZscWFhUDNxdWhNWWNNMGpPUndJdlR4Z3Q0anNqVmtQ?= =?utf-8?B?ZnpWbklDRnlPTFUwcGlwOE9HWlF3cXdXQVVmVnNPUDNqZGd3M1NMUTF0MTRm?= =?utf-8?B?TWEzWGxDQmhHZTJwS1N1UXI4eWNJZUkwUEFaNFVuOXFFUVJvTkZwNmx1RUhl?= =?utf-8?B?VWhvSUJJUXBUMGYyT0RoaXNyMkREUWQ3N2Q3cExtcXk4c3FIcWtYeEVROERF?= =?utf-8?B?ZENPd245cmIzVHF2ckpsL1p3UWs2a0twM29VTVRsbWlpeVl0a3U1QzROL0pr?= =?utf-8?B?U3paZGUvTFlXeTFwOXl1VERxZHN0RG5qejdmQnVBZkFldG5YcnQ3YldONzVw?= =?utf-8?B?VUpMeUo0UC9CMndLMVBpU3pUZFovNDJ0NWI4dm1seU91aVplcWpkS1ZQV25E?= =?utf-8?B?S1R2Z2Q1enRTcnZyaUZNUEVlaTVuS09FQks5c3ppb09TUjZRNms3eWxPQUc0?= =?utf-8?B?dmF2dDhFdVZUZkxNd2M0WUF1NTRqQU02UjQ2SUFaTlZQTWllQm96akRPbnEy?= =?utf-8?B?ZkFiNmZaLzJXZks1K2lIeVRLNDl4dWRuVlZvWm90eml3bk96NVdyZHRsc1pl?= =?utf-8?B?OXl4b002dXJuR21wS0tadWhrRmVVQjRzWGRiNEI3QzgzRUVnMnhVS3IrTU9Z?= =?utf-8?B?RDRQVDgwWmEwQmtTMjg1YTFqenhlMzY5Zjg3TUlFRjd5Q1kzeENsM0lXZkVp?= =?utf-8?B?T0djRkorZTdESjExOVhvVCtBYks1MkZ0RDFic1c5a2hxZDNJRUd0bWF2R1ly?= =?utf-8?B?aEIxRmxOUDMxV3UvSHh2TUpYNVJyblRRR1pPR21ucDZ3VG5zSkM5RnR2RGFh?= =?utf-8?B?WjdNWkpZenJmQWdFUlppME1SVTFnZFZ5aDFuc2pCVmp2dk42djFpUkFFREU3?= =?utf-8?B?Y201ZzFDcEp4R1BERHpKRWZEbmFvVHhZRkQySXpCc0JWNXhndFBuZDVjbkY3?= =?utf-8?B?a1o0Y1JPdUkyL3BCcVE1S2F5YU9DSWRxbTRBc0hpODlpN01iRzUxeHpGSkN1?= =?utf-8?B?Ni9XeTBFdkpUd0I5QXNENFFSeDh1VlpuVFU1RzZxUlJaaEd3KzRLS1pTM2VN?= =?utf-8?B?Yk9DMHI4ajNHQTV2M0NpYnhTOXJ1VmgzWUNCTzJadmRPd2I3K3Y1QVJFTGd0?= =?utf-8?B?Rktwc1FlYzVRNXdkUUpESGQ1UGxpN1pBUHJobWIyRjdKV3plY0JaU1pFRUhW?= =?utf-8?B?dHZSMUtxUUM4ek96T0JzOXRVejN2RXlaMUkyT2RsNjhNalEzOU9ReWZlb1FW?= =?utf-8?B?MGJ3M2JTd1c5cFpTRlArdlhFRTh0aUdUcFd6RnJkYjgxdVhUTWREOUJmZmtw?= =?utf-8?B?WFhjRkViZDl1Q0wzdUJnN09aZzZYeXNGT24xY2g4cVY0d2cxaE0vOGJaZXVH?= =?utf-8?B?dTR0TDRncnhyakdlM0FTelhkeC82QzdCU1kvVVZ4UG0rMjBPd2VUUDliR1Qx?= =?utf-8?Q?kl50l0s0Sw0Sj6jIbqif8Z2/USNlncsoZHHdSZl?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdab74c3-46ab-478a-3290-08d8e8f3eb22 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 03:22:39.4888 (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: qWo/0ZILlf8hhERfwWb0sABxvVI3uNOa0mwUcLsYm1UIOuIw7VcAyP84j9LKMH0hHQKtzSU3L2RCFYTzlYynAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4954 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: softfail client-ip=40.107.75.53; envelope-from=Michael.Roth@amd.com; helo=NAM02-BL2-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: , Cc: AlexChen , peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Euler Robot Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @amd.com) From: AlexChen Reported-by: Euler Robot Signed-off-by: AlexChen Reviewed-by: Marc-Andr=C3=A9 Lureau *fix 80+ char violation while we're here *fix w32 build breakage from changing INVALID_SET_FILE_POINTER definition from a cast to a subtraction Signed-off-by: Michael Roth --- qga/channel-win32.c | 7 ++++--- qga/commands-posix.c | 4 ++-- qga/commands-win32.c | 22 +++++++++++----------- qga/commands.c | 4 ++-- qga/main.c | 4 ++-- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/qga/channel-win32.c b/qga/channel-win32.c index 4f04868a76..779007e39b 100644 --- a/qga/channel-win32.c +++ b/qga/channel-win32.c @@ -292,9 +292,9 @@ static gboolean ga_channel_open(GAChannel *c, GAChannel= Method method, return false; } =20 - if (method =3D=3D GA_CHANNEL_ISA_SERIAL){ + if (method =3D=3D GA_CHANNEL_ISA_SERIAL) { snprintf(newpath, sizeof(newpath), "\\\\.\\%s", path); - }else { + } else { g_strlcpy(newpath, path, sizeof(newpath)); } =20 @@ -307,7 +307,8 @@ static gboolean ga_channel_open(GAChannel *c, GAChannel= Method method, return false; } =20 - if (method =3D=3D GA_CHANNEL_ISA_SERIAL && !SetCommTimeouts(c->handle,= &comTimeOut)) { + if (method =3D=3D GA_CHANNEL_ISA_SERIAL + && !SetCommTimeouts(c->handle, &comTimeOut)) { g_autofree gchar *emsg =3D g_win32_error_message(GetLastError()); g_critical("error setting timeout for com port: %s", emsg); CloseHandle(c->handle); diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 665735fd09..4299ebd96f 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -110,7 +110,7 @@ void qmp_guest_shutdown(bool has_mode, const char *mode= , Error **errp) reopen_fd_to_null(2); =20 execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", - "hypervisor initiated shutdown", (char*)NULL, environ); + "hypervisor initiated shutdown", (char *)NULL, environ); _exit(EXIT_FAILURE); } else if (pid < 0) { error_setg_errno(errp, errno, "failed to create child process"); @@ -479,7 +479,7 @@ GuestFileRead *guest_file_read_unsafe(GuestFileHandle *= gfh, gfh->state =3D RW_STATE_NEW; } =20 - buf =3D g_malloc0(count+1); + buf =3D g_malloc0(count + 1); read_count =3D fread(buf, 1, count, fh); if (ferror(fh)) { error_setg_errno(errp, errno, "failed to read file"); diff --git a/qga/commands-win32.c b/qga/commands-win32.c index a00e6cb165..4f4c579a3b 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -110,15 +110,15 @@ static OpenFlags guest_file_open_modes[] =3D { {"w", GENERIC_WRITE, CREATE_ALWAYS}, {"wb", GENERIC_WRITE, CREATE_ALWAYS}, {"a", FILE_GENERIC_APPEND, OPEN_ALWAYS }, - {"r+", GENERIC_WRITE|GENERIC_READ, OPEN_EXISTING}, - {"rb+", GENERIC_WRITE|GENERIC_READ, OPEN_EXISTING}, - {"r+b", GENERIC_WRITE|GENERIC_READ, OPEN_EXISTING}, - {"w+", GENERIC_WRITE|GENERIC_READ, CREATE_ALWAYS}, - {"wb+", GENERIC_WRITE|GENERIC_READ, CREATE_ALWAYS}, - {"w+b", GENERIC_WRITE|GENERIC_READ, CREATE_ALWAYS}, - {"a+", FILE_GENERIC_APPEND|GENERIC_READ, OPEN_ALWAYS }, - {"ab+", FILE_GENERIC_APPEND|GENERIC_READ, OPEN_ALWAYS }, - {"a+b", FILE_GENERIC_APPEND|GENERIC_READ, OPEN_ALWAYS } + {"r+", GENERIC_WRITE | GENERIC_READ, OPEN_EXISTING}, + {"rb+", GENERIC_WRITE | GENERIC_READ, OPEN_EXISTING}, + {"r+b", GENERIC_WRITE | GENERIC_READ, OPEN_EXISTING}, + {"w+", GENERIC_WRITE | GENERIC_READ, CREATE_ALWAYS}, + {"wb+", GENERIC_WRITE | GENERIC_READ, CREATE_ALWAYS}, + {"w+b", GENERIC_WRITE | GENERIC_READ, CREATE_ALWAYS}, + {"a+", FILE_GENERIC_APPEND | GENERIC_READ, OPEN_ALWAYS }, + {"ab+", FILE_GENERIC_APPEND | GENERIC_READ, OPEN_ALWAYS }, + {"a+b", FILE_GENERIC_APPEND | GENERIC_READ, OPEN_ALWAYS } }; =20 #define debug_error(msg) do { \ @@ -280,7 +280,7 @@ static void acquire_privilege(const char *name, Error *= *errp) Error *local_err =3D NULL; =20 if (OpenProcessToken(GetCurrentProcess(), - TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY, &token)) + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &token)) { if (!LookupPrivilegeValue(NULL, name, &priv.Privileges[0].Luid)) { error_setg(&local_err, QERR_QGA_COMMAND_FAILED, @@ -1116,7 +1116,7 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *= guid, Error **errp) =20 len =3D strlen(mnt_point); mnt_point[len] =3D '\\'; - mnt_point[len+1] =3D 0; + mnt_point[len + 1] =3D 0; =20 if (!GetVolumeInformationByHandleW(hLocalDiskHandle, vol_info, sizeof(vol_info), NULL, NULL, NULL, diff --git a/qga/commands.c b/qga/commands.c index e866fc7081..a6491d2cf8 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -22,9 +22,9 @@ #include "commands-common.h" =20 /* Maximum captured guest-exec out_data/err_data - 16MB */ -#define GUEST_EXEC_MAX_OUTPUT (16*1024*1024) +#define GUEST_EXEC_MAX_OUTPUT (16 * 1024 * 1024) /* Allocation and I/O buffer for reading guest-exec out_data/err_data - 4K= B */ -#define GUEST_EXEC_IO_SIZE (4*1024) +#define GUEST_EXEC_IO_SIZE (4 * 1024) /* * Maximum file size to read - 48MB * diff --git a/qga/main.c b/qga/main.c index e7f8f3b161..560490467b 100644 --- a/qga/main.c +++ b/qga/main.c @@ -586,7 +586,7 @@ end: static gboolean channel_event_cb(GIOCondition condition, gpointer data) { GAState *s =3D data; - gchar buf[QGA_READ_COUNT_DEFAULT+1]; + gchar buf[QGA_READ_COUNT_DEFAULT + 1]; gsize count; GIOStatus status =3D ga_channel_read(s->channel, buf, QGA_READ_COUNT_D= EFAULT, &count); switch (status) { @@ -610,7 +610,7 @@ static gboolean channel_event_cb(GIOCondition condition= , gpointer data) * host-side chardev. sleep a bit to mitigate this */ if (s->virtio) { - usleep(100*1000); + usleep(100 * 1000); } return true; default: --=20 2.25.1 From nobody Mon Jun 17 15:27:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass(p=none dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1615951469; cv=pass; d=zohomail.com; s=zohoarc; b=HqbwjKJqGmvmdMu1McPVi3q/Td9+XX96E7CA7T+Cn7lqQbB11F+NUCHLH/MVwbbAxzJ9JGmFET/DgDfVwV57fAUqYdk0bIpif78SVdgFm88KkbdnhAueWMf+mdI+UWcsbbxiNsr+JbhP8Qn6PNkYIoMce5q0VuRac57RwA30S4I= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615951469; 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=/M5Df7a5YZoJfi5hhMwqO7Bg3WhQ2CfAgyynAi9HJDw=; b=AfDfUVyR4QozvOKakzzgDl2z5FN822TDzl0TnSN58ak9oI3kBt9ErCEzC0YX1brxL01HCp3fYWYC0QOBF9t8cyd7+4atDz/QKGWt7hRy9WHBbgb6O3qkc9UygD7tSVsKa93bSUGVSBmVAPJwtBIJrdMU/eDCJXv4cLvFvzAQGB4= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615951469144407.54588491919674; Tue, 16 Mar 2021 20:24:29 -0700 (PDT) Received: from localhost ([::1]:40522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMMnM-0007SN-40 for importer@patchew.org; Tue, 16 Mar 2021 23:24:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMMll-0005Kl-Eg for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:49 -0400 Received: from mail-eopbgr750053.outbound.protection.outlook.com ([40.107.75.53]:4470 helo=NAM02-BL2-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 1lMMlj-00011A-RY for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:49 -0400 Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4954.namprd12.prod.outlook.com (2603:10b6:610:63::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Wed, 17 Mar 2021 03:22:43 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f%3]) with mapi id 15.20.3955.018; Wed, 17 Mar 2021 03:22:43 +0000 Received: from localhost (165.204.84.11) by BN0PR03CA0015.namprd03.prod.outlook.com (2603:10b6:408:e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 03:22:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q6ranWZzrsPe/y4oUQ4JWuSho1Kw//LmdDyP7UUlT5VKpEbRttsnXlRYFZg4WqrHPjX2oXQYV/Jwo7G+nCdR3p6QcTMe4jz4eZYO3mMSizEwO9F/t6TjC/xvBwA7DUOCO6UwBPBbG5XDO6b7iC/9n3Q19D52o4XecmjK6i/IVq79AJgmylBnbgp1oI2zUnJakaZFLTfqCtwpqY6qE4nGnFrfbyviv2BsM5nV3gM1NyhFLG8RCIv/4n8Is6zTAomLR5s7pCBPLeHyzwzXSrhNSQg/UiXdxyk1F+PQ7yHv3PGxAHrQ/iM6AUO3Mi6RmGyHg+QUziPzlWDWe091aU2abQ== 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=/M5Df7a5YZoJfi5hhMwqO7Bg3WhQ2CfAgyynAi9HJDw=; b=lQ/56e8jJxc0TAtSx4HCXdy1bkjTCtxSGSJKFUbDAcJ8Ox+jmUiJ/odsQn5j0OnMa+6kpMVx2kCmplHP8kP2Ct/JG7f4h2JlZfzBScIW3RwSBTIfDSZsE9/MeCExWd5qfMjbAaM36ZCMSBDcEfBIyws4DPBln66o49zaiZAtKfVRxQ9yN8KgLr01biblDsb6ALiR0Xb8Nskk9G0TyL6vV8ln82/UQBX7W3ijMR0TH0RtPgWDHWuYaxHV2jaI47/zuvCvAwsb5VOOygedPuR0bD9XD8Z933OOoQFGXYj3k5ioh4lwOzk1rWi64o+pxFINGgdkmbv9G08EM2eVW+w43g== 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=/M5Df7a5YZoJfi5hhMwqO7Bg3WhQ2CfAgyynAi9HJDw=; b=bZlecJgGgyCuVNlaDmNPaAWRr3RxWJw9JMIaQkrO7VOs/xZFjZ6TR151+Vs6B6KC5UkZJH/zIyII56Dts3l59Hv2HF1/e5P2H3XkQS+PzxxLqnrIKgGiImnErueLNtgC/MO/q5DxWED4AFPmAZYAYXtJwhukvAxycR2+yqG0v9w= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-6.0 3/6] qga: Delete redundant spaces Date: Tue, 16 Mar 2021 22:22:14 -0500 Message-Id: <20210317032217.1460684-4-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317032217.1460684-1-michael.roth@amd.com> References: <20210317032217.1460684-1-michael.roth@amd.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [165.204.84.11] X-ClientProxiedBy: BN0PR03CA0015.namprd03.prod.outlook.com (2603:10b6:408:e6::20) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a8c5f4cd-0efd-4251-e29a-08d8e8f3ed56 X-MS-TrafficTypeDiagnostic: CH2PR12MB4954: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:296; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oXgLuDSFUYuPuU7w6Pnrrm+augvUVGtY41Yvuo6LQIEvVLmZVFpZKhR4T3sEAG/+SjS2vwGUASsSqHFC0z3FxGwgr2/VlIBqlfkt0IK9NXw9c4KVUyADT9VXIoQhMjISwCEkgBUH8TQ9xJU6/E0wEnA160TeZiWxa/hGPI6fRzb90gpMm8XQdJxJYs0t8+XtGVDF0XZnSvwtW0M8qGXfFex4ZxCqNKlUyKTRepCKFAC7DQH2kLp0kFLhcY4GJTMB7kDm+I81+kBhbwns/JugSuuE82a7fsU3ulCbBvdB6TucURTag25nn3zVBGpp1eviEERdf/iwPrpTkkykY+7zAFWRIXGronkArDmkkykg+wggUCGZwrPQ1u7PYzJodI973rCIqyaURtWTyFhm3YQe+F0vp6CPPqCmkeadslEXQHNSIcKrIEz/BPOit4QFO6yijhsvU0K8JbmUKXf8Or15BS42oJlsDy1BqoWkRLY8gny2jnajxVJEGsdU7IgCn6gxIwLefw4R5d2+UF1Gi7AyZBNIWUSU7kMfLyPalWgFOwHW+gcQeqw0J1dFvJ7dCWd+ 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)(376002)(136003)(39860400002)(346002)(366004)(186003)(8676002)(8936002)(4326008)(478600001)(316002)(26005)(66946007)(54906003)(83380400001)(1076003)(2616005)(66476007)(956004)(66556008)(86362001)(6916009)(36756003)(44832011)(6666004)(6486002)(52116002)(16526019)(6496006)(5660300002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?Q1lpSndaUldKbkNFMkk3NnlNQWl1bi9XeUZ6ellMMldFdW03UVlaZWJIRlg3?= =?utf-8?B?d0gyL05rWmtvTFIyZXlISGV1d1RkRmtWaTl1ZWZKWllaUC9jcStDVkU2SkdQ?= =?utf-8?B?cUYyeWZ3M2RnSmtrUXNnTFVrQ0l1MTVpS1ZLSG1KQnd6UEdyV2E0a0kyZkNr?= =?utf-8?B?dVRaSDdkM0xwNnJRQU9tUldmSFpEUjY4WTJUNS83U0xLbHdhelN4anBrOFpY?= =?utf-8?B?Q3NkQUhkVE1GejFwYk1JVGxqSkhCTUJPVnpibkwvSkZEcXExY21IVG10V0p0?= =?utf-8?B?eE5FeUI3Y3pHZHdaUVJNUHkrSFAxYmdaQjNaUTJKOG1TczFjaWp4ZmltbVR3?= =?utf-8?B?cHNLQWRrSFNZL1JwK0Z0d1NaUTI4d1VZd0l4cDdaVUwyY0lMYWV0N2kzTUtN?= =?utf-8?B?ZmNjUlFIQk81OEg0TXpkL3RDc0dtaGdJbXQrSTNnWklTcHNXbUw2ZzdqcHow?= =?utf-8?B?TnVidzFBQlpyTHZPWnE4dnVFeEdmM3FxZXBFdUVQU3dmZGVZZWtwVlRQSEdR?= =?utf-8?B?emczT0k4ckhlc28xQTc5c3JlSWhSVCs4RktSTkZvTzNBWFBwa3Bsc2pnRHc2?= =?utf-8?B?bzZ4QTI3SDVBSXhiUFV0ckVHWFpsSUxHTjRBR0ZNaFNwRXhnMTNGSlZidWdu?= =?utf-8?B?RnJEK3BRK0E2YktXOCtBSGxhN3ZvS09JRm84bmtWMFI2MXg4d1plemFLb2pz?= =?utf-8?B?bWFUY0RoNjlNb2JCYW80Tld1cEsvdVhIOFY1UktXTzJPak8xMVgzakJ1RDFa?= =?utf-8?B?eFpXVzBaeFlZOTFtaW54WVlJM05pV0toT2dFcXJUS3FubklHLzJOZDNqck5C?= =?utf-8?B?MXVEZVNUMkVJK25XTFR3N3BtM0IwdFFySnFtSVNtQUlUSmN4NkxHNmljNmVL?= =?utf-8?B?VXY5RG5NNlJrZzUxVXZZZFpyTEtvTEN6VTY2akVyQ3dNWVlQY05TWnFvSU1l?= =?utf-8?B?Y3h2NVYxMyt3cXUvZjZoSTNlOWtVdnd5Z1pRdWpDL0R4bzdiUWNaNGlSWHA2?= =?utf-8?B?WkxxR0pYNC8vOTh1MThzTkpMdVN5bHBBYWJMMkNSSTZlWGJ2YS9VZ0tKYXJQ?= =?utf-8?B?djNWT3F5ZEwrdndIeDdRMHZjU0FQeE9VSXNKdmhqakpXYUo3eUlzSkxHUExD?= =?utf-8?B?QnVSRDlnQ1A0cTN6TlFBTmt0amorRlV5dTFObEZJdmVZMTBVOStUaldCZGkw?= =?utf-8?B?QkROUWNBRTBIQkFlODdoUi96WXVnV3ZwMGZFajB3QkIzSEZmWG9rc2dnL3FT?= =?utf-8?B?T21yV1FQazZTMWNVVDJiV3JoemdGMmxyKzRTaURLVnJ2Q0pTbXRGaUtlSkl6?= =?utf-8?B?Q1poK2NxQWlFZXpIcU5LSm9BQk5oMHhVSGE2RXNYVWR5Q1E5RVUwOTZ2dEV0?= =?utf-8?B?RjkvcU5iaVB3cVRPS0RUTGw3U1B1azlGbytyM2RVSGVhVTA5Y1ArNUFWS0Ri?= =?utf-8?B?dmV3VVhDVGVEZ1cxdEd0dVoyYjRBL0JTTXBqNjV2M28yL0xjbVkrSzdsc0FX?= =?utf-8?B?bjRSci9pRmQzNW5NcFhpT2gwV2VlMTVjQm1UVTNGMUg3Tkx0ZHM2RWRxb1hT?= =?utf-8?B?bmZxUk1vRytZOERvanA4dW5TRWZxWGo2RUliR1hmSGJVdCtWaEgwcjEzNmhm?= =?utf-8?B?R1hhTGpYZ0hOQnBKcjl5eHVINWo4cjQzOG1tbkwxdm12UEhWRGFVWkNiakFh?= =?utf-8?B?eXFDbFkxRTRBT2dLdWJ0RnRBQW9CT25TMlVESkdLMTJqNGVmT2FiR3hjUkZj?= =?utf-8?Q?I4HgIKNKEOA3pOniyd/yFFPhZ2zgCtLJbTt0/Yg?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8c5f4cd-0efd-4251-e29a-08d8e8f3ed56 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 03:22:43.0800 (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: zEO2k0hDVBXVt3VA/4S2hFGeutLbDdrz5PVXB41xk1+Qf7hgi/4bpYPa6jk8IybUn/BQU+llBTW3ocUzJ2aBtA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4954 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: softfail client-ip=40.107.75.53; envelope-from=Michael.Roth@amd.com; helo=NAM02-BL2-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: , Cc: AlexChen , peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Euler Robot Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @amd.com) From: AlexChen Reported-by: Euler Robot Signed-off-by: AlexChen Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Michael Roth --- qga/commands-win32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 4f4c579a3b..27baf17d6c 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1323,7 +1323,7 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, E= rror **errp) DWORD char_count =3D 0; char *path, *out; GError *gerr =3D NULL; - gchar * argv[4]; + gchar *argv[4]; =20 GetVolumePathNamesForVolumeNameW(guid, NULL, 0, &char_count); =20 @@ -2174,7 +2174,7 @@ static ga_win_10_0_server_t const WIN_10_0_SERVER_VER= SION_MATRIX[3] =3D { =20 static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp) { - typedef NTSTATUS(WINAPI * rtl_get_version_t)( + typedef NTSTATUS(WINAPI *rtl_get_version_t)( RTL_OSVERSIONINFOEXW *os_version_info_ex); =20 info->dwOSVersionInfoSize =3D sizeof(RTL_OSVERSIONINFOEXW); --=20 2.25.1 From nobody Mon Jun 17 15:27:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass(p=none dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1615951596; cv=pass; d=zohomail.com; s=zohoarc; b=k5IntG2V7hHaJ2U0zttz1uvnFKfv1lb+/8fsUFp4BI/9+aMhYTHbU5Yg8Z3xEkzeJDKSGag949Bqn7cpoFj5ONbJ81x19a/FnlG0KwC2xvKrJyGL31+x9JkxJHYqw040d2guaaHzEBY0U/OQF6jf6E8CJpao2+MLqDngeTkJPUw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615951596; 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=6ni11o5P+K1UJycK+Snv4s8qZGFxZ6Z5ZyeEmtuvSy4=; b=bH7Q5byA+jmnoVi1nKOtwfS3JBaogimm8qe8Atxt6x2ZB7Y6634QJc32vgjnN6RF6GtRFjtEJAO5gXm7754291HEtGZcSoez8x9tpAcmeW+mNoLWEawrb1rr/qUt07SYzEpA/VWtjRy+h06ixtoi37ubOcdsPK2wZjscCIgh0Aw= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615951596083802.5396432462136; Tue, 16 Mar 2021 20:26:36 -0700 (PDT) Received: from localhost ([::1]:45198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMMpP-00012N-4h for importer@patchew.org; Tue, 16 Mar 2021 23:26:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMMln-0005O3-Aq for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:51 -0400 Received: from mail-eopbgr750053.outbound.protection.outlook.com ([40.107.75.53]:4470 helo=NAM02-BL2-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 1lMMll-00011A-LE for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:51 -0400 Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4954.namprd12.prod.outlook.com (2603:10b6:610:63::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Wed, 17 Mar 2021 03:22:46 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f%3]) with mapi id 15.20.3955.018; Wed, 17 Mar 2021 03:22:46 +0000 Received: from localhost (165.204.84.11) by BN0PR03CA0020.namprd03.prod.outlook.com (2603:10b6:408:e6::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 03:22:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y4WREGwPwNnScweP7rBfNl6yPWTM2cvRRgP1nb4cU9rCi1rE4zJ2k5ihv1SPa1cMTpGey5mSQWAG2bfE9CXPtYqLX9L0WvbJXRPMDQSRTgerGiI2mBptY1G4ZUn2e3wdoI4SPJImAFmxNyOZMEc8+1cAJN64PefvR/erciNfH6jzg2u1eym/L2hdt9jqN5LpQF1K4iFAURShX/i4ZCpe94wH318oMQPtiIYc44vb5vHGdlwMQp2iXjkfWuxcXSePNQ8y4wtDIlAeMdO78/WVrsQkoD/2GJSYqXjiMi073pz7UBS6aW0I2c8wlZSMyFyixwgg1QnGiIqfZvCPHnGmTg== 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=6ni11o5P+K1UJycK+Snv4s8qZGFxZ6Z5ZyeEmtuvSy4=; b=k70iHwbhjYL7g95GKL6lCjHYjJ7CNP2/5kah+rn/pNyMU6DBYJ4bgQkjpDDkoLAOSojVyO15pVWiIGtv8h6AJ4xSaIk+H3EAsGrC4ZZVcWSFOG0QBxkdEKZBmptYwyQLAFIT5YC6h5/3hkTHBN/dTBBA5e6/9ttjPdj0vJYzpTwIPpax5SBA0yUBqPSKeZ+NLoXMjYx4NcqC9GsclKRBjeJg1J5C2wkoax1NsIyoY35s9AWVwtoRQjmy1cseww/caYYAaSEmELlfp9JfswxT/t223sCq3bsvzptrg0s2gaA52UvCmduEHJdsWcaB8CK2iI9aOd72+3HFhwa81ev78A== 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=6ni11o5P+K1UJycK+Snv4s8qZGFxZ6Z5ZyeEmtuvSy4=; b=B/EM02UEepyDRAJ9jThVlGgXuf0w2YpfHWhjRXj3sWLkiYAymdc+sVR2SnaeaofmxxKjioTySS5rAn5hscZLg2eMRwOAnSgijJ55+U9xOuu1godUj8F+OanDMhD3SHXTg89nMAP8yjpA4x+UF11pUCpet7YGLh0zVqL3nIIUQXE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-6.0 4/6] qga: Open brace '{' following struct go on the same Date: Tue, 16 Mar 2021 22:22:15 -0500 Message-Id: <20210317032217.1460684-5-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317032217.1460684-1-michael.roth@amd.com> References: <20210317032217.1460684-1-michael.roth@amd.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [165.204.84.11] X-ClientProxiedBy: BN0PR03CA0020.namprd03.prod.outlook.com (2603:10b6:408:e6::25) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: aa6fadd5-a5ca-41f3-e2e7-08d8e8f3ef78 X-MS-TrafficTypeDiagnostic: CH2PR12MB4954: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:117; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NxKPIi/MU+7v17suUKxsNboV0ChGLB9UfmTnJvNpMz9mLfGERQ1zEV4k1HaD0gdJLxwbN91Z0yzYxwzfjD0LQEGeZwItUK5TvfskjJsV2eCLmUfpcauje4f9CVkACjZgnBeS/WXVY/+DOCWie5RFzrXyDySCZFspGzeMPvVeehmrNi4l4i5byYdmdYZbHKV51hh2HNJDVe9DMKPdVD6UObmLnHDMDmrsqJS0M3m+5ALqBrhQB1O3QdhVyKmazL4qUHAh4jEHnA80qA0MCd4a8k1wFBYDgjWsY9uRAkQHnb1DRyeSADN+dbC2vtF+p9iFN+nSlh5ZeXU95w+f5nxMuD4Ji1s6TEVsTHNt/I/sCD2ySvf4FySykjhhFqudkXmarrLs67xbEfa/9Aq+R18M96MmMIZ4P+5YTOtsMcKhimd7Mn30YJtBxJ8dtICQwtAKOVrRWIinztk2nlrJSytCqDeVqhmdcGr0QYoeamZ+NqqHhgHL/LEDjOnRBAjuLqf5jlXOaB29WU2193BJ8E1LoEo7zI20Y0RWkE3pouUOwEHzYkGJnEuZWlEwSEqORiM6 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)(376002)(136003)(39860400002)(346002)(366004)(186003)(8676002)(8936002)(4326008)(478600001)(316002)(26005)(66946007)(54906003)(83380400001)(1076003)(2616005)(66476007)(956004)(66556008)(86362001)(6916009)(36756003)(44832011)(6666004)(6486002)(52116002)(16526019)(6496006)(5660300002)(2906002)(4744005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?bmtCRUtxU0RJcDdlV1VLR0JVbmFKK2RjUzd2cm8wT1hLZGVITTJSdmR6aWdF?= =?utf-8?B?ekV2NDZ6Wm5EaGcwK0Y0MGRtRk16VFZBZUtnR0ljYnBQRlZ6aXFqRk9SOEpJ?= =?utf-8?B?ZDlEZnVrQmM3Q3AyYkZtQVEzNUNMekgwTi9zT29SUkQyem5CTUNteGpmTXUw?= =?utf-8?B?YjJKWEVTQ0w4c0VtdlcwU3pBVFpWUXFUVFdVK1RZK21HeXRQbE5BTjA1N3Qy?= =?utf-8?B?bjdGUWlOQXF3ejY4ZlVMb2JJNzlsS29ZV3NqSmhvYkprSDFJZHd4WmVGTDZD?= =?utf-8?B?MFVTNG0vWkhJK082WTYydWgvalFiMm1ZWFJiVEJuL3JReDNNREdlcjdvZEEr?= =?utf-8?B?UWFVRGFLd3NTdEJQemhXSEh5NEFXVGlwcXNxUDg3VlF3TlN0MUlqMWp0NVV3?= =?utf-8?B?NmF4Nm45a0JKc2Z1dFBheEdUS1ord0pNMC9oclJNYTdxMlIwVy9wQk8vOWhj?= =?utf-8?B?NmI0RGxlT0E3YUJDZFVNTWlweFBXeGMybWl0NldkVFh3THdiSXNwZjhScFQw?= =?utf-8?B?ZVZwZ2tGTjk5amdlV01HNHJXM2JlcW9nbXhVV3BvaFNGaUp6RVFHRCtFc0d5?= =?utf-8?B?eXFrNWg5ZldwVGVGZzNkNzZkYUFMR1B6bzZ1Q3didm5VRVYxNU43QTRZWHA5?= =?utf-8?B?Wkp4cFdocDN5dHBlT0dCQ1k2Wnc2UkdiRzF6UnkyQW1jMW1xNnFKNGFzOU95?= =?utf-8?B?QmNQMzBTRHNMMG1ick53TFNjL2FwbVdoL1dpQys0ZUpRY3RTdnZvNXZoMEZP?= =?utf-8?B?LzdJSzJVb1JUZmtFRk1kRUV2Ylp5NWFJSFJRaWFSL2l5WXNlR1crTmFlL1R0?= =?utf-8?B?VFp0UHptQS9WK3ZhTUtsakRJenJaY2NWdkNpSkZzS0FTSUgwbGFqT2dSbk90?= =?utf-8?B?bHRySjlWZUFuT1FRM2lacmJPRG5WSG54a3JDTzhrVE1yUjlRR2MyZXdIOXA3?= =?utf-8?B?Z3dnOG1MTVZrTC9RZzlNK2JyWXhHR2luaVdvVWYxM0Fac0tXRnJQZTNKWTFC?= =?utf-8?B?UWwvUWtjUkxxdDFIM21aUThzakNQVStoS1MyOHhQS1BWWkN0dlFVWGhNNHZu?= =?utf-8?B?enh0MkdiNlZQaDhhL0FVdlpyNUljQjMxQWtmb29TQzQwZkZjSDF0Nzdic0M5?= =?utf-8?B?bkJBRWRDZURnOG84bkpkc0ZnREVUVkpTK2loM015eDBHWlJickxMbGVUT2ZL?= =?utf-8?B?VGQrUVducCtkSmVUQ1FxK2k5QmVNeGJaWkpKTWYza2swVXRzQnh3dkVWdnFI?= =?utf-8?B?YVdsSXlGc21ZOC9ZeUlhczZBaVo0ZFAxdzB1REFLMlZXWGxJS3AyaDlnNmhx?= =?utf-8?B?NCt6ZVk5SzhReUcwZmtRQk5sS0VlSUFrS0l5ejRiQjVMTm0zaVNUMUlaTkFl?= =?utf-8?B?c0FPZ0YvekUrVGE1aG9QNnNxQ1RnZUdDb3N3SVREK05aL0ttSmRqU3o0Ylh4?= =?utf-8?B?OUU2bkJ6ditSOXhCNndVNWlvZFJJajBBUVFVMVFhd0dSYXlLVG0yK2E4YlBE?= =?utf-8?B?Uk5NZGlWYXErZEhIMTlZd1FETjRtd1hoSTdneEhtUzJuSWMzV1h2WUYzR2ZR?= =?utf-8?B?Y2xjZVArb3d1dWlkQlpzcVVrVHYyUjlIdHhLU1Z3eDk5aVMxTk82aEZPWUti?= =?utf-8?B?bHZoMldRQStIdFBlWW5GSXB3K24yLzhsSThiaGNOZkFSTFRaSFpGZ0lwQ0RN?= =?utf-8?B?Y2JDSlBIdXBjdXk4djBjWVRKQTZGZkRMcTdhbTV3eko0U0hBeERUZDZPV1dj?= =?utf-8?Q?cBOwyelpVaJRwX4v99SE+c4g3UOm3SXKz9i1Nv3?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa6fadd5-a5ca-41f3-e2e7-08d8e8f3ef78 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 03:22:46.6971 (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: 3E/ubV4gn2F/cYNuZDJAQrNHovJuXsRymKRY40NAo64BXMiJHA8gaB4UWW6T5dusxLcc752TzZY78IsB2++s+g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4954 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: softfail client-ip=40.107.75.53; envelope-from=Michael.Roth@amd.com; helo=NAM02-BL2-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: , Cc: AlexChen , peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Euler Robot Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @amd.com) From: AlexChen Reported-by: Euler Robot Signed-off-by: AlexChen Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Michael Roth --- qga/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qga/main.c b/qga/main.c index 560490467b..20db0058db 100644 --- a/qga/main.c +++ b/qga/main.c @@ -686,8 +686,7 @@ DWORD WINAPI service_ctrl_handler(DWORD ctrl, DWORD typ= e, LPVOID data, DWORD ret =3D NO_ERROR; GAService *service =3D &ga_state->service; =20 - switch (ctrl) - { + switch (ctrl) { case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_SHUTDOWN: quit_handler(SIGTERM); --=20 2.25.1 From nobody Mon Jun 17 15:27:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass(p=none dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1615951671; cv=pass; d=zohomail.com; s=zohoarc; b=HqTjvEzsGw3e7KYPiKZvfJaB2r1fOukbxSkFQSITze9UdlOAn//d7uNleaUOMiOPzRCguN+yCfdL39EfeO/87uedhNijbvQgrlAUWz09n+mtvDYeYuBmtlSt+bh8YsRslnlnM2E3GWDXZZ4bmDHbeAsNccfeZ/5cUs3wUU+0ylQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615951671; 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=2j7K2uII9kt9fbDXY5phqFNWi31+gNgB6t4dXN0Oabo=; b=gYeQ8BEv/t96e5Hb+DHQeg099XPgVqRvh9kFvDSVduVSS/kMOHSy/x0kLEWxPGZs1+bfsflI22Tt5oGx7inL7xcyTXivIBFBLymaUja+pkl1+n9EvMuyhUWPo0MONOjCtRAC037abKyF62QR1MsIf8GtRaAeDVBx31W6YynlBrk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615951671627734.6054456019889; Tue, 16 Mar 2021 20:27:51 -0700 (PDT) Received: from localhost ([::1]:47748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMMqc-000280-Jd for importer@patchew.org; Tue, 16 Mar 2021 23:27:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMMlp-0005Sf-DO for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:53 -0400 Received: from mail-eopbgr750053.outbound.protection.outlook.com ([40.107.75.53]:4470 helo=NAM02-BL2-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 1lMMln-00011A-GK for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:53 -0400 Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4954.namprd12.prod.outlook.com (2603:10b6:610:63::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Wed, 17 Mar 2021 03:22:49 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f%3]) with mapi id 15.20.3955.018; Wed, 17 Mar 2021 03:22:49 +0000 Received: from localhost (165.204.84.11) by BN0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:408:e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 03:22:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RvOykYVJMraVmM1xVrdnmzXoeeJLOZtkyAj/b/QkE3R11g+j8k3CnRKnG2vMvrYbjWJTPWFCC0ZZC/MycYmOEA+85uthCVF9q7ks+4wyTq33BT7y7a6XVjLhhGCfsvMfvgOyRzDj55X36W8U6R0cNY7BZ7fSBxJOC3wuToSYGualiFL/uX3Gx2VS9p5TQtMO1KoO0gNwsXLcbSLDDwKYTD33WNK7tP/iDcqNR9D6syNk9SVpvTeL360Y21gSexqHPzXho8w108e1uj7h95IuSHyXpkrL3rTbSBjHHN7AZivtRcbBhlkw7jtyusOikoKUwVIzeNdS5GHJj7XqlcYPYA== 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=2j7K2uII9kt9fbDXY5phqFNWi31+gNgB6t4dXN0Oabo=; b=WF1jzio/psTxwj05B3PxhTjTe8E4AayObsX3XxGqlWcqoR5KKRXFLhDOCOu2FcRYNPxGuB0iotp2Zb1NtBQT58crePh/tU6MjWxBCmDUUhm4aBhmOKkQF204Iu+AMMZ3SHuYdaD7U4ovwWzCW0tFRsrvDtJt3oXlisXVRVhcAlBEynbvMN6N3Iou5tB/Rwh7Ye7/6lnjteVdmu4+T/hw0QZ45jhSCMB+N45RyVK0CzyQuWxJa8wkVoRvOk85TGxXsgmuKsn1V2JsDfz66wX6FjjaWpy8c268x7jKV/9dywqM+4UBMRuUQ37DlS2V4YUY07UTrka+lyxmgWc84k8UhQ== 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=2j7K2uII9kt9fbDXY5phqFNWi31+gNgB6t4dXN0Oabo=; b=knoYHs33GI5EkVjh6pzKxNPGTlNr/bQaT73hiJvPn1yiOCeC9RFAQe6GB7/aoAxDhOJhB7iYhHEiwnw3kM+wffN3kcrOdJOiealfnzEf+oNwBcAaUCDM+jLSkbYDdKxP9DDBqX1+f/EolgkdELrqwSdAQbuFPv2kcUUUzqZguNo= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-6.0 5/6] qga: Switch and case should be at the same indent Date: Tue, 16 Mar 2021 22:22:16 -0500 Message-Id: <20210317032217.1460684-6-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317032217.1460684-1-michael.roth@amd.com> References: <20210317032217.1460684-1-michael.roth@amd.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [165.204.84.11] X-ClientProxiedBy: BN0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:408:e6::14) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 806d260f-8c01-4c60-9e62-08d8e8f3f12a X-MS-TrafficTypeDiagnostic: CH2PR12MB4954: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:262; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cgmNN3Wjcz1DQtBaxQyELBMSCOgTj9IcsKw7msVArhfBDELDF0ivfVDLcA8Q84k8bUY9EAwEo4476AW0TX/W2Kg82rW4e3Xdn2+eXjufOH8tPj7xJ4mofPwR+B3sUF1bgHksJXQcq928Ec+M0/fs3KpVpjG10UWkRe8qvBxqvWFF67HXeJBFrOj85tFH0EspuHEg1JakpwICDBTKidI4EY4wg3s7Pd1ClWDB7yc2rtYWWqIujLzldSjfPcisS01pNN9+X8mw5UvhnXDWk7zEJZggBmpOLNB/dlYiivrxeapaB0g24p3ZN+tQmxfMgiWRlw3ClW9aG/H/N54IIw/Iwuij7WR0jw/KSqsuaDfO7HD0Por266z0liAHg/v1TdhjMjGiaAs4RRdvO7yhJAOutZDrDMl4imZcZUO05KeGyCrguxIEM5wMkhEy04g9tp/Qk+iF/sgdJZPAvEsFUcwdlNbaykggJMZOj82DpnfgZQO3RCEof5iRm1TekNU7WElkKNekpIYWer+aF8zE9YeOnoNXwX9b037XoiKCu6UpyrmubIGyFwLxREgCgmOS0nyV 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)(376002)(136003)(39860400002)(346002)(366004)(186003)(8676002)(8936002)(4326008)(478600001)(316002)(26005)(66946007)(54906003)(83380400001)(1076003)(2616005)(66476007)(956004)(66556008)(86362001)(6916009)(36756003)(44832011)(6666004)(6486002)(52116002)(16526019)(6496006)(5660300002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?YUtqMGVFSC9SZzVLSXVYNUxiTW1jWnFveTBRRmZGNHE2dTVPWkFmK2drYmJF?= =?utf-8?B?NElEcjh4U05MZ3UwR1pnWFhTbXJPWllmUTU5VU9DYnlJaGtRZGl5M2ZCb0hO?= =?utf-8?B?aTBoSU00R1BIakJta2RZbTlYVkVzYTF4SGQvQnMyQ1FkQ1N3c01tMHU5OUUr?= =?utf-8?B?WXZyQUg2dHFSbnlrVy82bmUyWTh2MnRxdHNOYlpDRU5kTFlKMkRHdWRxY0M4?= =?utf-8?B?WGVSOUFiOElmM1hTbFVEVHgvallsQlM5dHdlT0hPaFhEVlEwZXh2Y0R1QTFP?= =?utf-8?B?QXdnd1hEalkreGpMQ3hIcXlMSFRCM0FoQzU0RGNyd1o2RU1BeENtMklpcXR3?= =?utf-8?B?SWFHTlViZkVMSFZ4SXlyL0NrQ1FlV3hLMU51SXlBc2NiZTl4K3VGMjVPcE5r?= =?utf-8?B?bFNHTmc4THliZmc5b0txNGIyM2VmcGNsWVdSbkZSczhKdlVtK3RQR24ySFdt?= =?utf-8?B?ZkdaZ1dLbnYxR3F3OHIvM2QzSmlabGs0ZmxScERHYzlOTXJ0Q1dnWDJBS2Qy?= =?utf-8?B?QXZKaUNlVExkTDNWdmpWWG5ISEpZSGpLZjlKcmJLRW8vcVBZR2RoenFqS3FO?= =?utf-8?B?S3pJenpoSlNDN21LZ290aGNWa3l2TUJyMzk3RHZDbllWQXBKNkFzaTJvK2E2?= =?utf-8?B?R01VdzhBSkN0SHZZYkxGV3MvdzBvbC9BWi9oN3FFREcwajRNUWlUdCtXR25r?= =?utf-8?B?VEZmTG5zRUxaaFJJWXh0bTZMVllwcElucXRCRjhQS2dtR2NOaGY5ZVRzanZy?= =?utf-8?B?R3c5T0hPaW5tWTVibTVOWncxc1I5aVFuU1I4ZFRJUzlrN3NVM2ZZZ3pPeVdP?= =?utf-8?B?Z0JEQmNwWGtrSzViMDREWTZkaUlJR1VzM0tCdFB0S002TEpaTjJGMXFFdCsx?= =?utf-8?B?LzMrTkZ1NXBBYmg5QTZSUFEvcWozZ3Y0OXlCSHRLWkhuOS9XVUxSRndkR29J?= =?utf-8?B?Q2IrKzFMZUIrdXBDZEFoSWtuRkFvNTVoOWF2cjNsd0d4aUVnb0N4cHBkL28w?= =?utf-8?B?QzM3OTRuVG0xMkc3MmN2eGZaQUxoZnpzQnUrTHFUczZPV0kwTG8vR1dZclhP?= =?utf-8?B?cE1DVVR6elB1Wjlmb0dxVlVTR0diOE1DUnF1RWFKUnV6QnRJcnc3QVVKeXJt?= =?utf-8?B?RlZsdnprWFVCVHp3MkU3b3NyWjF2Z0RNazVNeEtCS1ZXNDRHR1Z1Zmw5RVUy?= =?utf-8?B?V3RFQ2YwV05RcFdxZEhKWlUxSmo4LzdBdGVNUVZib215amNEREM2ZnlveGh0?= =?utf-8?B?dUNMeGhQOFp3UWVZanlSMGEyQjIyNHcxSFVDYnFxWGhyN0VkOGlXUERjUFdn?= =?utf-8?B?ZmIweHU3SEdzcldrMmROellxNFpMUDluOTlUL1U5ZVk2ODVXbDYxSHdIeDc2?= =?utf-8?B?ekEvTTRRTi9HNk50MmRkdTFLQ0VOZ3VTc0RUdmdFbDBpSEJEaFBYMk9naERF?= =?utf-8?B?cCtNNjB6OVVLZXkwaXZJNFF3anJsSXoxSHN3amdDbklkRDFaNXE4SjY4MnYr?= =?utf-8?B?V0tBRm9nTVowWmVqb1RkWkhiY2d1UlRwdFEyZG9NRUpSNzZJTFBDbmJVWUtL?= =?utf-8?B?ZFgzclZPSzJOUmlxTTBtYkRzV0lkdWdaODRGQllxTlY1cUpQdlpJdW5ZeU5Y?= =?utf-8?B?V2h5RDBWQm54MkQwSFRGSnlCVXJmVjArd3RGbW9KUmJ2ZUhZdlgyWTZWSjlr?= =?utf-8?B?VXNhOERxc3NUVldNWWxmKzQ2NFFDNUJLVys2eEZZMVdhYWxPdngvc21Xc3Vv?= =?utf-8?Q?v45GVB6xfEXwGqMlllmtENQGnCa8jSKdG1Esz9a?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 806d260f-8c01-4c60-9e62-08d8e8f3f12a X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 03:22:49.6054 (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: 9+Qi8n1e9ouswJgx+VvtAiJYiADhTCISflmSDaVmSVjPsOZ1fU6QNWirkZFBZk5mEXMMc7cXsUDa4SJVcXCS9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4954 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: softfail client-ip=40.107.75.53; envelope-from=Michael.Roth@amd.com; helo=NAM02-BL2-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: , Cc: AlexChen , peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Euler Robot Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @amd.com) From: AlexChen Reported-by: Euler Robot Signed-off-by: AlexChen Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Michael Roth --- qga/main.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/qga/main.c b/qga/main.c index 20db0058db..ebb910773b 100644 --- a/qga/main.c +++ b/qga/main.c @@ -279,20 +279,20 @@ QEMU_HELP_BOTTOM "\n" static const char *ga_log_level_str(GLogLevelFlags level) { switch (level & G_LOG_LEVEL_MASK) { - case G_LOG_LEVEL_ERROR: - return "error"; - case G_LOG_LEVEL_CRITICAL: - return "critical"; - case G_LOG_LEVEL_WARNING: - return "warning"; - case G_LOG_LEVEL_MESSAGE: - return "message"; - case G_LOG_LEVEL_INFO: - return "info"; - case G_LOG_LEVEL_DEBUG: - return "debug"; - default: - return "user"; + case G_LOG_LEVEL_ERROR: + return "error"; + case G_LOG_LEVEL_CRITICAL: + return "critical"; + case G_LOG_LEVEL_WARNING: + return "warning"; + case G_LOG_LEVEL_MESSAGE: + return "message"; + case G_LOG_LEVEL_INFO: + return "info"; + case G_LOG_LEVEL_DEBUG: + return "debug"; + default: + return "user"; } } =20 @@ -687,19 +687,19 @@ DWORD WINAPI service_ctrl_handler(DWORD ctrl, DWORD t= ype, LPVOID data, GAService *service =3D &ga_state->service; =20 switch (ctrl) { - case SERVICE_CONTROL_STOP: - case SERVICE_CONTROL_SHUTDOWN: - quit_handler(SIGTERM); - SetEvent(ga_state->wakeup_event); - service->status.dwCurrentState =3D SERVICE_STOP_PENDING; - SetServiceStatus(service->status_handle, &service->status); - break; - case SERVICE_CONTROL_DEVICEEVENT: - handle_serial_device_events(type, data); - break; + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + quit_handler(SIGTERM); + SetEvent(ga_state->wakeup_event); + service->status.dwCurrentState =3D SERVICE_STOP_PENDING; + SetServiceStatus(service->status_handle, &service->status); + break; + case SERVICE_CONTROL_DEVICEEVENT: + handle_serial_device_events(type, data); + break; =20 - default: - ret =3D ERROR_CALL_NOT_IMPLEMENTED; + default: + ret =3D ERROR_CALL_NOT_IMPLEMENTED; } return ret; } --=20 2.25.1 From nobody Mon Jun 17 15:27:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass(p=none dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1615951546; cv=pass; d=zohomail.com; s=zohoarc; b=cbyUKrKVgVnVzzIZIW7Yj0VcvfrGwSpBEetYMbEShpy8r2JP6lfAc7xsj0Yc7v4RBpWYgCk4byRehjjkkbgb57XpwH5zurpJXQlxiOI4y7hTc+whi3uOxHgWvpsmU+q6CBUz1crIGIO8BJ4rvZcZjq1wKYDpv/4v2Jo0Vy2SKCg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615951546; 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=spA27DX+d5tWv3ROrnId2PcQlTdRTuV2WvVHXoDWhb4=; b=LC4FV3rhIx3RrlFY6Ju7+pVYaxgoiChOT7JreSyuqIcdmu3G4h5Jk8gJ8ulYEvA9VJlpWP9qCou3BwExP/w1jw6mBstgBxbQ549OU0of3pygUt0JzCVTLBNNC9UryT28ChtcuBc7grtarJTaX5hkp54ujdKURi2bPiSIKwnMXDI= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161595154665219.655961900500074; Tue, 16 Mar 2021 20:25:46 -0700 (PDT) Received: from localhost ([::1]:43750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMMob-0000Kl-Kb for importer@patchew.org; Tue, 16 Mar 2021 23:25:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMMls-0005Z3-L4 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:56 -0400 Received: from mail-eopbgr750047.outbound.protection.outlook.com ([40.107.75.47]:20848 helo=NAM02-BL2-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 1lMMlq-00018F-Gm for qemu-devel@nongnu.org; Tue, 16 Mar 2021 23:22:56 -0400 Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4954.namprd12.prod.outlook.com (2603:10b6:610:63::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Wed, 17 Mar 2021 03:22:52 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::81f6:605c:f345:b99f%3]) with mapi id 15.20.3955.018; Wed, 17 Mar 2021 03:22:52 +0000 Received: from localhost (165.204.84.11) by BN8PR12CA0034.namprd12.prod.outlook.com (2603:10b6:408:60::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 03:22:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bgO/B0W9i6vCnA7RDylNwR9+UiO2vWEBS0zIF+HP2fsXjPuJ0yygpWz6ENf7PP5qfw3cjAvLeAFxtbBla4AHcEOKgbE6nfTVSnpgMtvGqcEQPMQwvs1YUMg0gOvODW0jDT4fIJ2Pr/CYT9t2KAAEWCHuF7FK3AYj0M5yXvmTuZhvadvCa/OACJQsczV+Tu756l1gc+qq5lR6k0ClcDhKr1ix3IDvKoYL/pJq32kqTAfIzynhmBgsGSHvbO7oXAEWoGDcuaIEBqFQABOIW+gV/uVWB6PkRvQWqjVNuacGdQFQgr0Wl0EfnxuDaiOJOskcJhD0uuESJvB7c2Y3i08waw== 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=spA27DX+d5tWv3ROrnId2PcQlTdRTuV2WvVHXoDWhb4=; b=Sza+H/UVDc49aMZMFh3UbOXJaiwMhw83OysksVFMR+3mWmYQnDh4IBDkCZhlSgt6E4RyVlhZZxUDe9Bl6gwvN5gL537js50mV0RrISVI9Xgs8e7/F2GX4f5PW0drClvOW/D0CEg+gSROOsrHBg0Sh9Dp0xQpHG2lJYWewhPqa2b+sDuZPr+N2LAsJ68/U+Lx2Wu6VuA57mHNFK9/NXBwYHCRg9a+X6IV3y0SIOg7Fn1cFn3GD9pA8So435wzta9RTb8NCS2cy7rqZ/2LaPHZPQ4rc24FDh1MU32cYL36ISBqddtlJlxXF4TqTzIRxFfKb4b5pBhOWK3uuhabicgMNA== 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=spA27DX+d5tWv3ROrnId2PcQlTdRTuV2WvVHXoDWhb4=; b=0BfGQWKjuiculbgw2Nv/L0YdOtAdnqX6fhnr93ko9b2r+BmySHuAMPVA40qanWVUMGOXx1mb9TgtbtOKwrqaRQxn4Fro7iEu0CDG0kDa/2QPg2llWCF5UOQQH1d8GetiBttuCmW9v9v+D7yaJzzEWeerqL3Is+iaSmZZHG7gFhE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL for-6.0 6/6] qga: return a more explicit error on why a command is disabled Date: Tue, 16 Mar 2021 22:22:17 -0500 Message-Id: <20210317032217.1460684-7-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317032217.1460684-1-michael.roth@amd.com> References: <20210317032217.1460684-1-michael.roth@amd.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [165.204.84.11] X-ClientProxiedBy: BN8PR12CA0034.namprd12.prod.outlook.com (2603:10b6:408:60::47) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: fa90391e-2157-4f11-1784-08d8e8f3f30f X-MS-TrafficTypeDiagnostic: CH2PR12MB4954: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:639; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YL8glQLUy4HrYsUJhkqix67BTciUjeOnjHeOJOgZrtmBK0uEyWAjJ4s1Q8M/PB+P/V2GwzIdzLTVJy4zkz5cxP3bO67szyf47Jds326XJ63VgXlpUEoZBIwYWrGFZICZtO6V1bpi3jC0hHxxVGLJAJNo++YvwqYdTp4IWpORpc4vL7lCczWBbh63oGCF7BQ5A8iLO/EFhb9GnVDCM7eKEAQ6MklWDGjJJscKvUfU67mJSGvgnxnUlBDvKfhgaoVmBIpSxnWO52v8EvKOJV+8ZhK8CgV585OXKabLF9LFPfezjdsKUSs4mNqOP5mUceZ85XoSkT+RVasJ4zUryvSVPiF1MYGr6scP6wrufSVLnWQ/iFe0Ln+YdDip/vFymkNTJvGBGSFeeMe6IkbSxdPqUdcqTcTl9zNZBeXzodO3cnAyAgM7iW0JCb+YMTN3rG1a/26rjKM2HOinXI3DzHxct9bfq3tSRmiIbF+dgeHNLacPu6ItVH+0t/WHfZRaGoTyxW+Qa6sP1DInFjspN55ZG/EDRGVzSpvNl1nAIzE0eQ27ruHYrSkkcKrpzBCqEjmtTP0pJZHwGY9G64EwGPTUlKD2TtWKTRPCF0MGoOdj1ZhqDPVMfemZFD1mi+oHTwlGNO1MoglIx/Zk1P7GXzRqIw== 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)(376002)(136003)(39860400002)(346002)(366004)(186003)(8676002)(8936002)(4326008)(478600001)(316002)(26005)(966005)(66946007)(83380400001)(1076003)(2616005)(66476007)(956004)(66556008)(86362001)(6916009)(36756003)(44832011)(6666004)(6486002)(52116002)(16526019)(6496006)(5660300002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?RWk0MVB4aTlQbzlZdnVQZ0JtYTZXYTdNcE1XVG5obDdxVmZxOVRscThZUEIy?= =?utf-8?B?ZEVvUFBUUVNHckhXK0NlcWkwNnIxTUFhN2h6eWNHVE1JdWRDd3grVTJOeVNs?= =?utf-8?B?T3Q3NWd3ZVQ2RmpEeVZpVGVyeVVRUXdGWmRMVitsL214YkFHTlRsNWUxWWlx?= =?utf-8?B?QlJ1R1RSZWlWNzBXa1NPYk52RUNCVWQ2Y1hGLzJXRGVsaTFPdEJWaUxXWUVo?= =?utf-8?B?ZVBWN3lUQm5idnlSQ0Z5aytIUExMU1kzQ3RzOHRwQnlBUTlWaGhPNnhseTEr?= =?utf-8?B?NE56dDZjdTlLWXE5a3VGMkhHMGk2SEY4VHZKWHJNRGNKdEY5RlR6djlvbnNL?= =?utf-8?B?c1dYa0RhS3kvVlNNcVJlSGhKaEZTMUc0RG1DL2diWC9TWTBOL0p6SW9zTXJE?= =?utf-8?B?bEdBSTg4SGRhMzJ2SHdHMUNZbEJlVGVFc0huSks1UXBaZlowbmMyYnJyOUgx?= =?utf-8?B?YWhUSW9CNWMrVFJQNTdHZ3JsQWtaWXFnSGdmS2lUUUVTMXA5cjhlUS9uSnJE?= =?utf-8?B?aVJBUmhoeDFPT3Q5cHhYcnVwVE9nQStQeTB0YmpOTDltdURucVRYZzVlZzhl?= =?utf-8?B?MWJpWXBGelp4SmJZaGxkL3ZMell5OENhbUFsVGcyejFiUUU3cGJJczVmNTBt?= =?utf-8?B?SXZDMUhUTmZIbmQvWTRFeVZLQmNUbDF0RE13VEh2cm1KYVBYdEIwbUZwbzNl?= =?utf-8?B?RS9Zc3R4Z01LQmR4VVlkQ1M3R2c3RkswVmVyTnIzdWtnRWNYWndBNDQ1cmQ1?= =?utf-8?B?MjBjSjNwYThGcjI1WmpOck53cE0xRzNLUWtieTZRdUtJelRKZzIrYW5pZG5F?= =?utf-8?B?TXVCUWVqaFpBL0l2c3o3SDVGUnYvYjA3MmN1UGpkUWFMSlhTVGswQ1FDaVNB?= =?utf-8?B?aXV1MldENVpJa21TZDVaME54OHpTUDJqVnBTWVJxRStqaUErS2U1ZHZmODUx?= =?utf-8?B?c3U2UWowZUZXNkxsWFZ3N0xJeDJ2bFN2T3FWaVNZaWl2b0VNVUpxcm41K3Zs?= =?utf-8?B?MXlpNm0vcnl4UUpzVm9DNjhjU3FVZUpBVzM5WlZLdUJrVk14T1kvRHFvSTUr?= =?utf-8?B?QUpyRWtPTFhmeXRwSkVhQy9yTkhQWTJ5QlhhQUw5UXFSUGxJWGg0K29RZFp6?= =?utf-8?B?S0RvR1ZDQXZ6SVdiMVdqZThtMDFXS0RrR0FSdnAwWGo4b0pYeG1MTVBTZjJs?= =?utf-8?B?a0pyNGxhVDZYeVNPNVV3ZDhxWGJOd1lJZHBtcmt5MDBuZys4eUMxMER0dC9P?= =?utf-8?B?dll5TFV2S21ERmVGV2VsajY4c3A0NGtmcFUxRS83ckdHMGZyMVBqVUNTa1RJ?= =?utf-8?B?WU5xNmYxNWhXU2dNTE5JZk0yTiswUXo2Y29mKzgxQU9OczN6ZHJTTjRpQTJL?= =?utf-8?B?c0JUSlRwRlVxZDhhZ3JDWk9RTFo1UmkxeDJScCtOZjRzaWtUbVIzcjl4U1h2?= =?utf-8?B?a2x1L204ZEFxK3ovTUFFMzVXb0h5eE1vc2ZkVlpSUWw3WFJwYXc1L3h5dXJ6?= =?utf-8?B?WG9lby8yLzgvSkVuYjJnaXliaUNjekxuajF6di9DUXhtVGsrNm1ZUHlHbnF5?= =?utf-8?B?U28rK2J0QURMd2JMYTFybEJFTEUzZkZnaHI2SVZGVXRGRlp3M0tRL0Iyb2JM?= =?utf-8?B?L3pXanMwZkhTSXNrSGpsY3NsZW1RNWkxUjRaWmJldlRKcFI1d2ltT2UyWEVX?= =?utf-8?B?VWc5d0tCemw3dHA0WUdaR1ZWSXgwSE9lZ0d6djM4aExoUUVUU3JPM3lnY1hv?= =?utf-8?Q?YbmOAax+2xdmQx9L/l6mr7wRSFJ/HsENgSpBVFW?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa90391e-2157-4f11-1784-08d8e8f3f30f X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 03:22:52.7316 (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: r5PmDxEnhMcF5oKGHUG7dnmGfkelk32YHSRrvCLZBk/C4aYhBzZ4k694mIJ0ta56yPbkDVlNv5KSdUG/Jz5oDw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4954 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: softfail client-ip=40.107.75.47; envelope-from=Michael.Roth@amd.com; helo=NAM02-BL2-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: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @amd.com) From: Marc-Andr=C3=A9 Lureau qmp_disable_command() now takes an optional error string to return a more explicit error message. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1928806 Signed-off-by: Marc-Andr=C3=A9 Lureau *fix up 80+ char line Signed-off-by: Michael Roth --- include/qapi/qmp/dispatch.h | 4 +++- qapi/qmp-dispatch.c | 6 ++++-- qapi/qmp-registry.c | 10 ++++++---- qga/main.c | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h index 1486cac3ef..135dfdef71 100644 --- a/include/qapi/qmp/dispatch.h +++ b/include/qapi/qmp/dispatch.h @@ -36,6 +36,7 @@ typedef struct QmpCommand QmpCommandOptions options; QTAILQ_ENTRY(QmpCommand) node; bool enabled; + const char *disable_reason; } QmpCommand; =20 typedef QTAILQ_HEAD(QmpCommandList, QmpCommand) QmpCommandList; @@ -44,7 +45,8 @@ void qmp_register_command(QmpCommandList *cmds, const cha= r *name, QmpCommandFunc *fn, QmpCommandOptions options); const QmpCommand *qmp_find_command(const QmpCommandList *cmds, const char *name); -void qmp_disable_command(QmpCommandList *cmds, const char *name); +void qmp_disable_command(QmpCommandList *cmds, const char *name, + const char *err_msg); void qmp_enable_command(QmpCommandList *cmds, const char *name); =20 bool qmp_command_is_enabled(const QmpCommand *cmd); diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 0a2b20a4e4..5e597c76f7 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -157,8 +157,10 @@ QDict *qmp_dispatch(const QmpCommandList *cmds, QObjec= t *request, } if (!cmd->enabled) { error_set(&err, ERROR_CLASS_COMMAND_NOT_FOUND, - "The command %s has been disabled for this instance", - command); + "Command %s has been disabled%s%s", + command, + cmd->disable_reason ? ": " : "", + cmd->disable_reason ?: ""); goto out; } if (oob && !(cmd->options & QCO_ALLOW_OOB)) { diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c index 58c65b5052..f78c064aae 100644 --- a/qapi/qmp-registry.c +++ b/qapi/qmp-registry.c @@ -43,26 +43,28 @@ const QmpCommand *qmp_find_command(const QmpCommandList= *cmds, const char *name) } =20 static void qmp_toggle_command(QmpCommandList *cmds, const char *name, - bool enabled) + bool enabled, const char *disable_reason) { QmpCommand *cmd; =20 QTAILQ_FOREACH(cmd, cmds, node) { if (strcmp(cmd->name, name) =3D=3D 0) { cmd->enabled =3D enabled; + cmd->disable_reason =3D disable_reason; return; } } } =20 -void qmp_disable_command(QmpCommandList *cmds, const char *name) +void qmp_disable_command(QmpCommandList *cmds, const char *name, + const char *disable_reason) { - qmp_toggle_command(cmds, name, false); + qmp_toggle_command(cmds, name, false, disable_reason); } =20 void qmp_enable_command(QmpCommandList *cmds, const char *name) { - qmp_toggle_command(cmds, name, true); + qmp_toggle_command(cmds, name, true, NULL); } =20 bool qmp_command_is_enabled(const QmpCommand *cmd) diff --git a/qga/main.c b/qga/main.c index ebb910773b..15fd3a4149 100644 --- a/qga/main.c +++ b/qga/main.c @@ -375,7 +375,7 @@ static void ga_disable_non_whitelisted(const QmpCommand= *cmd, void *opaque) } if (!whitelisted) { g_debug("disabling command: %s", name); - qmp_disable_command(&ga_commands, name); + qmp_disable_command(&ga_commands, name, "the agent is in frozen st= ate"); } } =20 @@ -1328,7 +1328,7 @@ static GAState *initialize_agent(GAConfig *config, in= t socket_activation) s->blacklist =3D config->blacklist; do { g_debug("disabling command: %s", (char *)l->data); - qmp_disable_command(&ga_commands, l->data); + qmp_disable_command(&ga_commands, l->data, NULL); l =3D g_list_next(l); } while (l); } --=20 2.25.1