qemuBuildCommandLine: Remove 'driver' argument

We pass 'vm' which already contains it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d6c65257d1adef7bed6b8f3fb533c19afebd80f3..751daf20d30a152f48062f9ffc9b2fbae5b774c7 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10421,8 +10421,7 @@ qemuBuildCompatDeprecatedCommandLine(virCommand *cmd,
  * for a given virtual machine.
  */
 virCommand *
-qemuBuildCommandLine(virQEMUDriver *driver,
-                     virDomainObj *vm,
+qemuBuildCommandLine(virDomainObj *vm,
                      const char *migrateURI,
                      virDomainMomentObj *snapshot,
                      virNetDevVPortProfileOp vmop,
@@ -10434,8 +10433,9 @@ qemuBuildCommandLine(virQEMUDriver *driver,
     size_t i;
     char uuid[VIR_UUID_STRING_BUFLEN];
     g_autoptr(virCommand) cmd = NULL;
-    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     qemuDomainObjPrivate *priv = vm->privateData;
+    virQEMUDriver *driver = priv->driver;
+    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     virDomainDef *def = vm->def;
     virQEMUCaps *qemuCaps = priv->qemuCaps;
 

diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index df46e80067fd799a12e0c42e938fdbbb1a4378b2..db5b532cb81d4ce9cebada69b50cb236f6ca7701 100644 (file)
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -47,15 +47,14 @@ typedef enum {
     QEMU_BUILD_COMMAND_LINE_CPUS_RUNNING = 1 << 0,
 } qemuBuildCommandLineFlags;
 
-virCommand *qemuBuildCommandLine(virQEMUDriver *driver,
-                                   virDomainObj *vm,
-                                   const char *migrateURI,
-                                   virDomainMomentObj *snapshot,
-                                   virNetDevVPortProfileOp vmop,
-                                   bool enableFips,
-                                   size_t *nnicindexes,
-                                   int **nicindexes,
-                                   unsigned int flags);
+virCommand *qemuBuildCommandLine(virDomainObj *vm,
+                                 const char *migrateURI,
+                                 virDomainMomentObj *snapshot,
+                                 virNetDevVPortProfileOp vmop,
+                                 bool enableFips,
+                                 size_t *nnicindexes,
+                                 int **nicindexes,
+                                 unsigned int flags);
 
 /* Generate the object properties for pr-manager */
 virJSONValue *qemuBuildPRManagerInfoProps(virStorageSource *src);

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b862208327890907b338e08472f91a61000c3e13..8097dcf144fd56aa6dc77506686cdf7d3721f14b 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6391,7 +6391,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
     if (qemuConnectDomainXMLToNativePrepareHost(vm) < 0)
         return NULL;
 
-    if (!(cmd = qemuProcessCreatePretendCmdBuild(driver, vm, NULL,
+    if (!(cmd = qemuProcessCreatePretendCmdBuild(vm, NULL,
                                                  qemuCheckFips(vm),
                                                  commandlineflags)))
         return NULL;

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 1098c3bf93b834c30d27897977570700b90073e1..fbad1254a06f36d16b14d24beb3e480dcaa57696 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7445,8 +7445,7 @@ qemuProcessLaunch(virConnectPtr conn,
     if (qemuExtDevicesStart(driver, vm, incoming != NULL) < 0)
         goto cleanup;
 
-    if (!(cmd = qemuBuildCommandLine(driver,
-                                     vm,
+    if (!(cmd = qemuBuildCommandLine(vm,
                                      incoming ? "defer" : NULL,
                                      snapshot, vmop,
                                      qemuCheckFips(vm),
@@ -7946,14 +7945,12 @@ qemuProcessCreatePretendCmdPrepare(virQEMUDriver *driver,
 
 
 virCommand *
-qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver,
-                                 virDomainObj *vm,
+qemuProcessCreatePretendCmdBuild(virDomainObj *vm,
                                  const char *migrateURI,
                                  bool enableFips,
                                  unsigned int flags)
 {
-    return qemuBuildCommandLine(driver,
-                                vm,
+    return qemuBuildCommandLine(vm,
                                 migrateURI,
                                 NULL,
                                 VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,

diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index fa3634c64fe7ab517c50d4a98c9e2111df64993e..9856da3bb5df81ed1f5f5cb3201fd4c3b592595f 100644 (file)
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -97,8 +97,7 @@ int qemuProcessCreatePretendCmdPrepare(virQEMUDriver *driver,
                                        const char *migrateURI,
                                        unsigned int flags);
 
-virCommand *qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver,
-                                             virDomainObj *vm,
+virCommand *qemuProcessCreatePretendCmdBuild(virDomainObj *vm,
                                              const char *migrateURI,
                                              bool enableFips,
                                              unsigned int flags);

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index c6d175939e84a01162003eebc2e96b9291f5fe3b..967e575327b2025322c367b6d1c1a02865f59823 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -490,7 +490,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
     if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ENABLE_FIPS))
         enableFips = false;
 
-    return qemuProcessCreatePretendCmdBuild(drv, vm, migrateURI,
+    return qemuProcessCreatePretendCmdBuild(vm, migrateURI,
                                             enableFips, 0);
 }