From nobody Sun Feb 8 07:52:40 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 1531747498647991.5460520022299; Mon, 16 Jul 2018 06:24:58 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 540F45D68D; Mon, 16 Jul 2018 13:24:57 +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 1D58F30012C2; Mon, 16 Jul 2018 13:24:57 +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 B8F5A4BB78; Mon, 16 Jul 2018 13:24:56 +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 w6GDObEb028052 for ; Mon, 16 Jul 2018 09:24:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id DD56B2027047; Mon, 16 Jul 2018 13:24:37 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EF762026D76; Mon, 16 Jul 2018 13:24:37 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Jul 2018 14:23:57 +0100 Message-Id: <20180716132423.10354-12-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 11/37] stream: 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.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 16 Jul 2018 13:24:57 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- stream_compat.go | 69 ----------------------------------------------- stream_compat.h | 13 --------- stream_wrapper.go | 34 +++++++++++++++++++++++ stream_wrapper.h | 12 +++++++++ 4 files changed, 46 insertions(+), 82 deletions(-) delete mode 100644 stream_compat.go diff --git a/stream_compat.go b/stream_compat.go deleted file mode 100644 index d718ae1..0000000 --- a/stream_compat.go +++ /dev/null @@ -1,69 +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) 2017 Red Hat, Inc. - * - */ - -package libvirt - -/* -#cgo pkg-config: libvirt -#include -#include -#include "stream_compat.h" - -int virStreamRecvFlagsWrapper(virStreamPtr st, - char *data, - size_t nbytes, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 3004000 - assert(0); // Caller should have checked version -#else - return virStreamRecvFlags(st, data, nbytes, flags); -#endif -} - -int virStreamSendHoleWrapper(virStreamPtr st, - long long length, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 3004000 - assert(0); // Caller should have checked version -#else - return virStreamSendHole(st, length, flags); -#endif -} - -int virStreamRecvHoleWrapper(virStreamPtr st, - long long *length, - unsigned int flags) -{ -#if LIBVIR_VERSION_NUMBER < 3004000 - assert(0); // Caller should have checked version -#else - return virStreamRecvHole(st, length, flags); -#endif -} - -*/ -import "C" diff --git a/stream_compat.h b/stream_compat.h index 9db2184..92befd5 100644 --- a/stream_compat.h +++ b/stream_compat.h @@ -33,17 +33,4 @@ #define VIR_STREAM_RECV_STOP_AT_HOLE (1 << 0) #endif =20 -int virStreamRecvFlagsWrapper(virStreamPtr st, - char *data, - size_t nbytes, - unsigned int flags); - -int virStreamSendHoleWrapper(virStreamPtr st, - long long length, - unsigned int flags); - -int virStreamRecvHoleWrapper(virStreamPtr, - long long *length, - unsigned int flags); - #endif /* LIBVIRT_GO_STREAM_COMPAT_H__ */ diff --git a/stream_wrapper.go b/stream_wrapper.go index 4e1c2c9..419bb41 100644 --- a/stream_wrapper.go +++ b/stream_wrapper.go @@ -128,5 +128,39 @@ int virStreamEventAddCallbackWrapper(virStreamPtr st, = int events, int callbackID return virStreamEventAddCallback(st, events, streamEventCallbackHelper= , (void *)(intptr_t)callbackID, NULL); } =20 +int virStreamRecvFlagsWrapper(virStreamPtr st, + char *data, + size_t nbytes, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 3004000 + assert(0); // Caller should have checked version +#else + return virStreamRecvFlags(st, data, nbytes, flags); +#endif +} + +int virStreamSendHoleWrapper(virStreamPtr st, + long long length, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 3004000 + assert(0); // Caller should have checked version +#else + return virStreamSendHole(st, length, flags); +#endif +} + +int virStreamRecvHoleWrapper(virStreamPtr st, + long long *length, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 3004000 + assert(0); // Caller should have checked version +#else + return virStreamRecvHole(st, length, flags); +#endif +} + */ import "C" diff --git a/stream_wrapper.h b/stream_wrapper.h index c064423..cfa6c37 100644 --- a/stream_wrapper.h +++ b/stream_wrapper.h @@ -33,5 +33,17 @@ int virStreamSparseSendAllWrapper(virStreamPtr st, int c= allbackID, int holeCallb int virStreamSparseRecvAllWrapper(virStreamPtr st, int callbackID, int hol= eCallbackID); =20 int virStreamEventAddCallbackWrapper(virStreamPtr st, int events, int call= backID); +int virStreamRecvFlagsWrapper(virStreamPtr st, + char *data, + size_t nbytes, + unsigned int flags); + +int virStreamSendHoleWrapper(virStreamPtr st, + long long length, + unsigned int flags); + +int virStreamRecvHoleWrapper(virStreamPtr, + long long *length, + unsigned int flags); =20 #endif /* LIBVIRT_GO_STREAM_WRAPPER_H__ */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list