From nobody Sun Feb 8 03:57:59 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.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 1531747486423701.7985910348841; Mon, 16 Jul 2018 06:24:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D752308625E; Mon, 16 Jul 2018 13:24:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C88B7CA5F5; Mon, 16 Jul 2018 13:24:44 +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 7C8501853DA0; Mon, 16 Jul 2018 13:24:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6GDOWTc027998 for ; Mon, 16 Jul 2018 09:24:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id AF9172026D76; Mon, 16 Jul 2018 13:24:32 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3231E2026D65; Mon, 16 Jul 2018 13:24:32 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Jul 2018 14:23:52 +0100 Message-Id: <20180716132423.10354-7-berrange@redhat.com> In-Reply-To: <20180716132423.10354-1-berrange@redhat.com> References: <20180716132423.10354-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [go PATCH 06/37] connect: move wrapper functions out of compat header 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 16 Jul 2018 13:24:45 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- connect_compat.go | 206 --------------------------------------------- connect_compat.h | 81 ------------------ connect_wrapper.go | 172 +++++++++++++++++++++++++++++++++++++ connect_wrapper.h | 75 +++++++++++++++++ 4 files changed, 247 insertions(+), 287 deletions(-) delete mode 100644 connect_compat.go diff --git a/connect_compat.go b/connect_compat.go deleted file mode 100644 index 1ecbef2..0000000 --- a/connect_compat.go +++ /dev/null @@ -1,206 +0,0 @@ -/* - * This file is part of the libvirt-go project - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL= THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - * - * Copyright (c) 2013 Alex Zorin - * Copyright (C) 2016 Red Hat, Inc. - * - */ - -package libvirt - -/* -#cgo pkg-config: libvirt -#include -#include -#include "connect_compat.h" - -int virNodeGetFreePagesWrapper(virConnectPtr conn, - unsigned int npages, - unsigned int *pages, - int startcell, - unsigned int cellcount, - unsigned long long *counts, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 1002006 - assert(0); // Caller should have checked version -#else - return virNodeGetFreePages(conn, npages, pages, startcell, cellcount, = counts, flags); -#endif -} - -char * virConnectGetDomainCapabilitiesWrapper(virConnectPtr conn, - const char *emulatorbin, - const char *arch, - const char *machine, - const char *virttype, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 1002007 - assert(0); // Caller should have checked version -#else - return virConnectGetDomainCapabilities(conn, emulatorbin, arch, machin= e, virttype, flags); -#endif -} - -int virConnectGetAllDomainStatsWrapper(virConnectPtr conn, - unsigned int stats, - virDomainStatsRecordPtr **retStats, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 1002008 - assert(0); // Caller should have checked version -#else - return virConnectGetAllDomainStats(conn, stats, retStats, flags); -#endif -} - -int virDomainListGetStatsWrapper(virDomainPtr *doms, - unsigned int stats, - virDomainStatsRecordPtr **retStats, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 1002008 - assert(0); // Caller should have checked version -#else - return virDomainListGetStats(doms, stats, retStats, flags); -#endif -} - -void virDomainStatsRecordListFreeWrapper(virDomainStatsRecordPtr *stats) -{ -} - -int virNodeAllocPagesWrapper(virConnectPtr conn, - unsigned int npages, - unsigned int *pageSizes, - unsigned long long *pageCounts, - int startCell, - unsigned int cellCount, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 1002009 - assert(0); // Caller should have checked version -#else - return virNodeAllocPages(conn, npages, pageSizes, pageCounts, startCel= l, cellCount, flags); -#endif -} - - -virDomainPtr virDomainDefineXMLFlagsWrapper(virConnectPtr conn, - const char *xml, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 1002012 - assert(0); // Caller should have checked version -#else - return virDomainDefineXMLFlags(conn, xml, flags); -#endif -} - -virStoragePoolPtr virStoragePoolLookupByTargetPathWrapper(virConnectPtr co= nn, - const char *path) -{ -#if LIBVIR_VERSION_NUMBER < 4001000 - assert(0); // Caller should have checked version -#else - return virStoragePoolLookupByTargetPath(conn, path); -#endif -} - -char *virConnectBaselineHypervisorCPUWrapper(virConnectPtr conn, - const char *emulator, - const char *arch, - const char *machine, - const char *virttype, - const char **xmlCPUs, - unsigned int ncpus, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 4004000 - assert(0); // Caller should have checked version -#else - return virConnectBaselineHypervisorCPU(conn, emulator, arch, machine, = virttype, xmlCPUs, ncpus, flags); -#endif -} - -int virConnectCompareHypervisorCPUWrapper(virConnectPtr conn, - const char *emulator, - const char *arch, - const char *machine, - const char *virttype, - const char *xmlCPU, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 4004000 - assert(0); // Caller should have checked version -#else - return virConnectCompareHypervisorCPU(conn, emulator, arch, machine, v= irttype, xmlCPU, flags); -#endif -} - -int virNodeGetSEVInfoWrapper(virConnectPtr conn, - virTypedParameterPtr *params, - int *nparams, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 4005000 - assert(0); // Caller should have checked version -#else - return virNodeGetSEVInfo(conn, params, nparams, flags); -#endif -} - -int virConnectListAllNWFilterBindingsWrapper(virConnectPtr conn, - virNWFilterBindingPtr **bindin= gs, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 4005000 - assert(0); // Caller should have checked version -#else - return virConnectListAllNWFilterBindings(conn, bindings, flags); -#endif -} - -virNWFilterBindingPtr virNWFilterBindingCreateXMLWrapper(virConnectPtr con= n, - const char *xml, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 4005000 - assert(0); // Caller should have checked version -#else - return virNWFilterBindingCreateXML(conn, xml, flags); -#endif -} - -virNWFilterBindingPtr virNWFilterBindingLookupByPortDevWrapper(virConnectP= tr conn, - const char *portdev) -{ -#if LIBVIR_VERSION_NUMBER < 4005000 - assert(0); // Caller should have checked version -#else - return virNWFilterBindingLookupByPortDev(conn, portdev); -#endif -} - - -*/ -import "C" diff --git a/connect_compat.h b/connect_compat.h index 09cbe22..924b07d 100644 --- a/connect_compat.h +++ b/connect_compat.h @@ -47,24 +47,6 @@ #define VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE 1 << 0 #endif =20 -int virNodeGetFreePagesWrapper(virConnectPtr conn, - unsigned int npages, - unsigned int *pages, - int startcell, - unsigned int cellcount, - unsigned long long *counts, - unsigned int flags); - - -/* 1.2.7 */ - -char * virConnectGetDomainCapabilitiesWrapper(virConnectPtr conn, - const char *emulatorbin, - const char *arch, - const char *machine, - const char *virttype, - unsigned int flags); - =20 /* 1.2.8 */ =20 @@ -118,18 +100,6 @@ struct _virDomainStatsRecord { }; #endif =20 -int virConnectGetAllDomainStatsWrapper(virConnectPtr conn, - unsigned int stats, - virDomainStatsRecordPtr **retStats, - unsigned int flags); - -int virDomainListGetStatsWrapper(virDomainPtr *doms, - unsigned int stats, - virDomainStatsRecordPtr **retStats, - unsigned int flags); - -void virDomainStatsRecordListFreeWrapper(virDomainStatsRecordPtr *stats); - =20 /* 1.2.9 */ #ifndef VIR_NODE_ALLOC_PAGES_ADD @@ -140,14 +110,6 @@ void virDomainStatsRecordListFreeWrapper(virDomainStat= sRecordPtr *stats); #define VIR_NODE_ALLOC_PAGES_SET 1 << 0 #endif =20 -int virNodeAllocPagesWrapper(virConnectPtr conn, - unsigned int npages, - unsigned int *pageSizes, - unsigned long long *pageCounts, - int startCell, - unsigned int cellCount, - unsigned int flags); - =20 /* 1.2.11 */ =20 @@ -178,10 +140,6 @@ int virNodeAllocPagesWrapper(virConnectPtr conn, #define VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING 1 << 30 #endif =20 -virDomainPtr virDomainDefineXMLFlagsWrapper(virConnectPtr conn, - const char *xml, - unsigned int flags); - /* 1.2.14 */ =20 #ifndef VIR_CONNECT_BASELINE_CPU_MIGRATABLE @@ -212,37 +170,9 @@ virDomainPtr virDomainDefineXMLFlagsWrapper(virConnect= Ptr conn, #define VIR_CONNECT_LIST_NODE_DEVICES_CAP_CCW_DEV 1 << 15 #endif =20 -/* 4.1.0 */ - -virStoragePoolPtr virStoragePoolLookupByTargetPathWrapper(virConnectPtr co= nn, - const char *path); - -/* 4.4.0 */ - -char *virConnectBaselineHypervisorCPUWrapper(virConnectPtr conn, - const char *emulator, - const char *arch, - const char *machine, - const char *virttype, - const char **xmlCPUs, - unsigned int ncpus, - unsigned int flags); - -int virConnectCompareHypervisorCPUWrapper(virConnectPtr conn, - const char *emulator, - const char *arch, - const char *machine, - const char *virttype, - const char *xmlCPU, - unsigned int flags); =20 /* 4.5.0 */ =20 -int virNodeGetSEVInfoWrapper(virConnectPtr conn, - virTypedParameterPtr *params, - int *nparams, - unsigned int flags); - #ifndef VIR_NODE_SEV_CBITPOS #define VIR_NODE_SEV_CBITPOS "cbitpos" #endif @@ -263,17 +193,6 @@ int virNodeGetSEVInfoWrapper(virConnectPtr conn, typedef struct _virNWFilterBinding *virNWFilterBindingPtr; #endif =20 -int virConnectListAllNWFilterBindingsWrapper(virConnectPtr conn, - virNWFilterBindingPtr **bindin= gs, - unsigned int flags); - -virNWFilterBindingPtr virNWFilterBindingCreateXMLWrapper(virConnectPtr con= n, - const char *xml, - unsigned int flags); - -virNWFilterBindingPtr virNWFilterBindingLookupByPortDevWrapper(virConnectP= tr conn, - const char *portdev); - #ifndef VIR_CONNECT_GET_ALL_DOMAINS_STATS_NOWAIT #define VIR_CONNECT_GET_ALL_DOMAINS_STATS_NOWAIT 1 << 29 #endif diff --git a/connect_wrapper.go b/connect_wrapper.go index ec2da69..cbafc53 100644 --- a/connect_wrapper.go +++ b/connect_wrapper.go @@ -30,6 +30,7 @@ package libvirt #cgo pkg-config: libvirt #include #include +#include #include "connect_wrapper.h" #include "callbacks_wrapper.h" =20 @@ -67,5 +68,176 @@ virConnectPtr virConnectOpenAuthWrap(const char *name, = int *credtype, uint ncred return virConnectOpenAuth(name, &auth, flags); } =20 + +int virNodeGetFreePagesWrapper(virConnectPtr conn, + unsigned int npages, + unsigned int *pages, + int startcell, + unsigned int cellcount, + unsigned long long *counts, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 1002006 + assert(0); // Caller should have checked version +#else + return virNodeGetFreePages(conn, npages, pages, startcell, cellcount, = counts, flags); +#endif +} + +char * virConnectGetDomainCapabilitiesWrapper(virConnectPtr conn, + const char *emulatorbin, + const char *arch, + const char *machine, + const char *virttype, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 1002007 + assert(0); // Caller should have checked version +#else + return virConnectGetDomainCapabilities(conn, emulatorbin, arch, machin= e, virttype, flags); +#endif +} + +int virConnectGetAllDomainStatsWrapper(virConnectPtr conn, + unsigned int stats, + virDomainStatsRecordPtr **retStats, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 1002008 + assert(0); // Caller should have checked version +#else + return virConnectGetAllDomainStats(conn, stats, retStats, flags); +#endif +} + +int virDomainListGetStatsWrapper(virDomainPtr *doms, + unsigned int stats, + virDomainStatsRecordPtr **retStats, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 1002008 + assert(0); // Caller should have checked version +#else + return virDomainListGetStats(doms, stats, retStats, flags); +#endif +} + +void virDomainStatsRecordListFreeWrapper(virDomainStatsRecordPtr *stats) +{ +} + +int virNodeAllocPagesWrapper(virConnectPtr conn, + unsigned int npages, + unsigned int *pageSizes, + unsigned long long *pageCounts, + int startCell, + unsigned int cellCount, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 1002009 + assert(0); // Caller should have checked version +#else + return virNodeAllocPages(conn, npages, pageSizes, pageCounts, startCel= l, cellCount, flags); +#endif +} + + +virDomainPtr virDomainDefineXMLFlagsWrapper(virConnectPtr conn, + const char *xml, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 1002012 + assert(0); // Caller should have checked version +#else + return virDomainDefineXMLFlags(conn, xml, flags); +#endif +} + +virStoragePoolPtr virStoragePoolLookupByTargetPathWrapper(virConnectPtr co= nn, + const char *path) +{ +#if LIBVIR_VERSION_NUMBER < 4001000 + assert(0); // Caller should have checked version +#else + return virStoragePoolLookupByTargetPath(conn, path); +#endif +} + +char *virConnectBaselineHypervisorCPUWrapper(virConnectPtr conn, + const char *emulator, + const char *arch, + const char *machine, + const char *virttype, + const char **xmlCPUs, + unsigned int ncpus, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 4004000 + assert(0); // Caller should have checked version +#else + return virConnectBaselineHypervisorCPU(conn, emulator, arch, machine, = virttype, xmlCPUs, ncpus, flags); +#endif +} + +int virConnectCompareHypervisorCPUWrapper(virConnectPtr conn, + const char *emulator, + const char *arch, + const char *machine, + const char *virttype, + const char *xmlCPU, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 4004000 + assert(0); // Caller should have checked version +#else + return virConnectCompareHypervisorCPU(conn, emulator, arch, machine, v= irttype, xmlCPU, flags); +#endif +} + +int virNodeGetSEVInfoWrapper(virConnectPtr conn, + virTypedParameterPtr *params, + int *nparams, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 4005000 + assert(0); // Caller should have checked version +#else + return virNodeGetSEVInfo(conn, params, nparams, flags); +#endif +} + +int virConnectListAllNWFilterBindingsWrapper(virConnectPtr conn, + virNWFilterBindingPtr **bindi= ngs, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 4005000 + assert(0); // Caller should have checked version +#else + return virConnectListAllNWFilterBindings(conn, bindings, flags); +#endif +} + +virNWFilterBindingPtr virNWFilterBindingCreateXMLWrapper(virConnectPtr con= n, + const char *xml, + unsigned int flag= s) +{ +#if LIBVIR_VERSION_NUMBER < 4005000 + assert(0); // Caller should have checked version +#else + return virNWFilterBindingCreateXML(conn, xml, flags); +#endif +} + +virNWFilterBindingPtr virNWFilterBindingLookupByPortDevWrapper(virConnectP= tr conn, + const char = *portdev) +{ +#if LIBVIR_VERSION_NUMBER < 4005000 + assert(0); // Caller should have checked version +#else + return virNWFilterBindingLookupByPortDev(conn, portdev); +#endif +} + + */ import "C" diff --git a/connect_wrapper.h b/connect_wrapper.h index 60374c7..7af88f1 100644 --- a/connect_wrapper.h +++ b/connect_wrapper.h @@ -31,4 +31,79 @@ int virConnectRegisterCloseCallbackHelper(virConnectPtr = c, virConnectCloseFunc c =20 virConnectPtr virConnectOpenAuthWrap(const char *name, int *credtype, uint= ncredtype, int callbackID, unsigned int flags); =20 +int virNodeGetFreePagesWrapper(virConnectPtr conn, + unsigned int npages, + unsigned int *pages, + int startcell, + unsigned int cellcount, + unsigned long long *counts, + unsigned int flags); + +char * virConnectGetDomainCapabilitiesWrapper(virConnectPtr conn, + const char *emulatorbin, + const char *arch, + const char *machine, + const char *virttype, + unsigned int flags); + +int virConnectGetAllDomainStatsWrapper(virConnectPtr conn, + unsigned int stats, + virDomainStatsRecordPtr **retStats, + unsigned int flags); + +int virDomainListGetStatsWrapper(virDomainPtr *doms, + unsigned int stats, + virDomainStatsRecordPtr **retStats, + unsigned int flags); + +void virDomainStatsRecordListFreeWrapper(virDomainStatsRecordPtr *stats); + +int virNodeAllocPagesWrapper(virConnectPtr conn, + unsigned int npages, + unsigned int *pageSizes, + unsigned long long *pageCounts, + int startCell, + unsigned int cellCount, + unsigned int flags); + +virDomainPtr virDomainDefineXMLFlagsWrapper(virConnectPtr conn, + const char *xml, + unsigned int flags); + +virStoragePoolPtr virStoragePoolLookupByTargetPathWrapper(virConnectPtr co= nn, + const char *path= ); + +char *virConnectBaselineHypervisorCPUWrapper(virConnectPtr conn, + const char *emulator, + const char *arch, + const char *machine, + const char *virttype, + const char **xmlCPUs, + unsigned int ncpus, + unsigned int flags); + +int virConnectCompareHypervisorCPUWrapper(virConnectPtr conn, + const char *emulator, + const char *arch, + const char *machine, + const char *virttype, + const char *xmlCPU, + unsigned int flags); + +int virNodeGetSEVInfoWrapper(virConnectPtr conn, + virTypedParameterPtr *params, + int *nparams, + unsigned int flags); + +int virConnectListAllNWFilterBindingsWrapper(virConnectPtr conn, + virNWFilterBindingPtr **bindi= ngs, + unsigned int flags); + +virNWFilterBindingPtr virNWFilterBindingCreateXMLWrapper(virConnectPtr con= n, + const char *xml, + unsigned int flag= s); + +virNWFilterBindingPtr virNWFilterBindingLookupByPortDevWrapper(virConnectP= tr conn, + const char = *portdev); + #endif /* LIBVIRT_GO_CONNECT_WRAPPER_H__ */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list