Move QEMU driver to src/qemu/

* src/qemu_conf.c, src/qemu_conf.h, src/qemu_driver.c,
  src/qemu_driver.h: Move to src/qemu/
* daemon/qemud.c, src/Makefile.am, tests/qemuargv2xmltest.c,
  tests/qemuhelptest.c, tests/qemuxml2argvtest.c,
  tests/qemuxml2xmltest.c: Adapt for changed paths

diff --git a/daemon/qemud.c b/daemon/qemud.c
index cc8c0139d3ca592490566555ca11f80ba8604fef..f54c971af2ef8fbb1200f0be08d810216f293b47 100644 (file)
--- a/daemon/qemud.c
+++ b/daemon/qemud.c
@@ -69,7 +69,7 @@
 #include "driver.h"
 #else
 #ifdef WITH_QEMU
-#include "qemu_driver.h"
+#include "qemu/qemu_driver.h"
 #endif
 #ifdef WITH_LXC
 #include "lxc/lxc_driver.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index bff7c2dea34f4d7deb71f284af919b302f65495a..643a2ff46f87b96b8623d16703576d25c17a606a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -152,8 +152,8 @@ VBOX_DRIVER_SOURCES =                                               \
 VBOX_DRIVER_EXTRA_DIST = vbox/vbox_tmpl.c vbox/README
 
 QEMU_DRIVER_SOURCES =                                          \
-               qemu_conf.c qemu_conf.h                         \
-               qemu_driver.c qemu_driver.h                     \
+               qemu/qemu_conf.c qemu/qemu_conf.h                               \
+               qemu/qemu_driver.c qemu/qemu_driver.h                   \
                cgroup.c cgroup.h
 
 UML_DRIVER_SOURCES =                                           \

diff --git a/src/qemu_conf.c b/src/qemu/qemu_conf.c
similarity index 100%
rename from src/qemu_conf.c
rename to src/qemu/qemu_conf.c

diff --git a/src/qemu_conf.h b/src/qemu/qemu_conf.h
similarity index 100%
rename from src/qemu_conf.h
rename to src/qemu/qemu_conf.h

diff --git a/src/qemu_driver.c b/src/qemu/qemu_driver.c
similarity index 100%
rename from src/qemu_driver.c
rename to src/qemu/qemu_driver.c

diff --git a/src/qemu_driver.h b/src/qemu/qemu_driver.h
similarity index 100%
rename from src/qemu_driver.h
rename to src/qemu/qemu_driver.h

diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 4a9228032f66f6568e69e700845af980b92c72bb..65d4d147c5ceaa12931ab84ec3d57411ce23d717 100644 (file)
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -12,7 +12,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "qemu_conf.h"
+#include "qemu/qemu_conf.h"
 
 #include "testutilsqemu.h"
 

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 20677e07422f278a496c538965fb0017af0bd736..428d9a38d4fc6c508fc5bb2dcc8b765aecaf3367 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 #include "testutils.h"
-#include "qemu_conf.h"
+#include "qemu/qemu_conf.h"
 
 #define MAX_HELP_OUTPUT_SIZE 1024*64
 

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index cf0327606da5bf872edb0a5dbc9dd406cc7e2567..8318a2c998fb28286a51908f3613a43fb867b08c 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -12,7 +12,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "qemu_conf.h"
+#include "qemu/qemu_conf.h"
 
 #include "testutilsqemu.h"
 

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 7f19f78af9f764a9e23d6fe9b9c3377cfef041b8..2cba47b96ed302905e6bacffe883ea3119edf0f6 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -12,7 +12,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "qemu_conf.h"
+#include "qemu/qemu_conf.h"
 #include "testutilsqemu.h"
 
 static char *progname;