From nobody Fri Apr 19 18:54:07 2024 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 1534324766826602.4019306125276; Wed, 15 Aug 2018 02:19:26 -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 5641281101; Wed, 15 Aug 2018 09:19:24 +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 0EE605D755; Wed, 15 Aug 2018 09:19:24 +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 B76733FA54; Wed, 15 Aug 2018 09:19:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7F9IvML020031 for ; Wed, 15 Aug 2018 05:18:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id BD62810073AC; Wed, 15 Aug 2018 09:18:57 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5BEA110EE964 for ; Wed, 15 Aug 2018 09:18:57 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 15 Aug 2018 11:18:43 +0200 Message-Id: <9c8f43f54971b30ef1c2e6b9351363eb297f0a7e.1534324576.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 06/10] tests: qemuxml2argvmock: Allow 'safe' file descriptors in mocked virCommandPassFD 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.28]); Wed, 15 Aug 2018 09:19:25 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Allow FDs which are marked as safe for FD passing. Signed-off-by: Peter Krempa --- tests/qemuxml2argvmock.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 4df92cf396..581f720227 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -184,12 +184,26 @@ virNetDevRunEthernetScript(const char *ifname ATTRIBU= TE_UNUSED, return 0; } +static void (*real_virCommandPassFD)(virCommandPtr cmd, int fd, unsigned i= nt flags); + +static const int testCommandPassSafeFDs[] =3D { -1 }; + void -virCommandPassFD(virCommandPtr cmd ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, - unsigned int flags ATTRIBUTE_UNUSED) +virCommandPassFD(virCommandPtr cmd, + int fd, + unsigned int flags) { - /* nada */ + size_t i; + + for (i =3D 0; i < ARRAY_CARDINALITY(testCommandPassSafeFDs); i++) { + if (testCommandPassSafeFDs[i] =3D=3D fd) { + if (!real_virCommandPassFD) + VIR_MOCK_REAL_INIT(virCommandPassFD); + + real_virCommandPassFD(cmd, fd, flags); + return; + } + } } int --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list