]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: driver: Reload snapshots and managedsaves prior to reconnecting
authorPeter Krempa <pkrempa@redhat.com>
Wed, 3 Dec 2014 10:18:53 +0000 (11:18 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 3 Dec 2014 17:50:22 +0000 (18:50 +0100)
Reconnect to the VM is a possibly long-running job spawned in a separate
thread. We should reload the snapshot defs and managedsave state prior
to spawning the thread to avoid blocking of the daemon startup which
would serialize on the VM lock.

Also the reloading code would violate the domain job held while
reconnecting as the loader functions don't create jobs.

src/qemu/qemu_driver.c

index 5dc62b0daa89cd64c64e479657f66db3e37bd39a..31565bb74b13429d7d4a30bd3ec0aec3a23fbd7e 100644 (file)
@@ -873,8 +873,6 @@ qemuStateInitialize(bool privileged,
                                        NULL, NULL) < 0)
         goto error;
 
-    qemuProcessReconnectAll(conn, qemu_driver);
-
     virDomainObjListForEach(qemu_driver->domains,
                             qemuDomainSnapshotLoad,
                             cfg->snapshotDir);
@@ -883,6 +881,8 @@ qemuStateInitialize(bool privileged,
                             qemuDomainManagedSaveLoad,
                             qemu_driver);
 
+    qemuProcessReconnectAll(conn, qemu_driver);
+
     qemu_driver->workerPool = virThreadPoolNew(0, 1, 0, qemuProcessEventHandler, qemu_driver);
     if (!qemu_driver->workerPool)
         goto error;