qemuDomainOpenFile: Take @cfg instead of driver

Again, we don't need full driver, just its config.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Tested-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 71e626a8e6339a6e1d69f344946ea9693c31acc2..9baa4b5d90f21ebc11d360ee73cfce16754e7c3b 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11511,7 +11511,7 @@ virQEMUFileOpenAs(uid_t fallback_uid,
 
 /**
  * qemuDomainOpenFile:
- * @driver: driver object
+ * @cfg: driver config object
  * @def: domain definition
  * @path: path to file to open
  * @oflags: flags for opening/creation of the file
@@ -11526,13 +11526,12 @@ virQEMUFileOpenAs(uid_t fallback_uid,
  * qemuDomainStorageFileInit and storage driver APIs if possible.
  **/
 int
-qemuDomainOpenFile(virQEMUDriver *driver,
+qemuDomainOpenFile(virQEMUDriverConfig *cfg,
                    const virDomainDef *def,
                    const char *path,
                    int oflags,
                    bool *needUnlink)
 {
-    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     uid_t user = cfg->user;
     gid_t group = cfg->group;
     bool dynamicOwnership = cfg->dynamicOwnership;

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index d2c69058930d8556d2227eb6a663f157e6304095..abc3c7158d89fbb973d475dfee13cc26ae470436 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -1047,7 +1047,7 @@ int virQEMUFileOpenAs(uid_t fallback_uid,
                       bool *needUnlink);
 
 int
-qemuDomainOpenFile(virQEMUDriver *driver,
+qemuDomainOpenFile(virQEMUDriverConfig *cfg,
                    const virDomainDef *def,
                    const char *path,
                    int oflags,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d432c69dae973bca699728af0ae668a9e72a3bc9..ed3af5a619c108af8d17779772af3b809c3d9c63 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10808,7 +10808,7 @@ qemuDomainMemoryPeek(virDomainPtr dom,
  * reported) or -1 otherwise (errors are reported).
  */
 static int
-qemuDomainStorageOpenStat(virQEMUDriver *driver,
+qemuDomainStorageOpenStat(virQEMUDriver *driver G_GNUC_UNUSED,
                           virQEMUDriverConfig *cfg,
                           virDomainObj *vm,
                           virStorageSource *src,
@@ -10820,7 +10820,7 @@ qemuDomainStorageOpenStat(virQEMUDriver *driver,
         if (skipInaccessible && !virFileExists(src->path))
             return 0;
 
-        if ((*ret_fd = qemuDomainOpenFile(driver, vm->def, src->path, O_RDONLY,
+        if ((*ret_fd = qemuDomainOpenFile(cfg, vm->def, src->path, O_RDONLY,
                                           NULL)) < 0)
             return -1;
 

diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index f93454c761260d2a104ffcac1220676a66d5afc7..e14e2987f1ca231a4bca93c7368d955e5b30cf6f 100644 (file)
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -313,7 +313,7 @@ qemuSaveImageCreate(virQEMUDriver *driver,
     if (qemuDomainFileWrapperFDClose(vm, wrapperFd) < 0)
         goto cleanup;
 
-    if ((fd = qemuDomainOpenFile(driver, vm->def, path, O_WRONLY, NULL)) < 0 ||
+    if ((fd = qemuDomainOpenFile(cfg, vm->def, path, O_WRONLY, NULL)) < 0 ||
         virQEMUSaveDataFinish(data, &fd, path) < 0)
         goto cleanup;
 
@@ -440,6 +440,7 @@ qemuSaveImageOpen(virQEMUDriver *driver,
                   bool open_write,
                   bool unlink_corrupt)
 {
+    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     VIR_AUTOCLOSE fd = -1;
     int ret = -1;
     g_autoptr(virQEMUSaveData) data = NULL;
@@ -459,7 +460,7 @@ qemuSaveImageOpen(virQEMUDriver *driver,
         oflags |= directFlag;
     }
 
-    if ((fd = qemuDomainOpenFile(driver, NULL, path, oflags, NULL)) < 0)
+    if ((fd = qemuDomainOpenFile(cfg, NULL, path, oflags, NULL)) < 0)
         return -1;
 
     if (bypass_cache &&