From nobody Wed May 14 23:52:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1517931125134273.93913062435763; Tue, 6 Feb 2018 07:32:05 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 45F408762E; Tue, 6 Feb 2018 15:32:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0AA3F2D35B; Tue, 6 Feb 2018 15:32:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9E9904A46E; Tue, 6 Feb 2018 15:32:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w16FW1x0022895 for ; Tue, 6 Feb 2018 10:32:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id ADE165C2E5; Tue, 6 Feb 2018 15:32:00 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FCD4609C0; Tue, 6 Feb 2018 15:31:52 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 6 Feb 2018 16:30:53 +0100 Message-Id: <4a718a204ad2d0b97f90b40e21006b7fcd7da9c3.1517930985.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 2/4] qemu: Remove unused 'cpuhalted' argument from qemuDomainHelperGetVcpus X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 06 Feb 2018 15:32:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The halted state is no longer extracted using this helper so the argument can be removed. --- src/qemu/qemu_driver.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 172a8a3f73..eaa6049fee 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1490,8 +1490,7 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, unsigned long long *cpuwait, int maxinfo, unsigned char *cpumaps, - int maplen, - bool *cpuhalted) + int maplen) { size_t ncpuinfo =3D 0; size_t i; @@ -1511,9 +1510,6 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, if (cpumaps) memset(cpumaps, 0, sizeof(*cpumaps) * maxinfo); - if (cpuhalted) - memset(cpuhalted, 0, sizeof(*cpuhalted) * maxinfo); - for (i =3D 0; i < virDomainDefGetVcpusMax(vm->def) && ncpuinfo < maxin= fo; i++) { virDomainVcpuDefPtr vcpu =3D virDomainDefGetVcpu(vm->def, i); pid_t vcpupid =3D qemuDomainGetVcpuPid(vm, i); @@ -1551,9 +1547,6 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, return -1; } - if (cpuhalted) - cpuhalted[ncpuinfo] =3D qemuDomainGetVcpuHalted(vm, ncpuinfo); - ncpuinfo++; } @@ -5461,8 +5454,7 @@ qemuDomainGetVcpus(virDomainPtr dom, goto cleanup; } - ret =3D qemuDomainHelperGetVcpus(vm, info, NULL, maxinfo, cpumaps, map= len, - NULL); + ret =3D qemuDomainHelperGetVcpus(vm, info, NULL, maxinfo, cpumaps, map= len); cleanup: virDomainObjEndAPI(&vm); @@ -19700,7 +19692,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait, virDomainDefGetVcpus(dom->def), - NULL, 0, NULL) < 0) { + NULL, 0) < 0) { virResetLastError(); ret =3D 0; /* it's ok to be silent and go ahead */ goto cleanup; --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list