From c93125b1205f8a46937773f802159e85d8807705 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 15 Sep 2009 17:03:01 +0100 Subject: [PATCH] Move LXC driver into src/lxc/ * src/lxc_conf.c, src/lxc_conf.h, src/lxc_container.c, src/lxc_container.h, src/lxc_controller.c, src/lxc_driver.c, src/lxc_driver.h, src/veth.c, src/veth.h: Move to src/lxc/ * src/opennebula/one_driver.c: Remove bogus veth.h include * src/Makefile.am: Adjust for lxc paths * daemon/qemud.c: Adjust include for lxc --- daemon/qemud.c | 2 +- src/Makefile.am | 16 ++++++++-------- src/{ => lxc}/lxc_conf.c | 0 src/{ => lxc}/lxc_conf.h | 0 src/{ => lxc}/lxc_container.c | 0 src/{ => lxc}/lxc_container.h | 0 src/{ => lxc}/lxc_controller.c | 0 src/{ => lxc}/lxc_driver.c | 0 src/{ => lxc}/lxc_driver.h | 0 src/{ => lxc}/veth.c | 0 src/{ => lxc}/veth.h | 0 src/opennebula/one_driver.c | 1 - 12 files changed, 9 insertions(+), 10 deletions(-) rename src/{ => lxc}/lxc_conf.c (100%) rename src/{ => lxc}/lxc_conf.h (100%) rename src/{ => lxc}/lxc_container.c (100%) rename src/{ => lxc}/lxc_container.h (100%) rename src/{ => lxc}/lxc_controller.c (100%) rename src/{ => lxc}/lxc_driver.c (100%) rename src/{ => lxc}/lxc_driver.h (100%) rename src/{ => lxc}/veth.c (100%) rename src/{ => lxc}/veth.h (100%) diff --git a/daemon/qemud.c b/daemon/qemud.c index 00b9859f4d..cc8c0139d3 100644 --- a/daemon/qemud.c +++ b/daemon/qemud.c @@ -72,7 +72,7 @@ #include "qemu_driver.h" #endif #ifdef WITH_LXC -#include "lxc_driver.h" +#include "lxc/lxc_driver.h" #endif #ifdef WITH_UML #include "uml_driver.h" diff --git a/src/Makefile.am b/src/Makefile.am index 52f0c24bf8..bff7c2dea3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -123,17 +123,17 @@ XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h endif LXC_DRIVER_SOURCES = \ - lxc_conf.c lxc_conf.h \ - lxc_container.c lxc_container.h \ - lxc_driver.c lxc_driver.h \ - veth.c veth.h \ + lxc/lxc_conf.c lxc/lxc_conf.h \ + lxc/lxc_container.c lxc/lxc_container.h \ + lxc/lxc_driver.c lxc/lxc_driver.h \ + lxc/veth.c lxc/veth.h \ cgroup.c cgroup.h LXC_CONTROLLER_SOURCES = \ - lxc_conf.c lxc_conf.h \ - lxc_container.c lxc_container.h \ - lxc_controller.c \ - veth.c veth.h \ + lxc/lxc_conf.c lxc/lxc_conf.h \ + lxc/lxc_container.c lxc/lxc_container.h \ + lxc/lxc_controller.c \ + lxc/veth.c lxc/veth.h \ cgroup.c cgroup.h PHYP_DRIVER_SOURCES = \ diff --git a/src/lxc_conf.c b/src/lxc/lxc_conf.c similarity index 100% rename from src/lxc_conf.c rename to src/lxc/lxc_conf.c diff --git a/src/lxc_conf.h b/src/lxc/lxc_conf.h similarity index 100% rename from src/lxc_conf.h rename to src/lxc/lxc_conf.h diff --git a/src/lxc_container.c b/src/lxc/lxc_container.c similarity index 100% rename from src/lxc_container.c rename to src/lxc/lxc_container.c diff --git a/src/lxc_container.h b/src/lxc/lxc_container.h similarity index 100% rename from src/lxc_container.h rename to src/lxc/lxc_container.h diff --git a/src/lxc_controller.c b/src/lxc/lxc_controller.c similarity index 100% rename from src/lxc_controller.c rename to src/lxc/lxc_controller.c diff --git a/src/lxc_driver.c b/src/lxc/lxc_driver.c similarity index 100% rename from src/lxc_driver.c rename to src/lxc/lxc_driver.c diff --git a/src/lxc_driver.h b/src/lxc/lxc_driver.h similarity index 100% rename from src/lxc_driver.h rename to src/lxc/lxc_driver.h diff --git a/src/veth.c b/src/lxc/veth.c similarity index 100% rename from src/veth.c rename to src/lxc/veth.c diff --git a/src/veth.h b/src/lxc/veth.h similarity index 100% rename from src/veth.h rename to src/lxc/veth.h diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 9587a2dc72..0ca1e9b0e9 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -41,7 +41,6 @@ #include "memory.h" #include "util.h" #include "bridge.h" -#include "veth.h" #define VIR_FROM_THIS VIR_FROM_ONE -- GitLab