diff options
| author |   Daniel P. Berrange <berrange@redhat.com> | 2012-07-09 14:55:31 +0100 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-07-11 14:46:24 +0100 |
| commit | 97d7f02dcc4848f5f7a64ecd5b32c9beffb7f359 (patch) | |
| tree | 76a0a48c1f63d0e4297c767a1c153157079f4795 | |
| parent | test: Add test case for nodeinfotest if host machine doesn't have NUMA (diff) | |
| download | libvirt-97d7f02dcc4848f5f7a64ecd5b32c9beffb7f359.tar.gz libvirt-97d7f02dcc4848f5f7a64ecd5b32c9beffb7f359.tar.bz2 libvirt-97d7f02dcc4848f5f7a64ecd5b32c9beffb7f359.zip | |
Fix shutdown of LXC controller
Since we are not yet using the virNetServerPtr object for running
the event loop, we can't use virNetServerQuit(). Instead set the
global 'quit' flag in libvirt_lxc
| -rw-r--r-- | src/lxc/lxc_controller.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index a4874ea3e..7a1ce140d 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -852,8 +852,11 @@ static void virLXCControllerSignalChildIO(virNetServerPtr server ATTRIBUTE_UNUSE int ret; ret = waitpid(-1, NULL, WNOHANG); - if (ret == ctrl->initpid) - virNetServerQuit(ctrl->server); + if (ret == ctrl->initpid) { + virMutexLock(&lock); + quit = true; + virMutexUnlock(&lock); + } } |