[PATCH 1/6] libxl: Drop unused 'cfg' parameter from libxlDomainSaveImageOpen

[Jim Fehlig]

Signed-off-by: Jim Fehlig <jfeh...@suse.com>
---
 src/libxl/libxl_domain.c | 4 +---
 src/libxl/libxl_domain.h | 3 +--
 src/libxl/libxl_driver.c | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index af20434843..336b67b129 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -764,7 +764,6 @@ libxlDomainManagedSavePath(libxlDriverPrivate *driver, 
virDomainObj *vm)
  */
 int
 libxlDomainSaveImageOpen(libxlDriverPrivate *driver,
-                         libxlDriverConfig *cfg G_GNUC_UNUSED,
                          const char *from,
                          virDomainDef **ret_def,
                          libxlSavefileHeader *ret_hdr)
@@ -1260,8 +1259,7 @@ libxlDomainStart(libxlDriverPrivate *driver,
 
         if (virFileExists(managed_save_path)) {
 
-            managed_save_fd = libxlDomainSaveImageOpen(driver, cfg,
-                                                       managed_save_path,
+            managed_save_fd = libxlDomainSaveImageOpen(driver, 
managed_save_path,
                                                        &def, &hdr);
             if (managed_save_fd < 0)
                 goto cleanup;
diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h
index 928ee8f5cd..526c8e7332 100644
--- a/src/libxl/libxl_domain.h
+++ b/src/libxl/libxl_domain.h
@@ -103,11 +103,10 @@ libxlDomainManagedSavePath(libxlDriverPrivate *driver,
 
 int
 libxlDomainSaveImageOpen(libxlDriverPrivate *driver,
-                         libxlDriverConfig *cfg,
                          const char *from,
                          virDomainDef **ret_def,
                          libxlSavefileHeader *ret_hdr)
-    ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5);
+    ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
 
 int
 libxlDomainDestroyInternal(libxlDriverPrivate *driver,
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index c97b2fb485..838747a1e3 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1942,7 +1942,6 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char 
*from,
                         const char *dxml, unsigned int flags)
 {
     libxlDriverPrivate *driver = conn->privateData;
-    libxlDriverConfig *cfg = libxlDriverConfigGet(driver);
     virDomainObj *vm = NULL;
     virDomainDef *def = NULL;
     libxlSavefileHeader hdr;
@@ -1961,7 +1960,7 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char 
*from,
         return -1;
     }
 
-    fd = libxlDomainSaveImageOpen(driver, cfg, from, &def, &hdr);
+    fd = libxlDomainSaveImageOpen(driver, from, &def, &hdr);
     if (fd < 0)
         goto cleanup;
 
@@ -1995,7 +1994,6 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char 
*from,
         virReportSystemError(errno, "%s", _("cannot close file"));
     virDomainDefFree(def);
     virDomainObjEndAPI(&vm);
-    virObjectUnref(cfg);
     return ret;
 }
 
-- 
2.31.1