From nobody Mon Sep 16 18:58:33 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1721989638; cv=none; d=zohomail.com; s=zohoarc; b=n1u8qq12CZZKvBtwoPV8JVRbDTqCEazURuSTfBzNutcy2Q3f7uHdyJSme3oCBsZBclWn9Gqo22LJuyp+XlCg2sAvRgKpfJTMvP0PXc0S3Nnx8uQ5KWpOqykqdH3wR9r22wZG/MPxZuyxK2i1g3tu3DXFZxEfhxan6rdA7S8p/+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721989638; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yd17BNDq1NDRiip7e6dtOU7Eu40rr67wNTmomDJc3GQ=; b=bIEQPlGvGh76JXTKtkY8OGLWt1ROUjdD84ZK8Y1+VElKDxGRRorAT1IWjAaKE17pJ0dGvJkCAVDP6Mj4ZoXwOYV6npv74aLD9MeCONlWiho+aZiLlPfkdw8cWUcJi/+hoL40olerxR9qmmN+1/+SOxkONvAd6SP0fKBlpz9GuoU= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1721989638621795.2399201236261; Fri, 26 Jul 2024 03:27:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXI9z-0004xr-1f; Fri, 26 Jul 2024 06:26:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sXI9x-0004t6-Oq for qemu-devel@nongnu.org; Fri, 26 Jul 2024 06:26:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sXI9w-0002zb-Ds for qemu-devel@nongnu.org; Fri, 26 Jul 2024 06:26:49 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-227-wtY2EAQJMyyFBK2l31lrcA-1; Fri, 26 Jul 2024 06:26:45 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 11BCE1944A94 for ; Fri, 26 Jul 2024 10:26:44 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.208.15]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 97F871955F2E; Fri, 26 Jul 2024 10:26:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721989607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yd17BNDq1NDRiip7e6dtOU7Eu40rr67wNTmomDJc3GQ=; b=P63Gz4e2EbEphEs2FJPHUy3dS7jdT1mDqrkXXWfXCGaUGuv/pCHerAEGpsmBYbjZF/29Vu KZrb2a99aow+gdO5RuEiCqckZ3T5+zlaeXvpnIrzJPfa3N2dTx5/6v/jH1SHNUrCkjgnqe HRL+2bm0kXPu+hB/igWTUbTheKgeTMs= X-MC-Unique: wtY2EAQJMyyFBK2l31lrcA-1 From: Anthony Harivel To: pbonzini@redhat.com Cc: qemu-devel@nongnu.org, Anthony Harivel Subject: [PATCH 1/2] target/i386: Fix typo that assign same value twice Date: Fri, 26 Jul 2024 12:26:31 +0200 Message-ID: <20240726102632.1324432-2-aharivel@redhat.com> In-Reply-To: <20240726102632.1324432-1-aharivel@redhat.com> References: <20240726102632.1324432-1-aharivel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=aharivel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.144, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1721989640096116600 Content-Type: text/plain; charset="utf-8" Should fix: CID 1558553 Signed-off-by: Anthony Harivel --- target/i386/kvm/kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index b4aab9a410b5..31f149c9902c 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2694,8 +2694,8 @@ static void *kvm_msr_energy_thread(void *data) =20 while (true) { /* Get all qemu threads id */ - g_autofree pid_t *thread_ids =3D - thread_ids =3D vmsr_get_thread_ids(vmsr->pid, &num_threads); + g_autofree pid_t *thread_ids + =3D vmsr_get_thread_ids(vmsr->pid, &num_threads); =20 if (thread_ids =3D=3D NULL) { goto clean; --=20 2.45.2 From nobody Mon Sep 16 18:58:33 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1721989646; cv=none; d=zohomail.com; s=zohoarc; b=V0ihAC9CX0SkUToFv8dDhakfDwEV8vdgq9heWLr1SRevSzx8+KLQRMFQpr6Ko9ppyPjfrOfYQR36JaQR6IbFO8cqjeVdcINQQwoel4Us7mB5UbiJK/yTVlgM3MBxbPXLLo1W7fZMr+dM9oEOz4GKr1dsx24h78YGTECvycJkHwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721989646; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jTtG5rF+133Rl4upwhryPbqEnaoY3xhSO1uldM+GCd4=; b=Jfk5acFIS8JKnYvp8kN8zow29Z8OZwSlRmK/TV88Fwm6m4DL8107wriGFiz9ByfZLIwkcba6IDaLU9k3wAEfP6yPSuXMONRPxhB6NUMl7dSOiGzxvuUdZMUSR9GsYSsnzO329TTywS8slhItW7+8GhyW9lR/2v+fIoFlXQxAtt4= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1721989646121159.57839264725726; Fri, 26 Jul 2024 03:27:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sXIA5-00057b-Dq; Fri, 26 Jul 2024 06:26:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sXIA1-00055q-3r for qemu-devel@nongnu.org; Fri, 26 Jul 2024 06:26:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sXI9z-00030P-MT for qemu-devel@nongnu.org; Fri, 26 Jul 2024 06:26:52 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-381-oXXP9o2KN9iqlEYa341nkg-1; Fri, 26 Jul 2024 06:26:48 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9754E1944B2B for ; Fri, 26 Jul 2024 10:26:46 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.208.15]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 42E201955F23; Fri, 26 Jul 2024 10:26:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721989610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jTtG5rF+133Rl4upwhryPbqEnaoY3xhSO1uldM+GCd4=; b=J+MeluHe1kHZjerAgvo+iix6L5wnEZy5XVMFq2hy7Xs4++1VDiGAL8P8apjhAk+pjLgxjo DbCm96le2JRT5M/JgO7jd1aiZ5CGItxbzzX4se+96b8NTnmkYtWjE2SfeZu03MQRGVsX78 hJ3cte4+w5N2zSD07Fgqx9TfMe8uByE= X-MC-Unique: oXXP9o2KN9iqlEYa341nkg-1 From: Anthony Harivel To: pbonzini@redhat.com Cc: qemu-devel@nongnu.org, Anthony Harivel Subject: [PATCH 2/2] target/i386: Clean output of vmsr_read_thread_stat() Date: Fri, 26 Jul 2024 12:26:32 +0200 Message-ID: <20240726102632.1324432-3-aharivel@redhat.com> In-Reply-To: <20240726102632.1324432-1-aharivel@redhat.com> References: <20240726102632.1324432-1-aharivel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=aharivel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.144, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1721989648081116600 Content-Type: text/plain; charset="utf-8" Fix leaking memory of file handle in case of error Erase unused "pid =3D -1" Add clearer error_report Should fix: CID 1558557 Signed-off-by: Anthony Harivel --- target/i386/kvm/vmsr_energy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/i386/kvm/vmsr_energy.c b/target/i386/kvm/vmsr_energy.c index a1d78f2f2aee..7e064c5aef30 100644 --- a/target/i386/kvm/vmsr_energy.c +++ b/target/i386/kvm/vmsr_energy.c @@ -270,7 +270,7 @@ void vmsr_read_thread_stat(pid_t pid, =20 FILE *file =3D fopen(path, "r"); if (file =3D=3D NULL) { - pid =3D -1; + error_report("Error opening %s", path_name); return; } =20 @@ -279,7 +279,8 @@ void vmsr_read_thread_stat(pid_t pid, " %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %*u %*u %u", utime, stime, cpu_id) !=3D 3) { - pid =3D -1; + fclose(file); + error_report("Error fscanf did not report the right amount of item= s"); return; } =20 --=20 2.45.2