]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Pass async job to qemuProcessInit
authorJiri Denemark <jdenemar@redhat.com>
Thu, 28 Jan 2016 14:56:07 +0000 (15:56 +0100)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 19 Feb 2016 14:41:57 +0000 (15:41 +0100)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
src/qemu/qemu_migration.c
src/qemu/qemu_process.c
src/qemu/qemu_process.h

index 39e0e800ab12d18489a0432d597e234ea4fa84d6..891de989477ed55e33539324d768cea791eb2c81 100644 (file)
@@ -3462,7 +3462,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
         goto stopjob;
     }
 
-    if (qemuProcessInit(driver, vm, true, false) < 0)
+    if (qemuProcessInit(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN,
+                        true, false) < 0)
         goto stopjob;
     stopProcess = true;
 
index eaf9fea7daf0ffa6f211c12af9e35ecd82329530..bc53c44524b24608fc7034a8586ff374751cda93 100644 (file)
@@ -4325,6 +4325,7 @@ qemuProcessStartValidate(virDomainDefPtr def,
 int
 qemuProcessInit(virQEMUDriverPtr driver,
                 virDomainObjPtr vm,
+                qemuDomainAsyncJob asyncJob ATTRIBUTE_UNUSED,
                 bool migration,
                 bool snap)
 {
@@ -5318,7 +5319,7 @@ qemuProcessStart(virConnectPtr conn,
                       VIR_QEMU_PROCESS_START_PAUSED |
                       VIR_QEMU_PROCESS_START_AUTODESTROY, cleanup);
 
-    if (qemuProcessInit(driver, vm, !!migrateFrom, !!snapshot) < 0)
+    if (qemuProcessInit(driver, vm, asyncJob, !!migrateFrom, !!snapshot) < 0)
         goto cleanup;
 
     if (migrateFrom) {
index a1c33f4eb04eeccab65dd43913dfbaf7fae2df8c..b16919d339d0a85dfd18a2717ee7b149b264643e 100644 (file)
@@ -89,6 +89,7 @@ int qemuProcessStartValidate(virDomainDefPtr def,
 
 int qemuProcessInit(virQEMUDriverPtr driver,
                     virDomainObjPtr vm,
+                    qemuDomainAsyncJob asyncJob,
                     bool migration,
                     bool snap);