qemuDomainOpenFile: Take virDomainDef instead of virDomainObj

The function doesn't really need domain object, but domain
definition from which it takes seclabels.

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 a05ebf871d6e89fbeee6cd34f0b8932fea28ade8..71e626a8e6339a6e1d69f344946ea9693c31acc2 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11512,7 +11512,7 @@ virQEMUFileOpenAs(uid_t fallback_uid,
 /**
  * qemuDomainOpenFile:
  * @driver: driver object
- * @vm: domain object
+ * @def: domain definition
  * @path: path to file to open
  * @oflags: flags for opening/creation of the file
  * @needUnlink: set to true if file was created by this function
@@ -11527,7 +11527,7 @@ virQEMUFileOpenAs(uid_t fallback_uid,
  **/
 int
 qemuDomainOpenFile(virQEMUDriver *driver,
-                   virDomainObj *vm,
+                   const virDomainDef *def,
                    const char *path,
                    int oflags,
                    bool *needUnlink)
@@ -11539,8 +11539,8 @@ qemuDomainOpenFile(virQEMUDriver *driver,
     virSecurityLabelDef *seclabel;
 
     /* TODO: Take imagelabel into account? */
-    if (vm &&
-        (seclabel = virDomainDefGetSecurityLabelDef(vm->def, "dac")) != NULL &&
+    if (def &&
+        (seclabel = virDomainDefGetSecurityLabelDef(def, "dac")) != NULL &&
         seclabel->label != NULL &&
         (virParseOwnershipIds(seclabel->label, &user, &group) < 0))
         return -EINVAL;

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

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a7d76dd00f30c6f9b3beb156082a62e9359eae7f..d432c69dae973bca699728af0ae668a9e72a3bc9 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10820,7 +10820,7 @@ qemuDomainStorageOpenStat(virQEMUDriver *driver,
         if (skipInaccessible && !virFileExists(src->path))
             return 0;
 
-        if ((*ret_fd = qemuDomainOpenFile(driver, vm, src->path, O_RDONLY,
+        if ((*ret_fd = qemuDomainOpenFile(driver, 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 b4af80f9421689394dc2ae39ceee98d4b8566e6f..f93454c761260d2a104ffcac1220676a66d5afc7 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, path, O_WRONLY, NULL)) < 0 ||
+    if ((fd = qemuDomainOpenFile(driver, vm->def, path, O_WRONLY, NULL)) < 0 ||
         virQEMUSaveDataFinish(data, &fd, path) < 0)
         goto cleanup;