maint: avoid static zero init in helpers

C guarantees that static variables are zero-initialized.  Some older
compilers (and also gcc -fno-zero-initialized-in-bss) create larger
binaries if you explicitly zero-initialize a static variable.

* src/conf/nwfilter_conf.c: Fix initialization.
* src/cpu/cpu_x86.c: Likewise.
* src/interface/interface_backend_netcf.c: Likewise.
* src/locking/lock_daemon.c: Likewise.
* src/locking/lock_driver_lockd.c: Likewise.
* src/locking/lock_driver_sanlock.c: Likewise.
* src/network/bridge_driver.c: Likewise.
* src/node_device/node_device_udev.c: Likewise.
* src/nwfilter/nwfilter_learnipaddr.c: Likewise.
* src/rpc/virnetserver.c: Likewise.
* src/security/security_selinux.c
(virSecuritySELinuxGenSecurityLabel): Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 0a0265dec160ca521b5d327c6bcda3435cf2b6aa..4b22709143c0417995e97afbc75c4c738bfe3468 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -144,7 +144,7 @@ static const struct int_map chain_priorities[] = {
  * only one filter update allowed
  */
 static virRWLock updateLock;
-static bool initialized = false;
+static bool initialized;
 
 void
 virNWFilterReadLockFilterUpdates(void)

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 57f343c6025663a13e40c913b2a63906d6bea998..026b54e0d46a79b127d727aa246c1d50c6036ff5 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -92,7 +92,7 @@ struct x86_map {
     struct x86_feature *migrate_blockers;
 };
 
-static struct x86_map* virCPUx86Map = NULL;
+static struct x86_map* virCPUx86Map;
 int virCPUx86MapOnceInit(void);
 VIR_ONCE_GLOBAL_INIT(virCPUx86Map);
 

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index c55a080082f924f0877e48e1cc09e53bc8482782..a4b2ea96d7adb86da9839a2bc10e804e17d3719e 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -63,7 +63,7 @@ virNetcfDriverStateOnceInit(void)
 
 VIR_ONCE_GLOBAL_INIT(virNetcfDriverState)
 
-static virNetcfDriverStatePtr driverState = NULL;
+static virNetcfDriverStatePtr driverState;
 
 
 static void

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index fe7cfb87a36f2cd8c19b2f61584d9aee9d126b49..75244e88e9c1f2327b826b343a60830325042a4a 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -67,7 +67,7 @@ struct _virLockDaemon {
 
 virLockDaemonPtr lockDaemon = NULL;
 
-static bool execRestart = false;
+static bool execRestart;
 
 enum {
     VIR_LOCK_DAEMON_ERR_NONE = 0,

diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 0a40e94cb33c611bb08a72bae7f3f62d106cd671..a642122cfdd5f0f1c919c437fd210fcfc9cf129c 100644 (file)
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -1,7 +1,7 @@
 /*
  * lock_driver_lockd.c: A lock driver which locks nothing
  *
- * Copyright (C) 2010-2011 Red Hat, Inc.
+ * Copyright (C) 2010-2011, 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -79,7 +79,7 @@ struct _virLockManagerLockDaemonDriver {
     char *scsiLockSpaceDir;
 };
 
-static virLockManagerLockDaemonDriverPtr driver = NULL;
+static virLockManagerLockDaemonDriverPtr driver;
 
 static int virLockManagerLockDaemonLoadConfig(const char *configFile)
 {

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index aa6b8fb189ebcbfb05c0bdd8c11d47287c4e18b0..0318f2586cfd0b7efd7df58ba38ff7f3d822a160 100644 (file)
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -79,7 +79,7 @@ struct _virLockManagerSanlockDriver {
     gid_t group;
 };
 
-static virLockManagerSanlockDriver *driver = NULL;
+static virLockManagerSanlockDriver *driver;
 
 struct _virLockManagerSanlockPrivate {
     const char *vm_uri;

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 5f2e7780bff0e27dd8e1479bf969e51dc085c3f3..10ded33d328dbbbbab99a01c3d279727fff807f3 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -126,7 +126,7 @@ static int networkUnplugBandwidth(virNetworkObjPtr net,
 static void networkNetworkObjTaint(virNetworkObjPtr net,
                                    virNetworkTaintFlags taint);
 
-static virNetworkDriverStatePtr driverState = NULL;
+static virNetworkDriverStatePtr driverState;
 
 static virNetworkObjPtr
 networkObjFromNetwork(virNetworkPtr net)

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 53792f0ecef89f4131eb22fb7814443fce5edf5c..f580a9b6b454651eb0df84d9cb3fd7f1e6f8e6b2 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -56,7 +56,7 @@ struct _udevPrivate {
     bool privileged;
 };
 
-static virNodeDeviceDriverStatePtr driverState = NULL;
+static virNodeDeviceDriverStatePtr driverState;
 
 static int udevStrToLong_ull(char const *s,
                              char **end_ptr,

diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index 4cea9cf0486253c58cf800e19440c1426b5ea0f3..911079e1a32d60726ba6537cf9900377e073ae3e 100644 (file)
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -134,7 +134,7 @@ struct _virNWFilterIfaceLock {
 };
 
 
-static bool threadsTerminate = false;
+static bool threadsTerminate;
 
 
 int

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 762c1855faaf54dbebed8ebe4e127182997675c4..3d3e422fb3cd22cbb04269374a23f463678edf93 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -817,8 +817,8 @@ void virNetServerRemoveShutdownInhibition(virNetServerPtr srv)
 
 
 
-static sig_atomic_t sigErrors = 0;
-static int sigLastErrno = 0;
+static sig_atomic_t sigErrors;
+static int sigLastErrno;
 static int sigWrite = -1;
 
 static void

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 352f1abaa1f8dbe011bb028296249cd0eb6e9c0e..f96be50777b21624297b7110237964f5f92e16c2 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -641,7 +641,7 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr,
         if (!baselabel) {
             if (def->virtType == VIR_DOMAIN_VIRT_QEMU) {
                 if (data->alt_domain_context == NULL) {
-                    static bool warned = false;
+                    static bool warned;
                     if (!warned) {
                         VIR_WARN("SELinux policy does not define a domain type for QEMU TCG. "
                                  "Guest startup may be denied due to missing 'execmem' privilege "