From: Ján Tomko <jtomko@redhat.com>
Date: Sat, 22 Feb 2020 12:02:18 +0000 (+0100)
Subject: libxl: conf: move default keepalive settings to libxlDriverConfigNew
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=af0d94468c7c20a8bc2ad92f8188da93908d24f3;p=libvirt.git

libxl: conf: move default keepalive settings to libxlDriverConfigNew

These hardcoded defaults do not need to be read from
the file. Move them out of libxlDriverConfigLoadFile.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
---

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 56deca7b7c..9c722342ba 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1763,6 +1763,10 @@ libxlDriverConfigNew(void)
         goto error;
     cfg->firmwares[cfg->nfirmwares - 1]->name = g_strdup(LIBXL_FIRMWARE_DIR "/hvmloader");
 
+    /* defaults for keepalive messages */
+    cfg->keepAliveInterval = 5;
+    cfg->keepAliveCount = 5;
+
     return cfg;
 
  error:
@@ -1786,10 +1790,6 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg,
 {
     g_autoptr(virConf) conf = NULL;
 
-    /* defaults for keepalive messages */
-    cfg->keepAliveInterval = 5;
-    cfg->keepAliveCount = 5;
-
     /* Check the file is readable before opening it, otherwise
      * libvirt emits an error.
      */