qemu: Save domain status ASAP after creating qemu process

When creating new qemu process we saved domain status XML only after the
process was fully setup and running. In case libvirtd was killed before
the whole process finished, once libvirtd started again it didn't know
anything about the new process and we end up with an orphaned qemu
process. Let's save the domain status XML as soon as we know the PID so
that libvirtd can kill the process on restart.

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 52a73b83772b891992a935d10c4eb685eb64858f..d0085e0eef496abcd9185faaf31523ea60c24643 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2226,6 +2226,10 @@ qemuProcessUpdateState(struct qemud_driver *driver, virDomainObjPtr vm)
         VIR_DEBUG("Domain %s was paused while its monitor was disconnected;"
                   " changing state to paused", vm->def->name);
         virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_UNKNOWN);
+    } else if (state == VIR_DOMAIN_SHUTOFF && running) {
+        VIR_DEBUG("Domain %s finished booting; changing state to running",
+                  vm->def->name);
+        virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED);
     }
 
     return 0;
@@ -2349,6 +2353,12 @@ qemuProcessReconnect(void *payload, const void *name ATTRIBUTE_UNUSED, void *opa
     if (qemuProcessUpdateState(driver, obj) < 0)
         goto error;
 
+    if (virDomainObjGetState(obj, NULL) == VIR_DOMAIN_SHUTOFF) {
+        VIR_DEBUG("Domain '%s' wasn't fully started yet, killing it",
+                  obj->def->name);
+        goto error;
+    }
+
     /* If upgrading from old libvirtd we won't have found any
      * caps in the domain status, so re-query them
      */
@@ -2463,6 +2473,7 @@ int qemuProcessStart(virConnectPtr conn,
 
     vm->def->id = driver->nextvmid++;
     priv->fakeReboot = false;
+    virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_UNKNOWN);
 
     /* Run an early hook to set-up missing devices */
     if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) {
@@ -2719,6 +2730,12 @@ int qemuProcessStart(virConnectPtr conn,
 #endif
     }
 
+    VIR_DEBUG("Writing early domain status to disk");
+    if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) {
+        ret = -1;
+        goto cleanup;
+    }
+
     VIR_DEBUG("Waiting for handshake from child");
     if (virCommandHandshakeWait(cmd) < 0) {
         ret = -1;