qemuBuildCommandLine: Convert 'standalone' flag to use 'flags'

Introduce 'qemuBuildCommandLineFlags' and use it instead of specific
flag booleans.

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 a55adda4e5fac8ad35efa734af636048f6246e9c..facb942485fefb348cdb731425c5779ba679ab31 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10436,7 +10436,6 @@ qemuBuildCommandLine(virQEMUDriver *driver,
                      const char *migrateURI,
                      virDomainMomentObj *snapshot,
                      virNetDevVPortProfileOp vmop,
-                     bool standalone,
                      bool enableFips,
                      size_t *nnicindexes,
                      int **nicindexes,
@@ -10484,7 +10483,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
 
     qemuBuildCompatDeprecatedCommandLine(cmd, cfg, def, qemuCaps);
 
-    if (!standalone)
+    if (!(flags & QEMU_BUILD_COMMAND_LINE_CPUS_RUNNING))
         virCommandAddArg(cmd, "-S"); /* freeze CPU */
 
     if (qemuBuildMasterKeyCommandLine(cmd, priv) < 0)

diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 9e8eef1e2933588a24bc8fb3c94b99fa53d52905..df46e80067fd799a12e0c42e938fdbbb1a4378b2 100644 (file)
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -43,12 +43,15 @@
 VIR_ENUM_DECL(qemuVideo);
 VIR_ENUM_DECL(qemuSoundCodec);
 
+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 standalone,
                                    bool enableFips,
                                    size_t *nnicindexes,
                                    int **nicindexes,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 702fd0239c842ca6af7f7538a07a559400983fa3..4f6b29585973277e3b8ca6198bdb397d8d9fe354 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6330,6 +6330,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
     virQEMUDriver *driver = conn->privateData;
     virDomainObj *vm = NULL;
     g_autoptr(virCommand) cmd = NULL;
+    unsigned int commandlineflags = QEMU_BUILD_COMMAND_LINE_CPUS_RUNNING;
     char *ret = NULL;
     size_t i;
 
@@ -6383,7 +6384,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
         goto cleanup;
 
     if (!(cmd = qemuProcessCreatePretendCmdBuild(driver, vm, NULL,
-                                                 qemuCheckFips(vm), true)))
+                                                 qemuCheckFips(vm),
+                                                 commandlineflags)))
         goto cleanup;
 
     ret = virCommandToString(cmd, false);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 07e467d01e1aed91fed78d0c4561753156d9703e..38079ce159b5cc96d38aed6f926dbff5f2127165 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7450,7 +7450,6 @@ qemuProcessLaunch(virConnectPtr conn,
                                      vm,
                                      incoming ? "defer" : NULL,
                                      snapshot, vmop,
-                                     false,
                                      qemuCheckFips(vm),
                                      &nnicindexes, &nicindexes, 0)))
         goto cleanup;
@@ -7952,7 +7951,7 @@ qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver,
                                  virDomainObj *vm,
                                  const char *migrateURI,
                                  bool enableFips,
-                                 bool standalone)
+                                 unsigned int flags)
 {
     VIR_DEBUG("Building emulator command line");
     return qemuBuildCommandLine(driver,
@@ -7960,11 +7959,10 @@ qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver,
                                 migrateURI,
                                 NULL,
                                 VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,
-                                standalone,
                                 enableFips,
                                 NULL,
                                 NULL,
-                                0);
+                                flags);
 }
 
 

diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index f81bfd930a6cb27a2a25ff6fa85c84742397b4a7..fa3634c64fe7ab517c50d4a98c9e2111df64993e 100644 (file)
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -98,10 +98,10 @@ int qemuProcessCreatePretendCmdPrepare(virQEMUDriver *driver,
                                        unsigned int flags);
 
 virCommand *qemuProcessCreatePretendCmdBuild(virQEMUDriver *driver,
-                                               virDomainObj *vm,
-                                               const char *migrateURI,
-                                               bool enableFips,
-                                               bool standalone);
+                                             virDomainObj *vm,
+                                             const char *migrateURI,
+                                             bool enableFips,
+                                             unsigned int flags);
 
 int qemuProcessInit(virQEMUDriver *driver,
                     virDomainObj *vm,

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 363edc763ed5229f0898b8b00c8e30ff2d09e8a2..ee5de55e211a39ea9f3d25171cc1c199c8117097 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -488,7 +488,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
         enableFips = false;
 
     return qemuProcessCreatePretendCmdBuild(drv, vm, migrateURI,
-                                            enableFips, false);
+                                            enableFips, 0);
 }