From 6e177fa1b6fee70a267cd1f6cb748f94d8d8c9c8 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Tue, 3 May 2011 10:07:48 -0600
Subject: [PATCH] Revert "lxc: Do not try to reconnect inactive domain when do
lxcStartup"
This reverts commit 0e7f7f8566f3e7fcf5bce395555fa1b5cf1e136b.
From the mailing list:
> So, AFAICT, this patch means we will never reconnect to any LXC
> VMs now.
>
> The correct solution, is to refactor LXC driver startup to work
> the same way as the QEMU driver startup.
>
> - Load all the live state XML files (to pick up running VMs)
> - Reconnect to all VMs
> - Load all the persistent config XML files (to pick up any additional
> inactive guets)
But that solution is invasive enough to be post-0.9.1.
---
src/lxc/lxc_driver.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index ef7827b492..e90530284c 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1992,9 +1992,6 @@ lxcReconnectVM(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque)
virDomainObjLock(vm);
- if (!virDomainObjIsActive(vm))
- goto cleanup;
-
priv = vm->privateData;
if ((priv->monitor = lxcMonitorClient(driver, vm)) < 0) {
goto cleanup;