From nobody Sun Feb 8 10:50: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.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 1531747493101853.0945211861468; Mon, 16 Jul 2018 06:24:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AC864796E0; Mon, 16 Jul 2018 13:24:51 +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 7C1EE2010CA0; Mon, 16 Jul 2018 13:24:51 +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 22CCD1853DA1; Mon, 16 Jul 2018 13:24:51 +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 w6GDObAa028042 for ; Mon, 16 Jul 2018 09:24:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id E1E412026D76; Mon, 16 Jul 2018 13:24:36 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3668F2027047; Mon, 16 Jul 2018 13:24:36 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Jul 2018 14:23:56 +0100 Message-Id: <20180716132423.10354-11-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 10/37] secret: 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.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 16 Jul 2018 13:24:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- secret_compat.go | 47 ---------------------------------------- secret_compat.h | 3 --- secret_events_wrapper.go | 11 ++++++++++ secret_events_wrapper.h | 6 +++-- 4 files changed, 15 insertions(+), 52 deletions(-) delete mode 100644 secret_compat.go diff --git a/secret_compat.go b/secret_compat.go deleted file mode 100644 index 4444f6b..0000000 --- a/secret_compat.go +++ /dev/null @@ -1,47 +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 "secret_compat.h" - -int virConnectSecretEventDeregisterAnyWrapper(virConnectPtr conn, - int callbackID) -{ -#if LIBVIR_VERSION_NUMBER < 3000000 - assert(0); // Caller should have checked version -#else - return virConnectSecretEventDeregisterAny(conn, callbackID); -#endif -} - - -*/ -import "C" diff --git a/secret_compat.h b/secret_compat.h index d1e1b8a..ba38c68 100644 --- a/secret_compat.h +++ b/secret_compat.h @@ -52,9 +52,6 @@ typedef void (*virConnectSecretEventGenericCallback)(virC= onnectPtr conn, void *opaque); #endif =20 -int virConnectSecretEventDeregisterAnyWrapper(virConnectPtr conn, - int callbackID); - /* 2.2.1 */ =20 #ifndef VIR_SECRET_USAGE_TYPE_TLS diff --git a/secret_events_wrapper.go b/secret_events_wrapper.go index 3366065..6e1ef21 100644 --- a/secret_events_wrapper.go +++ b/secret_events_wrapper.go @@ -61,5 +61,16 @@ int virConnectSecretEventRegisterAnyWrapper(virConnectPt= r c, virSecretPtr d, #endif } =20 +int virConnectSecretEventDeregisterAnyWrapper(virConnectPtr conn, + int callbackID) +{ +#if LIBVIR_VERSION_NUMBER < 3000000 + assert(0); // Caller should have checked version +#else + return virConnectSecretEventDeregisterAny(conn, callbackID); +#endif +} + + */ import "C" diff --git a/secret_events_wrapper.h b/secret_events_wrapper.h index 1b5b527..f388542 100644 --- a/secret_events_wrapper.h +++ b/secret_events_wrapper.h @@ -28,13 +28,15 @@ #define LIBVIRT_GO_SECRET_EVENTS_WRAPPER_H__ =20 void secretEventLifecycleCallbackHelper(virConnectPtr c, virSecretPtr d, - int event, int detail, void* data); + int event, int detail, void* data); void secretEventGenericCallbackHelper(virConnectPtr c, virSecretPtr d, - void* data); + void* data); =20 int virConnectSecretEventRegisterAnyWrapper(virConnectPtr c, virSecretPtr= d, int eventID, virConnectSecretEven= tGenericCallback cb, long goCallbackId); =20 +int virConnectSecretEventDeregisterAnyWrapper(virConnectPtr conn, + int callbackID); =20 #endif /* LIBVIRT_GO_SECRET_EVENTS_WRAPPER_H__ */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list