From nobody Tue Sep 9 03:16:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1738081798770899.6164970570045; Tue, 28 Jan 2025 08:29:58 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 24A7917DA; Tue, 28 Jan 2025 11:29:58 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BDAD11808; Tue, 28 Jan 2025 11:28:36 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3FD8917E5; Tue, 28 Jan 2025 11:28:30 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id BABCD1799 for ; Tue, 28 Jan 2025 11:28:29 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-0du8yug9OXOUFgKxqy9iEw-1; Tue, 28 Jan 2025 11:28:27 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 575301800373 for ; Tue, 28 Jan 2025 16:28:26 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.2]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8791919560AA for ; Tue, 28 Jan 2025 16:28:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738081709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cUP/ujkfPLGr7OovqejREa7ixRKeeSL5Hj53w/2Yd/U=; b=FWXXnpDl8dGyRlO7V8CseIKiF4mQ2GrCSkRJNtZcU7INRKawge7pzuMGV2haCrAmzY58M8 Fay3gAMusbuGYStLhgL5+UlqvtJByK0jhC9IPU6K0nGz7jcUmbHxrpTLzbECBgjY3lAs/0 /Yy+n6mP9jfhLffblHc/At9N8kCHawg= X-MC-Unique: 0du8yug9OXOUFgKxqy9iEw-1 X-Mimecast-MFC-AGG-ID: 0du8yug9OXOUFgKxqy9iEw From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH v2 03/15] qemuProcessHandleIOError: Rename local variables Date: Tue, 28 Jan 2025 17:28:07 +0100 Message-ID: <877753789dbf9b7a90d14b2fa81e631f4df30499.1738081457.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: tQ-h9OoQPQ5357B45_eryV_Od2PERgsRrh9R6Lt1Cv4_1738081706 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6JTSIEDFI6RLUVJ67QJVVK554FNDI2NP X-Message-ID-Hash: 6JTSIEDFI6RLUVJ67QJVVK554FNDI2NP X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1738081800047019000 Content-Type: text/plain; charset="utf-8" Prefix the helper variables used to supply data to the event by 'event'. Declare them with the default value of an empty string rather than doing it later. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_process.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c2a5361b79..aaf718e552 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -833,8 +833,8 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, virObjectEvent *ioErrorEvent =3D NULL; virObjectEvent *ioErrorEvent2 =3D NULL; virObjectEvent *lifecycleEvent =3D NULL; - const char *srcPath; - const char *devAlias; + const char *eventPath =3D ""; + const char *eventAlias =3D ""; virDomainDiskDef *disk; virObjectLock(vm); @@ -848,15 +848,12 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUS= ED, disk =3D NULL; if (disk) { - srcPath =3D virDomainDiskGetSource(disk); - devAlias =3D disk->info.alias; - } else { - srcPath =3D ""; - devAlias =3D ""; + eventPath =3D virDomainDiskGetSource(disk); + eventAlias =3D disk->info.alias; } - ioErrorEvent =3D virDomainEventIOErrorNewFromObj(vm, srcPath, devAlias= , action); - ioErrorEvent2 =3D virDomainEventIOErrorReasonNewFromObj(vm, srcPath, d= evAlias, action, reason); + ioErrorEvent =3D virDomainEventIOErrorNewFromObj(vm, eventPath, eventA= lias, action); + ioErrorEvent2 =3D virDomainEventIOErrorReasonNewFromObj(vm, eventPath,= eventAlias, action, reason); if (action =3D=3D VIR_DOMAIN_EVENT_IO_ERROR_PAUSE && virDomainObjGetState(vm, NULL) =3D=3D VIR_DOMAIN_RUNNING) { --=20 2.48.1