From nobody Wed Feb 11 10:04:34 2026 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1490382334756418.68142440242093; Fri, 24 Mar 2017 12:05:34 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C59C81C13C0; Fri, 24 Mar 2017 19:05:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7821D7E570; Fri, 24 Mar 2017 19:05:33 +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 E44C65EC6C; Fri, 24 Mar 2017 19:05:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2OJ0g4H019344 for ; Fri, 24 Mar 2017 15:00:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id D59A77D569; Fri, 24 Mar 2017 19:00:42 +0000 (UTC) Received: from caroline.brq.redhat.com (dhcp129-198.brq.redhat.com [10.34.129.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DD1619630 for ; Fri, 24 Mar 2017 19:00:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C59C81C13C0 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C59C81C13C0 From: Martin Kletzander To: libvir-list@redhat.com Date: Fri, 24 Mar 2017 20:00:07 +0100 Message-Id: <4f03165698364d62dec2d6e9e7c10f94b0926882.1490381160.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 19/23] Change virQEMUCapsInitPages to virCapabilitiesInitPages 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 24 Mar 2017 19:05:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This way more drivers can utilize the functionality without copying the code. And we can therefore test it in one place for all of them. Signed-off-by: Martin Kletzander --- src/conf/capabilities.c | 22 ++++++++++++++++++++++ src/conf/capabilities.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 25 +------------------------ 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index d798d5364cc2..08907aced1b9 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1413,3 +1413,25 @@ virCapabilitiesInitNUMA(virCapsPtr caps) VIR_FREE(pageinfo); return ret; } + +int +virCapabilitiesInitPages(virCapsPtr caps) +{ + int ret =3D -1; + unsigned int *pages_size =3D NULL; + size_t npages; + + if (virNumaGetPages(-1 /* Magic constant for overall info */, + &pages_size, NULL, NULL, &npages) < 0) + goto cleanup; + + caps->host.pagesSize =3D pages_size; + pages_size =3D NULL; + caps->host.nPagesSize =3D npages; + npages =3D 0; + + ret =3D 0; + cleanup: + VIR_FREE(pages_size); + return ret; +} diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 3cb305b50b4a..d10eef3afdea 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -299,6 +299,8 @@ virBitmapPtr virCapabilitiesGetCpusForNodemask(virCapsP= tr caps, int virCapabilitiesGetNodeInfo(virNodeInfoPtr nodeinfo); +int virCapabilitiesInitPages(virCapsPtr caps); + int virCapabilitiesInitNUMA(virCapsPtr caps); #endif /* __VIR_CAPABILITIES_H */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0d3a68a92b87..00ab8b9dfe63 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -60,6 +60,7 @@ virCapabilitiesGetCpusForNodemask; virCapabilitiesGetNodeInfo; virCapabilitiesHostSecModelAddBaseLabel; virCapabilitiesInitNUMA; +virCapabilitiesInitPages; virCapabilitiesNew; virCapabilitiesSetHostCPU; virCapabilitiesSetNetPrefix; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7dafbbc61524..26de4de92756 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1084,29 +1084,6 @@ virQEMUCapsProbeHostCPUForEmulator(virCapsPtr caps, } -static int -virQEMUCapsInitPages(virCapsPtr caps) -{ - int ret =3D -1; - unsigned int *pages_size =3D NULL; - size_t npages; - - if (virNumaGetPages(-1 /* Magic constant for overall info */, - &pages_size, NULL, NULL, &npages) < 0) - goto cleanup; - - caps->host.pagesSize =3D pages_size; - pages_size =3D NULL; - caps->host.nPagesSize =3D npages; - npages =3D 0; - - ret =3D 0; - cleanup: - VIR_FREE(pages_size); - return ret; -} - - virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache) { virCapsPtr caps; @@ -1134,7 +1111,7 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache) VIR_WARN("Failed to get host power management capabilities"); /* Add huge pages info */ - if (virQEMUCapsInitPages(caps) < 0) + if (virCapabilitiesInitPages(caps) < 0) VIR_WARN("Failed to get pages info"); /* Add domain migration transport URIs */ --=20 2.12.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list