From nobody Mon May 6 15:15:25 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 ARC-Seal: i=1; a=rsa-sha256; t=1568652356; cv=none; d=zoho.com; s=zohoarc; b=Ffo6+bLx2znUlM6s96HKnpI8sfFXv9mr8NOqoN3Hat2DewG2CjTd6+nNbKmp+p0qomIwJHdXBWQ9wOwgXP9mLkidI+Zz8v9DUg1XbZ9Y8asIZr1wyZeX+pxaZH5VVL5MtjaBe6XAmEu+8P8mXznsBvLVLdtNlTugXytkoYfCwGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568652356; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=QRLhd5okvrsV9tdVewUS0Yl5SOzX1469ISsuh6He29U=; b=aKKWYVYphksm/Y1yyXW+R6cWSVJ141ydc2ebGJLq6GwzZS0Hm+kT9VajfGnXHSHxj5Zg9aHmvhBaiAJt9lWd7ra7PFZQCFtHnOih1yptELemWUKqAM4NefJBDiHCOmzZQFB2zDc53V0+yvZnuHyk4xko2wPicIrtRmzjEerRaF4= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156865235651410.496189093492376; Mon, 16 Sep 2019 09:45:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 75DA3302C07C; Mon, 16 Sep 2019 16:45:54 +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 0B6BF600F8; Mon, 16 Sep 2019 16:45:54 +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 D46C04EE68; Mon, 16 Sep 2019 16:45:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8GGjoCg009524 for ; Mon, 16 Sep 2019 12:45:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A7AA1ED; Mon, 16 Sep 2019 16:45:50 +0000 (UTC) Received: from dhcp-17-64.lcy.redhat.com (unknown [10.42.17.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B10F52C8; Mon, 16 Sep 2019 16:45:47 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Sep 2019 17:45:45 +0100 Message-Id: <20190916164545.32407-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] util: remove some no-op thread functions 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 16 Sep 2019 16:45:55 +0000 (UTC) Neither virThreadInitialize or virThreadOnExit do anything since we dropped the Win32 threads impl, in favour of win-pthreads. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/libvirt-admin.c | 3 +-- src/libvirt.c | 6 ++---- src/libvirt_private.syms | 1 - src/locking/lock_daemon.c | 1 - src/logging/log_daemon.c | 1 - src/lxc/lxc_controller.c | 1 - src/network/leaseshelper.c | 1 - src/security/virt-aa-helper.c | 1 - src/util/iohelper.c | 1 - src/util/virthread.c | 10 ---------- src/util/virthread.h | 3 --- tests/commandtest.c | 3 --- tests/eventtest.c | 2 -- tests/qemuagenttest.c | 3 +-- tests/qemucapabilitiestest.c | 3 --- tests/qemucaps2xmltest.c | 3 --- tests/qemucapsprobe.c | 3 +-- tests/qemuhotplugtest.c | 3 +-- tests/qemumigparamstest.c | 3 +-- tests/qemumonitorjsontest.c | 3 +-- tests/seclabeltest.c | 3 --- tests/testutils.c | 3 +-- tests/viratomictest.c | 3 --- 23 files changed, 9 insertions(+), 55 deletions(-) diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 9d5c5b1b7b..091473e698 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -52,8 +52,7 @@ virAdmGlobalInit(void) * virAdmConnectOpen first. But we can't rely on VIR_DEBUG working * until after initialization is complete, and since this is * one-shot, we never get here again. */ - if (virThreadInitialize() < 0 || - virErrorInitialize() < 0) + if (virErrorInitialize() < 0) goto error; =20 virLogSetFromEnv(); diff --git a/src/libvirt.c b/src/libvirt.c index 15917cba6f..ca172beb71 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -243,8 +243,7 @@ virGlobalInit(void) * virConnectOpen first. But we can't rely on VIR_DEBUG working * until after initialization is complete, and since this is * one-shot, we never get here again. */ - if (virThreadInitialize() < 0 || - virErrorInitialize() < 0) + if (virErrorInitialize() < 0) goto error; =20 virFileActivateDirOverrideForLib(); @@ -369,8 +368,7 @@ DllMain(HINSTANCE instance ATTRIBUTE_UNUSED, break; =20 case DLL_THREAD_DETACH: - /* Release per-thread local data */ - virThreadOnExit(); + /* Nothing todo in libvirt yet */ break; =20 case DLL_PROCESS_DETACH: diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6619dbc2e9..da915876ff 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3173,7 +3173,6 @@ virRWLockWrite; virThreadCancel; virThreadCreateFull; virThreadID; -virThreadInitialize; virThreadIsSelf; virThreadJoin; virThreadSelf; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index edb61d74c0..a5a3a97e99 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1124,7 +1124,6 @@ int main(int argc, char **argv) { privileged =3D geteuid() =3D=3D 0; =20 if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 85c58aaa7b..9621702138 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -896,7 +896,6 @@ int main(int argc, char **argv) { privileged =3D geteuid() =3D=3D 0; =20 if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index c677eb8f6d..37851bf284 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2505,7 +2505,6 @@ int main(int argc, char *argv[]) ns_fd[i] =3D -1; =20 if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 5e04e16171..46482ad3ce 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -104,7 +104,6 @@ main(int argc, char **argv) program_name =3D argv[0]; =20 if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), program_name); exit(EXIT_FAILURE); diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 326cfaf52a..ead4eaa236 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1421,7 +1421,6 @@ main(int argc, char **argv) char *include_file =3D NULL; =20 if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/util/iohelper.c b/src/util/iohelper.c index ddc338b7c7..f3d45b9c03 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -196,7 +196,6 @@ main(int argc, char **argv) program_name =3D argv[0]; =20 if (virGettextInitialize() < 0 || - virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed"), program_name); exit(EXIT_FAILURE); diff --git a/src/util/virthread.c b/src/util/virthread.c index 05b5572f5f..cdc5cab604 100644 --- a/src/util/virthread.c +++ b/src/util/virthread.c @@ -33,16 +33,6 @@ #include "virthreadjob.h" =20 =20 -/* Nothing special required for pthreads */ -int virThreadInitialize(void) -{ - return 0; -} - -void virThreadOnExit(void) -{ -} - int virOnce(virOnceControlPtr once, virOnceFunc init) { return pthread_once(&once->once, init); diff --git a/src/util/virthread.h b/src/util/virthread.h index 7870340c47..6bbc09fa13 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -82,9 +82,6 @@ struct virOnceControl { =20 typedef void (*virOnceFunc)(void); =20 -int virThreadInitialize(void) ATTRIBUTE_RETURN_CHECK; -void virThreadOnExit(void); - typedef void (*virThreadFunc)(void *opaque); =20 #define virThreadCreate(thread, joinable, func, opaque) \ diff --git a/tests/commandtest.c b/tests/commandtest.c index a382bb6dd2..c6fd826003 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1292,9 +1292,6 @@ mymain(void) int timer =3D -1; int virinitret; =20 - if (virThreadInitialize() < 0) - return EXIT_FAILURE; - if (chdir("/tmp") < 0) return EXIT_FAILURE; =20 diff --git a/tests/eventtest.c b/tests/eventtest.c index df7570bac6..f426469d21 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -321,8 +321,6 @@ mymain(void) } } =20 - if (virThreadInitialize() < 0) - return EXIT_FAILURE; char *debugEnv =3D getenv("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv && (virLogSetDefaultPriority(virLogParseDefaultPriority(debugEnv)) < = 0)) { diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 91f19644d5..5ae098efa9 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1431,8 +1431,7 @@ mymain(void) return EXIT_AM_SKIP; #endif =20 - if (virThreadInitialize() < 0 || - qemuTestDriverInit(&driver) < 0) + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; =20 virEventRegisterDefaultImpl(); diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 67f57a4fdc..1a785d8e39 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -214,9 +214,6 @@ mymain(void) return EXIT_AM_SKIP; #endif =20 - if (virThreadInitialize() < 0) - return EXIT_FAILURE; - virEventRegisterDefaultImpl(); =20 if (testQemuDataInit(&data) < 0) diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 3b381251a0..e36ba06eeb 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -203,9 +203,6 @@ mymain(void) return EXIT_AM_SKIP; #endif =20 - if (virThreadInitialize() < 0) - return EXIT_FAILURE; - virEventRegisterDefaultImpl(); =20 if (testQemuDataInit(&data) < 0) diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index ae016c47c2..36af01d561 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -54,8 +54,7 @@ main(int argc, char **argv) return EXIT_FAILURE; } =20 - if (virThreadInitialize() < 0 || - virInitialize() < 0) { + if (virInitialize() < 0) { fprintf(stderr, "Failed to initialize libvirt"); return EXIT_FAILURE; } diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 3c177c6622..76b131295a 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -614,8 +614,7 @@ mymain(void) return EXIT_AM_SKIP; #endif =20 - if (virThreadInitialize() < 0 || - qemuTestDriverInit(&driver) < 0) + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; =20 virEventRegisterDefaultImpl(); diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index dcefde2dbc..aacb905639 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -209,8 +209,7 @@ mymain(void) return EXIT_AM_SKIP; #endif =20 - if (virThreadInitialize() < 0 || - qemuTestDriverInit(&driver) < 0) + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; =20 virEventRegisterDefaultImpl(); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index af84e0ba04..d0bbb1f674 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -3019,8 +3019,7 @@ mymain(void) return EXIT_AM_SKIP; #endif =20 - if (virThreadInitialize() < 0 || - qemuTestDriverInit(&driver) < 0) + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; =20 virEventRegisterDefaultImpl(); diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c index a0296c787e..42dcb8c97f 100644 --- a/tests/seclabeltest.c +++ b/tests/seclabeltest.c @@ -11,9 +11,6 @@ mymain(void) virSecurityManagerPtr mgr; const char *doi, *model; =20 - if (virThreadInitialize() < 0) - return EXIT_FAILURE; - mgr =3D virSecurityManagerNew(NULL, "QEMU", VIR_SECURITY_MANAGER_DEFAU= LT_CONFINED); if (mgr =3D=3D NULL) { fprintf(stderr, "Failed to start security driver"); diff --git a/tests/testutils.c b/tests/testutils.c index 064460b4dc..1b663f9d5d 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -877,8 +877,7 @@ int virTestMain(int argc, } fprintf(stderr, "TEST: %s\n", progname); =20 - if (virThreadInitialize() < 0 || - virErrorInitialize() < 0) + if (virErrorInitialize() < 0) return EXIT_FAILURE; =20 virLogSetFromEnv(); diff --git a/tests/viratomictest.c b/tests/viratomictest.c index 52f17154e9..a933ab1cbd 100644 --- a/tests/viratomictest.c +++ b/tests/viratomictest.c @@ -164,9 +164,6 @@ mymain(void) { int ret =3D 0; =20 - if (virThreadInitialize() < 0) - return -1; - if (virTestRun("types", testTypes, NULL) < 0) ret =3D -1; if (virTestRun("threads", testThreads, NULL) < 0) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list