From 5fb17bcc1e293e713dadde7a836c1db7dc4efebb Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Fri, 22 Aug 2008 15:35:37 +0000 Subject: [PATCH] [LXC] Cleanup devices on container shutdown --- ChangeLog | 3 +++ src/lxc_driver.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index e13e72e01e..d398f32b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Fri Aug 22 08:30:00 PDT 2008 Dan Smith + * src/lxc_driver.c: Make sure we cleanup veth devices at shutdown + Fri Aug 22 11:49:42 BST 2008 Daniel P. Berrange * python/libvir.py: Use libvirt error message as exception diff --git a/src/lxc_driver.c b/src/lxc_driver.c index 3f67c8a372..5762281691 100644 --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -375,6 +375,7 @@ static int lxcVMCleanup(virConnectPtr conn, int rc = -1; int waitRc; int childStatus = -1; + virDomainNetDefPtr net; while (((waitRc = waitpid(vm->pid, &childStatus, 0)) == -1) && errno == EINTR) @@ -404,6 +405,11 @@ static int lxcVMCleanup(virConnectPtr conn, vm->def->id = -1; vm->monitor = -1; + for (net = vm->def->nets; net; net = net->next) { + vethInterfaceUpOrDown(net->ifname, 0); + vethDelete(net->ifname); + } + return rc; }