maint: define a macro for IPv4 loopback address

Use a macro instead of hardcoding "127.0.0.1" throughout the
sources.

diff --git a/src/internal.h b/src/internal.h
index 9e7ef553d7f065d8c144797a2aa0c5b7bf1e1f17..03a973ccddd533997d9ca4b11bc03b1fddc6e016 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -79,6 +79,8 @@
 #  define INET_ADDRSTRLEN 16
 # endif
 
+# define VIR_LOOPBACK_IPV4_ADDR "127.0.0.1"
+
 /* String equality tests, suggested by Jim Meyering. */
 # define STREQ(a, b) (strcmp(a, b) == 0)
 # define STRCASEEQ(a, b) (c_strcasecmp(a, b) == 0)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 1b704daa50d94128ed3a85aec30932ae59454498..19ddf787dc88c3f137c87af44e89dc567e54ff21 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -250,10 +250,10 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
                    SYSCONFDIR "/pki/qemu") < 0)
         goto error;
 
-    if (VIR_STRDUP(cfg->vncListen, "127.0.0.1") < 0)
+    if (VIR_STRDUP(cfg->vncListen, VIR_LOOPBACK_IPV4_ADDR) < 0)
         goto error;
 
-    if (VIR_STRDUP(cfg->spiceListen, "127.0.0.1") < 0)
+    if (VIR_STRDUP(cfg->spiceListen, VIR_LOOPBACK_IPV4_ADDR) < 0)
         goto error;
 
     /*

diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 41f75d5c2434446f1b0d846f1df2f110cb341b2a..9dffbc7360866147a437966ec63d6bd5b6fb280a 100644 (file)
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -383,11 +383,11 @@ virSocketAddrFormatFull(const virSocketAddr *addr,
      * nicely for UNIX sockets */
     if (addr->data.sa.sa_family == AF_UNIX) {
         if (withService) {
-            if (virAsprintf(&addrstr, "127.0.0.1%s0",
+            if (virAsprintf(&addrstr, VIR_LOOPBACK_IPV4_ADDR"%s0",
                             separator ? separator : ":") < 0)
                 goto error;
         } else {
-            if (VIR_STRDUP(addrstr, "127.0.0.1") < 0)
+            if (VIR_STRDUP(addrstr, VIR_LOOPBACK_IPV4_ADDR) < 0)
                 goto error;
         }
         return addrstr;

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 4d2c6b0f1ed0b844257a8455a5df7fa394c24723..4fab3b9bf7108b3b3a7a4a5ffc514aae0c32fe7f 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -3084,7 +3084,7 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom,
 
     glisten = virDomainGraphicsGetListen(gr, 0);
     pret = PrlVmCfg_SetVNCHostName(sdkdom, glisten && glisten->address ?
-                                           glisten->address : "127.0.0.1");
+                                           glisten->address : VIR_LOOPBACK_IPV4_ADDR);
     prlsdkCheckRetGoto(pret, cleanup);
 
     ret = 0;