From patchwork Wed Jan 23 22:46:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 156429 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1257904jaa; Wed, 23 Jan 2019 14:48:12 -0800 (PST) X-Google-Smtp-Source: ALg8bN489EQskrRt+SoS1RwAWuLbK7dt1/swF2q1pEg5OQg2+3ZJ0ynAuSCKG7Zd6d6ofrBHqGyM X-Received: by 2002:ad4:4084:: with SMTP id l4mr3711398qvp.165.1548283692504; Wed, 23 Jan 2019 14:48:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548283692; cv=none; d=google.com; s=arc-20160816; b=bHsk7VKmZiTmX3uqImyNRgwKIiUYzs6pFAMcP8uT5bKQxcUkgE6M708oiEGb4wkZJ7 mQy8jJduKN5+qbhxjsl2RqmAX04hoTWWFT78uQi+R9wOdkgtXxDCyDaqaq6bETJPeVAz FNR4CshZdX1NLAuWJIwiKgxCYt2Kqwyoaalhcy/ujNaQs4KHXPjBNZkNBvB2zz82EMoN LbtGxAUw4yCMoM8NIWrd8Zes1+i4Q2eIdb7wESD7wjf1ewlRHybnAZO7+B2WhQ2MVxWy TUguH4+q2xmdEeNczblt494zakH3vOFPyaAVS2oyFjHxiBe6ynPV0o1oi+h59s0/hZCs CaXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=mOtuuz5sD2IhAadce28Wk/e3ZS3WKE3MqvScInRTulk=; b=PIEPhPU57u10gwfRaXiwOW+OWruUU36lg+Ng65KU1OvRK7mPypilHhJKCRKiT4DjwE KjgVgvKyTCPGoBDzT1Aw/R+QloUOzTvuqN1baMQDL++PHzYv6hr0MbKlgwLl3Y6R8C9x XFOwqR2zv0hbqfJBIcEUqgXOglqM8YaKrIS0m5ZYBlXxlddnB64zweyapZdML+n6mqJu gZKAv0UmtNAnR1U8iPFu9zG+gn0rOlRC12ehT5m8cKCnynkGXwwREKRbYJ6JiqvV/1Nt ch3ydHpNO4osw0qY2YhhlVDOpR1uvuOY0bqMHjzC1XZV3/QIbka4NbqmS3/0EYbnCxxg 5Hcw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id n32si3527492qtn.122.2019.01.23.14.48.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jan 2019 14:48:12 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9A4DF8E670; Wed, 23 Jan 2019 22:48:09 +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 5DF8068872; Wed, 23 Jan 2019 22:48:09 +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 0FD663F60E; Wed, 23 Jan 2019 22:48:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0NMlp8H011124 for ; Wed, 23 Jan 2019 17:47:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id CD9BC67144; Wed, 23 Jan 2019 22:47:51 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-120-34.rdu2.redhat.com [10.10.120.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE1B5424A; Wed, 23 Jan 2019 22:47:50 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 23 Jan 2019 17:46:11 -0500 Message-Id: <13c3975e5986abded688fc67936918722956a1cc.1548283534.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [PATCH 4/9] Add semicolon to VIR_ONCE_GLOBAL_INIT calls 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 23 Jan 2019 22:48:10 +0000 (UTC) Missing semicolon at the end of macros can confuse some analyzers (like cppcheck ). VIR_ONCE_GLOBAL_INIT is almost exclusively called without an ending semicolon, but let's standardize on using one like the other macros. Signed-off-by: Cole Robinson --- src/bhyve/bhyve_conf.c | 2 +- src/conf/capabilities.c | 2 +- src/conf/domain_capabilities.c | 2 +- src/conf/domain_conf.c | 2 +- src/conf/domain_event.c | 2 +- src/conf/network_event.c | 2 +- src/conf/node_device_event.c | 2 +- src/conf/object_event.c | 2 +- src/conf/secret_event.c | 2 +- src/conf/storage_event.c | 2 +- src/conf/virdomainobjlist.c | 2 +- src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 2 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnwfilterbindingobj.c | 2 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 ++-- src/datatypes.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_migration.c | 2 +- src/logging/log_handler.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/lxc/lxc_monitor.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 14 +++++++------- src/qemu/qemu_monitor.c | 2 +- src/rpc/virkeepalive.c | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetclientprogram.c | 2 +- src/rpc/virnetclientstream.c | 2 +- src/rpc/virnetdaemon.c | 2 +- src/rpc/virnetsaslcontext.c | 2 +- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetserverservice.c | 2 +- src/rpc/virnetsocket.c | 2 +- src/rpc/virnettlscontext.c | 2 +- src/test/test_driver.c | 2 +- src/util/virclosecallbacks.c | 2 +- src/util/virdevmapper.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virfdstream.c | 2 +- src/util/virfilecache.c | 2 +- src/util/virfirewall.c | 2 +- src/util/virhash.c | 2 +- src/util/virhostdev.c | 2 +- src/util/viridentity.c | 2 +- src/util/virlog.c | 2 +- src/util/virmdev.c | 2 +- src/util/virpci.c | 2 +- src/util/virportallocator.c | 2 +- src/util/virresctrl.c | 2 +- src/util/virscsi.c | 2 +- src/util/virscsivhost.c | 2 +- src/util/virstoragefilebackend.c | 2 +- src/util/virthread.h | 4 ++-- src/util/virthreadjob.c | 2 +- src/util/virusb.c | 2 +- src/vz/vz_driver.c | 2 +- tests/virfilecachetest.c | 2 +- 68 files changed, 76 insertions(+), 76 deletions(-) -- 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/bhyve/bhyve_conf.c b/src/bhyve/bhyve_conf.c index 60baa2e848..b708233777 100644 --- a/src/bhyve/bhyve_conf.c +++ b/src/bhyve/bhyve_conf.c @@ -42,7 +42,7 @@ static int virBhyveConfigOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virBhyveConfig) +VIR_ONCE_GLOBAL_INIT(virBhyveConfig); virBhyveDriverConfigPtr virBhyveDriverConfigNew(void) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index c3ccf1a18b..47c196c7bf 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -62,7 +62,7 @@ static int virCapabilitiesOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virCapabilities) +VIR_ONCE_GLOBAL_INIT(virCapabilities); /** * virCapabilitiesNew: diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index ba2b6ba70f..e31b41e982 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -48,7 +48,7 @@ static int virDomainCapsOnceInit(void) } -VIR_ONCE_GLOBAL_INIT(virDomainCaps) +VIR_ONCE_GLOBAL_INIT(virDomainCaps); static void diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f580114d55..d486271377 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -962,7 +962,7 @@ static int virDomainObjOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virDomainObj) +VIR_ONCE_GLOBAL_INIT(virDomainObj); static void diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 1bba4a2520..b33589f472 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -338,7 +338,7 @@ virDomainEventsOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virDomainEvents) +VIR_ONCE_GLOBAL_INIT(virDomainEvents); static void diff --git a/src/conf/network_event.c b/src/conf/network_event.c index e3d2f2b6b3..41cabe340a 100644 --- a/src/conf/network_event.c +++ b/src/conf/network_event.c @@ -64,7 +64,7 @@ virNetworkEventsOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetworkEvents) +VIR_ONCE_GLOBAL_INIT(virNetworkEvents); static void virNetworkEventDispose(void *obj) diff --git a/src/conf/node_device_event.c b/src/conf/node_device_event.c index e85bcbba0d..c6915be593 100644 --- a/src/conf/node_device_event.c +++ b/src/conf/node_device_event.c @@ -78,7 +78,7 @@ virNodeDeviceEventsOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNodeDeviceEvents) +VIR_ONCE_GLOBAL_INIT(virNodeDeviceEvents); static void virNodeDeviceEventDispose(void *obj) diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 667852fe22..5d84598d59 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -99,7 +99,7 @@ virObjectEventOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virObjectEvent) +VIR_ONCE_GLOBAL_INIT(virObjectEvent); /** * virClassForObjectEvent: diff --git a/src/conf/secret_event.c b/src/conf/secret_event.c index 3395aa128d..1c34dcfbc9 100644 --- a/src/conf/secret_event.c +++ b/src/conf/secret_event.c @@ -77,7 +77,7 @@ virSecretEventsOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virSecretEvents) +VIR_ONCE_GLOBAL_INIT(virSecretEvents); static void virSecretEventDispose(void *obj) diff --git a/src/conf/storage_event.c b/src/conf/storage_event.c index 32a12eb63f..de36ec3af9 100644 --- a/src/conf/storage_event.c +++ b/src/conf/storage_event.c @@ -78,7 +78,7 @@ virStoragePoolEventsOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virStoragePoolEvents) +VIR_ONCE_GLOBAL_INIT(virStoragePoolEvents); static void virStoragePoolEventDispose(void *obj) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 384d97d768..0e943d0a6c 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -60,7 +60,7 @@ static int virDomainObjListOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virDomainObjList) +VIR_ONCE_GLOBAL_INIT(virDomainObjList); virDomainObjListPtr virDomainObjListNew(void) { diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 028d699b32..c8d931a4b6 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -67,7 +67,7 @@ virInterfaceObjOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virInterfaceObj) +VIR_ONCE_GLOBAL_INIT(virInterfaceObj); static void diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e6b01388f5..a774d54fb6 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -84,7 +84,7 @@ virNetworkObjOnceInit(void) } -VIR_ONCE_GLOBAL_INIT(virNetworkObj) +VIR_ONCE_GLOBAL_INIT(virNetworkObj); virNetworkObjPtr virNetworkObjNew(void) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index c8ad1314b5..6a02490d61 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -69,7 +69,7 @@ virNodeDeviceObjOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNodeDeviceObj) +VIR_ONCE_GLOBAL_INIT(virNodeDeviceObj); static void diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c index d145fe3223..23978d4207 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -51,7 +51,7 @@ virNWFilterBindingObjOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObj) +VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObj); virNWFilterBindingObjPtr virNWFilterBindingObjNew(void) diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c index 7e8437988f..887c7c7b09 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -52,7 +52,7 @@ static int virNWFilterBindingObjListOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObjList) +VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObjList); virNWFilterBindingObjListPtr diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 78911c0908..537ff42c70 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -78,7 +78,7 @@ virSecretObjOnceInit(void) } -VIR_ONCE_GLOBAL_INIT(virSecretObj) +VIR_ONCE_GLOBAL_INIT(virSecretObj); static virSecretObjPtr virSecretObjNew(void) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 6ea6a97d89..7005de3c24 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -120,7 +120,7 @@ virStorageVolObjOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virStorageVolObj) +VIR_ONCE_GLOBAL_INIT(virStorageVolObj); static virStorageVolObjPtr @@ -211,7 +211,7 @@ virStoragePoolObjOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virStoragePoolObj) +VIR_ONCE_GLOBAL_INIT(virStoragePoolObj); virStoragePoolObjPtr diff --git a/src/datatypes.c b/src/datatypes.c index caf035f178..09f63d9e15 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -109,7 +109,7 @@ virDataTypesOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virDataTypes) +VIR_ONCE_GLOBAL_INIT(virDataTypes); /** * virGetConnect: diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index a28d1353c1..27cc488f4b 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -59,7 +59,7 @@ virNetcfDriverStateOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetcfDriverState) +VIR_ONCE_GLOBAL_INIT(virNetcfDriverState); static virNetcfDriverStatePtr driver; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 73e988a3dc..0e08b8f0a2 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -66,7 +66,7 @@ static int libxlConfigOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(libxlConfig) +VIR_ONCE_GLOBAL_INIT(libxlConfig); static void libxlDriverConfigDispose(void *obj) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 3ada51f517..ffafa7967d 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -61,7 +61,7 @@ libxlDomainObjPrivateOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(libxlDomainObjPrivate) +VIR_ONCE_GLOBAL_INIT(libxlDomainObjPrivate); static int libxlDomainObjInitJob(libxlDomainObjPrivatePtr priv) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index cd33efa417..76bcb66a11 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -248,7 +248,7 @@ libxlMigrationDstArgsOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs) +VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs); static void libxlDoMigrateDstReceive(void *opaque) diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 272bb719ca..16c5ce0cf2 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -82,7 +82,7 @@ virLogHandlerOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virLogHandler) +VIR_ONCE_GLOBAL_INIT(virLogHandler); static void diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index c8fa8c4f44..4720c99793 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -51,7 +51,7 @@ static int virLXCConfigOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virLXCConfig) +VIR_ONCE_GLOBAL_INIT(virLXCConfig); /* Functions */ diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 0b18a14a89..6d3db9629a 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -57,7 +57,7 @@ static int virLXCMonitorOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virLXCMonitor) +VIR_ONCE_GLOBAL_INIT(virLXCMonitor); static void virLXCMonitorHandleEventExit(virNetClientProgramPtr prog, diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index aa86058113..b1e5f00067 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -97,7 +97,7 @@ udevEventDataOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(udevEventData) +VIR_ONCE_GLOBAL_INIT(udevEventData); static udevEventDataPtr udevEventDataNew(void) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 80b789b5e0..945b0d6746 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -140,7 +140,7 @@ static int qemuAgentOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(qemuAgent) +VIR_ONCE_GLOBAL_INIT(qemuAgent); #if DEBUG_RAW_IO diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 9b638b7ef6..f19d0d48b2 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -66,7 +66,7 @@ qemuBlockJobDataOnceInit(void) } -VIR_ONCE_GLOBAL_INIT(qemuBlockJobData) +VIR_ONCE_GLOBAL_INIT(qemuBlockJobData); static qemuBlockJobDataPtr qemuBlockJobDataNew(qemuBlockJobType type, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f504db7d05..fd2f232514 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -611,7 +611,7 @@ static int virQEMUCapsOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virQEMUCaps) +VIR_ONCE_GLOBAL_INIT(virQEMUCaps); static virArch virQEMUCapsArchFromString(const char *arch) { diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 8379b5a30d..2f5ef8d0c4 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -80,7 +80,7 @@ static int virQEMUConfigOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virQEMUConfig) +VIR_ONCE_GLOBAL_INIT(virQEMUConfig); static void diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 32a43f2064..95d8dcce7c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -155,7 +155,7 @@ qemuDomainOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(qemuDomain) +VIR_ONCE_GLOBAL_INIT(qemuDomain); static void qemuDomainLogContextDispose(void *obj) @@ -1050,7 +1050,7 @@ qemuDomainDiskPrivateOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(qemuDomainDiskPrivate) +VIR_ONCE_GLOBAL_INIT(qemuDomainDiskPrivate); static virObjectPtr qemuDomainDiskPrivateNew(void) @@ -1089,7 +1089,7 @@ qemuDomainStorageSourcePrivateOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(qemuDomainStorageSourcePrivate) +VIR_ONCE_GLOBAL_INIT(qemuDomainStorageSourcePrivate); virObjectPtr qemuDomainStorageSourcePrivateNew(void) @@ -1128,7 +1128,7 @@ qemuDomainVcpuPrivateOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(qemuDomainVcpuPrivate) +VIR_ONCE_GLOBAL_INIT(qemuDomainVcpuPrivate); static virObjectPtr qemuDomainVcpuPrivateNew(void) @@ -1168,7 +1168,7 @@ qemuDomainChrSourcePrivateOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(qemuDomainChrSourcePrivate) +VIR_ONCE_GLOBAL_INIT(qemuDomainChrSourcePrivate); static virObjectPtr qemuDomainChrSourcePrivateNew(void) @@ -1206,7 +1206,7 @@ qemuDomainVsockPrivateOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(qemuDomainVsockPrivate) +VIR_ONCE_GLOBAL_INIT(qemuDomainVsockPrivate); static virObjectPtr qemuDomainVsockPrivateNew(void) @@ -1246,7 +1246,7 @@ qemuDomainGraphicsPrivateOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(qemuDomainGraphicsPrivate) +VIR_ONCE_GLOBAL_INIT(qemuDomainGraphicsPrivate); static virObjectPtr qemuDomainGraphicsPrivateNew(void) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 15ef312356..a7c8a13298 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -165,7 +165,7 @@ static int qemuMonitorOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(qemuMonitor) +VIR_ONCE_GLOBAL_INIT(qemuMonitor); VIR_ENUM_IMPL(qemuMonitorMigrationStatus, diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index fc18e6a204..5906cdfa19 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -62,7 +62,7 @@ static int virKeepAliveOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virKeepAlive) +VIR_ONCE_GLOBAL_INIT(virKeepAlive); static virNetMessagePtr virKeepAliveMessage(virKeepAlivePtr ka, int proc) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index b7ffdcb05b..40d45b9d2a 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -124,7 +124,7 @@ static int virNetClientOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetClient) +VIR_ONCE_GLOBAL_INIT(virNetClient); static void virNetClientIOEventLoopPassTheBuck(virNetClientPtr client, virNetClientCallPtr thiscall); diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index 5e68122881..58f24145ec 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -58,7 +58,7 @@ static int virNetClientProgramOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetClientProgram) +VIR_ONCE_GLOBAL_INIT(virNetClientProgram); virNetClientProgramPtr virNetClientProgramNew(unsigned program, diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 1140b8dfa3..a17da31392 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -75,7 +75,7 @@ static int virNetClientStreamOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetClientStream) +VIR_ONCE_GLOBAL_INIT(virNetClientStream); static void diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index 833b78d7c0..0ca61c5a9a 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -113,7 +113,7 @@ virNetDaemonOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetDaemon) +VIR_ONCE_GLOBAL_INIT(virNetDaemon); virNetDaemonPtr diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index b4db5c40c6..f49340f033 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -66,7 +66,7 @@ static int virNetSASLContextOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetSASLContext) +VIR_ONCE_GLOBAL_INIT(virNetSASLContext); /* Apple have annotated all SASL functions as deprecated for * unknown reasons. Since they still work, lets just ignore diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 380ca6b302..83b871764f 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -96,7 +96,7 @@ static int virNetServerOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetServer) +VIR_ONCE_GLOBAL_INIT(virNetServer); unsigned long long virNetServerNextClientID(virNetServerPtr srv) { diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 2464319a49..410de253d2 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -131,7 +131,7 @@ static int virNetServerClientOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetServerClient) +VIR_ONCE_GLOBAL_INIT(virNetServerClient); static void virNetServerClientDispatchEvent(virNetSocketPtr sock, int events, void *opaque); diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 53f566ba53..7ae1d2e955 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -55,7 +55,7 @@ static int virNetServerProgramOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetServerProgram) +VIR_ONCE_GLOBAL_INIT(virNetServerProgram); virNetServerProgramPtr virNetServerProgramNew(unsigned program, diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 36c92c6714..97341d1546 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -59,7 +59,7 @@ static int virNetServerServiceOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetServerService) +VIR_ONCE_GLOBAL_INIT(virNetServerService); static void virNetServerServiceAccept(virNetSocketPtr sock, diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 4f7b6d59f7..bfa1952989 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -128,7 +128,7 @@ static int virNetSocketOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetSocket) +VIR_ONCE_GLOBAL_INIT(virNetSocket); #ifndef WIN32 diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 7bc6540641..72e9ed9eac 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -96,7 +96,7 @@ static int virNetTLSContextOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virNetTLSContext) +VIR_ONCE_GLOBAL_INIT(virNetTLSContext); static int diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1d81772a46..dd6089401c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -133,7 +133,7 @@ static int testDriverOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(testDriver) +VIR_ONCE_GLOBAL_INIT(testDriver); #define TEST_MODEL "i686" #define TEST_EMULATOR "/usr/bin/test-hv" diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c index c88a94112e..200577e18e 100644 --- a/src/util/virclosecallbacks.c +++ b/src/util/virclosecallbacks.c @@ -55,7 +55,7 @@ static int virCloseCallbacksOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virCloseCallbacks) +VIR_ONCE_GLOBAL_INIT(virCloseCallbacks); virCloseCallbacksPtr diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 9abd9ed3bf..81e20c9df0 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -58,7 +58,7 @@ virDevMapperOnceInit(void) } -VIR_ONCE_GLOBAL_INIT(virDevMapper) +VIR_ONCE_GLOBAL_INIT(virDevMapper); static int diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index d676bfda69..550f3179ae 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -643,7 +643,7 @@ static int dnsmasqCapsOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(dnsmasqCaps) +VIR_ONCE_GLOBAL_INIT(dnsmasqCaps); static void dnsmasqCapsSet(dnsmasqCapsPtr caps, diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index cff40bad25..1bc43e20a1 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -135,7 +135,7 @@ static int virFDStreamDataOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virFDStreamData) +VIR_ONCE_GLOBAL_INIT(virFDStreamData); static int diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index eb7dbd97cc..fa57e3d620 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -93,7 +93,7 @@ virFileCacheOnceInit(void) } -VIR_ONCE_GLOBAL_INIT(virFileCache) +VIR_ONCE_GLOBAL_INIT(virFileCache); static char * diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 53aab5dc0b..7c54825b75 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -97,7 +97,7 @@ virFirewallOnceInit(void) return virFirewallValidateBackend(currentBackend); } -VIR_ONCE_GLOBAL_INIT(virFirewall) +VIR_ONCE_GLOBAL_INIT(virFirewall); static bool iptablesUseLock; static bool ip6tablesUseLock; diff --git a/src/util/virhash.c b/src/util/virhash.c index 52722fc049..4fcdd61043 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -77,7 +77,7 @@ static int virHashAtomicOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virHashAtomic) +VIR_ONCE_GLOBAL_INIT(virHashAtomic); static uint32_t virHashStrCode(const void *name, uint32_t seed) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 880ca083d4..6be395cdda 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -124,7 +124,7 @@ static int virHostdevManagerOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virHostdevManager) +VIR_ONCE_GLOBAL_INIT(virHostdevManager); static void virHostdevManagerDispose(void *obj) diff --git a/src/util/viridentity.c b/src/util/viridentity.c index e7637b5f20..4ceff3cb74 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -67,7 +67,7 @@ static int virIdentityOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virIdentity) +VIR_ONCE_GLOBAL_INIT(virIdentity); /** * virIdentityGetCurrent: diff --git a/src/util/virlog.c b/src/util/virlog.c index 3ee58c5db6..561a79528c 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -297,7 +297,7 @@ virLogOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virLog) +VIR_ONCE_GLOBAL_INIT(virLog); /** diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 4ecf7a8973..756e9f9c98 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -65,7 +65,7 @@ virMediatedOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virMediated) +VIR_ONCE_GLOBAL_INIT(virMediated); #ifdef __linux__ diff --git a/src/util/virpci.c b/src/util/virpci.c index 08fbcf1e46..2248a12610 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -202,7 +202,7 @@ static int virPCIOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virPCI) +VIR_ONCE_GLOBAL_INIT(virPCI); static char * diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index db95a601c7..44462e5f88 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -91,7 +91,7 @@ virPortAllocatorOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virPortAllocator) +VIR_ONCE_GLOBAL_INIT(virPortAllocator); virPortAllocatorRangePtr virPortAllocatorRangeNew(const char *name, diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index a9eae5192a..332aabb0fa 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -439,7 +439,7 @@ virResctrlOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virResctrl) +VIR_ONCE_GLOBAL_INIT(virResctrl); /* Common functions */ diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 32d249ad5c..715064d669 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -84,7 +84,7 @@ virSCSIOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virSCSI) +VIR_ONCE_GLOBAL_INIT(virSCSI); static int virSCSIDeviceGetAdapterId(const char *adapter, diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index ce44079357..62b3e99cea 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -73,7 +73,7 @@ virSCSIVHostOnceInit(void) } -VIR_ONCE_GLOBAL_INIT(virSCSIVHost) +VIR_ONCE_GLOBAL_INIT(virSCSIVHost); int diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefilebackend.c index 72cf3d1d16..9acaea2f81 100644 --- a/src/util/virstoragefilebackend.c +++ b/src/util/virstoragefilebackend.c @@ -83,7 +83,7 @@ static int virStorageFileBackendOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virStorageFileBackend) +VIR_ONCE_GLOBAL_INIT(virStorageFileBackend); int virStorageFileBackendRegister(virStorageFileBackendPtr backend) diff --git a/src/util/virthread.h b/src/util/virthread.h index 6af4492d42..d15dfc6a2d 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -181,7 +181,7 @@ int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK; * * Then invoking the macro: * - * VIR_ONCE_GLOBAL_INIT(virMyObject) + * VIR_ONCE_GLOBAL_INIT(virMyObject); * * Will create a method * @@ -211,6 +211,6 @@ int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK; } \ \ return 0; \ - } + } \ #endif /* LIBVIRT_VIRTHREAD_H */ diff --git a/src/util/virthreadjob.c b/src/util/virthreadjob.c index 8f87ae6039..2c6f45fd51 100644 --- a/src/util/virthreadjob.c +++ b/src/util/virthreadjob.c @@ -42,7 +42,7 @@ virThreadJobOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virThreadJob) +VIR_ONCE_GLOBAL_INIT(virThreadJob); const char * diff --git a/src/util/virusb.c b/src/util/virusb.c index 263712c323..3f74aa1283 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -79,7 +79,7 @@ static int virUSBOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(virUSB) +VIR_ONCE_GLOBAL_INIT(virUSB); static int virUSBSysReadFile(const char *f_name, const char *d_name, int base, unsigned int *value) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 7e9ef932dc..a4af78fbd4 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -161,7 +161,7 @@ static int vzDriverOnceInit(void) return 0; } -VIR_ONCE_GLOBAL_INIT(vzDriver) +VIR_ONCE_GLOBAL_INIT(vzDriver); vzDriverPtr vzGetDriverConnection(void) diff --git a/tests/virfilecachetest.c b/tests/virfilecachetest.c index 82c2286752..08062d66e3 100644 --- a/tests/virfilecachetest.c +++ b/tests/virfilecachetest.c @@ -57,7 +57,7 @@ testFileCacheObjOnceInit(void) } -VIR_ONCE_GLOBAL_INIT(testFileCacheObj) +VIR_ONCE_GLOBAL_INIT(testFileCacheObj); static testFileCacheObjPtr