From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 3 Jun 2016 13:18:48 +0000 (+0200)
Subject: qemu: driver: Unset log file watcher after restoring a VM save file
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f392654b5e3e0e2f6b27a48f252a1cba99fa1276;p=libvirt.git

qemu: driver: Unset log file watcher after restoring a VM save file

qemuProcessStart does not unset the infrastructure that retrieves errors
from the qemu log file in case of migration. As this wasn't handled
properly in qemuDomainSaveImageStartVM we kept the logging context/fd
open for the lifetime of the VM rather than closing it after it's not
needed.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1325080
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 5e5e21abbf..fc43bcb239 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6523,6 +6523,11 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
     if (!restored)
         goto cleanup;
 
+    /* qemuProcessStart doesn't unset the qemu error reporting infrastructure
+     * in case of migration (which is used in this case) so we need to reset it
+     * so that the handle to virtlogd is not held open unnecessarily */
+    qemuMonitorSetDomainLog(qemuDomainGetMonitor(vm), NULL, NULL, NULL);
+
     event = virDomainEventLifecycleNewFromObj(vm,
                                      VIR_DOMAIN_EVENT_STARTED,
                                      VIR_DOMAIN_EVENT_STARTED_RESTORED);