qemuSaveImageCreateFd: Remove 'driver' argument

We pass in 'vm' which contains it in the private data.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index c5620c82c53ce1f887ba7a78d5b5207d2a12f510..a2e760c462efdb2ce06874a1dcc2ed93918917f2 100644 (file)
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -427,15 +427,15 @@ qemuSaveImageDecompressionStop(virCommand *cmd,
 
 
 static int
-qemuSaveImageCreateFd(virQEMUDriver *driver,
-                      virDomainObj *vm,
+qemuSaveImageCreateFd(virDomainObj *vm,
                       const char *path,
                       virFileWrapperFd **wrapperFd,
                       bool sparse,
                       bool *needUnlink,
                       unsigned int flags)
 {
-    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+    qemuDomainObjPrivate *priv = vm->privateData;
+    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver);
     int ret = -1;
     VIR_AUTOCLOSE fd = -1;
     int directFlag = 0;
@@ -458,7 +458,7 @@ qemuSaveImageCreateFd(virQEMUDriver *driver,
     if (fd < 0)
         return -1;
 
-    if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) < 0)
+    if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def, fd) < 0)
         return -1;
 
     if (!sparse && !(*wrapperFd = virFileWrapperFdNew(&fd, path, wrapperFlags)))
@@ -492,7 +492,7 @@ qemuSaveImageCreate(virQEMUDriver *driver,
     bool sparse = data->header.format == QEMU_SAVE_FORMAT_SPARSE;
 
     /* Obtain the file handle.  */
-    fd = qemuSaveImageCreateFd(driver, vm, path, &wrapperFd, sparse, &needUnlink, flags);
+    fd = qemuSaveImageCreateFd(vm, path, &wrapperFd, sparse, &needUnlink, flags);
 
     if (fd < 0)
         goto cleanup;